Bug 1055356 - Man page and help fixes