man page fixes
Merge remote-tracking branch 'origin/rot45' into rot45