Fix minor points on the Cpp page (rebased onto develop)



This is the same as gh-830 but rebased onto develop.

----

Reported by @jburel as part of the review of  #820