man: fix bad merge of doc updates from the HEAD branch.