Merge branch 'doc-nitpicks' into 'master'

documentation nitpicks

See merge request !592
20 jobs for master
in 9 minutes and was queued for 8 seconds