Merge pull request #10437 from highfalutin/config-help-text