Imported changes for man pages in 1.2