Added some standards
Merge pull request #2994 from WouterJ/namespace_standards

Added some doc standards
[#2994] Small tweaks to new standards
Merge branch '2.0' into 2.1