Merge recent man-page updates and fixes.