update man page
Merge branch 'master' into portable