Minor edits to make man page more generic (reduce diff with DF branch)
Sync with trunk (minor conflict)