Manpages - fixes and merged tianon/docker man1-assumption branch