3655 Fix further inconsistencies in help text
Merge pull request #1645 from sarken/issue_3655

3655 Fix further inconsistencies in help text