Feature/update manpages

cherry-picked from debian branch