Merge pull request #7897 from yuwata/small-man-fixes
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 17 Jan 2018 09:13:54 +0000 (20:13 +1100)
committerGitHub <noreply@github.com>
Wed, 17 Jan 2018 09:13:54 +0000 (20:13 +1100)
Several man fixes


Trivial merge