updated man page
updated man page
fixed a bad typo
Merge branch 'next'