man: fix assorted issues reported by the manpage-l10n project

Fixes #20297.

(cherry picked from commit be0d27ee)
(cherry picked from commit 9eb9b07c)

[Only the parts that were conflict-free: I think it's nice to fix errors, but
not important enough to devote actual work to it.]