Merge branch 'manpage_tweaks' into 'master'

Manpage tweaks

See merge request !496
3 jobs for !496 with manpage_tweaks into master in 35 minutes and 45 seconds (queued for 1 second)