Help: Mark some code blocks as containing cmake code.
Merge topic 'minor-cleanups' into next

84e7c67 Help: Mark some code blocks as containing cmake code.