Cpp: Correct content and markup