Doc fixes

Stefan Wolfsheimerrequested to merge
doc_fixes into devel

Merge request reports