Merge pull request #905 from rbrito/manpage-apropos