Man page fixes

Michał Kępień requested to merge 1946-man-page-fixes into main

This MR is essentially a forward-port of !3772 (merged) - I have only just now noticed that the problems that MR fixes affect the main branch, too, not just v9.16.

See #1946 (closed)

Merge request reports