Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess

missed these merge conflicts when manually rebasing too many files