Update manpage
Merge the two changelogs