Merge branch 'arglist' of github.com:python-cmd2/cmd2 into arglist

1 files changed, 10 insertions, 9 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 97116b48..21899f36 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,19 +20,20 @@ cmdenvironment  help  load     pyscript  run   set   shortcuts
 """
 
 # Help text for the history command
-HELP_HISTORY = """history [arg]: lists past commands issued
+HELP_HISTORY = """usage: history [-h] [-s] [arg [arg ...]]
 
-        | no arg:         list all
-        | arg is integer: list one history item, by index
-        | a..b, a:b, a:, ..b -> list history items by a span of indices (inclusive)
-        | arg is string:  list all commands matching string search
-        | arg is /enclosed in forward-slashes/: regular expression search
+list past commands issued
 
-Usage: history [options] (limit on which commands to include)
+positional arguments:
+  arg           no arg               list all
+                arg is integer       by index
+                a..b, a:b, a:, ..b   by indices (inclusive)
+                arg is string        containing string
+                arg is /regex/       matching regular expression regex
 
-Options:
+optional arguments:
   -h, --help    show this help message and exit
-  -s, --script  Script format; no separation lines
+  -s, --script  script format; no separation lines
 """
 
 # Output from the shortcuts command with default built-in shortcuts