Merge branch 'ow/manpages-typofix'