update manpage text
sync
Merge branch 'master' into consistent-hash