More fixes to the C++ guide
Merge pull request #4132 from ricardoquesada/doc_fixes

More fixes to the C++ guide