Update documentation following Niklas's old MR

Vava Gligorovrequested to merge
gligorov-master-patch-7ebc into master

Ports some of !701 (closed) into the new documentation

Merge request reports