Tidy up the command line notes.

2 files changed, 51 insertions, 33 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index c6659a07..e71b1d1e 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -220,23 +220,6 @@ CMDS = {
             "missed with !."
         ),
 
-    'help': CmdOptionParser("help", GLOBAL_ARGS,
-        usage = "[command]",
-        description = "Describe how to use coverage.py"
-        ),
-
-    'html': CmdOptionParser("html",
-        [
-            Opts.directory,
-            Opts.ignore_errors,
-            Opts.omit,
-            ] + GLOBAL_ARGS,
-        usage = "[options] [modules]",
-        description = "Create an HTML report of the coverage of the files.  "
-            "Each file gets its own page, with the source decorated to show "
-            "executed, excluded, and missed lines."
-        ),
-
     'combine': CmdOptionParser("combine", GLOBAL_ARGS,
         usage = " ",
         description = "Combine data from multiple coverage files collected "
@@ -257,6 +240,23 @@ CMDS = {
         description = "Erase previously collected coverage data."
         ),
 
+    'help': CmdOptionParser("help", GLOBAL_ARGS,
+        usage = "[command]",
+        description = "Describe how to use coverage.py"
+        ),
+
+    'html': CmdOptionParser("html",
+        [
+            Opts.directory,
+            Opts.ignore_errors,
+            Opts.omit,
+            ] + GLOBAL_ARGS,
+        usage = "[options] [modules]",
+        description = "Create an HTML report of the coverage of the files.  "
+            "Each file gets its own page, with the source decorated to show "
+            "executed, excluded, and missed lines."
+        ),
+
     'report': CmdOptionParser("report",
         [
             Opts.ignore_errors,
diff --git a/lab/cmd-opts.txt b/lab/cmd-opts.txt
index 5b749918..de35ecd4 100644
--- a/lab/cmd-opts.txt
+++ b/lab/cmd-opts.txt
@@ -4,29 +4,27 @@ coverage run --timid foo.py
 coverage foo.py
 
 
-commands:
+global args:
 
-    run -x
-            --timid                 bool
-        -p  --parallel              bool
-        -L  --stdlib                bool
-            --branch                bool
-        -a  --append                bool
+        -h  --help
+        --rcfile                    string
 
-    erase -e
 
-    combine -c
-
-    report -r
-        -m --missing                bool
-        -i --ignore-errors          bool
-        --omit                      list of string
+commands:
 
     annotate -a
         -d --output-directory       string
         -i --ignore-errors          bool
         --omit                      list of string
 
+    combine -c
+
+    debug
+
+    erase -e
+
+    help
+
     html -b
         -d --output-directory       string
         -i --ignore-errors          bool
@@ -35,12 +33,32 @@ commands:
         --green *
         --style *
 
-    help
+    report -r
+        -m --missing                bool
+        -i --ignore-errors          bool
+        --omit                      list of string
+
+    run -x
+        -a  --append                bool
+            --branch                bool                [run].branch
+        -L  --pylib                 bool                [run].cover_pylib
+        -p  --parallel              bool
+            --timid                 bool                [run].timid
+
+    xml
+        -i --ignore-errors          bool
+        --omit                      list of string
+        -o                          string
+
+
 
     byteprep   *
 
-    xml   *
 
+Other config:
+
+    [report].exclude                list of string
+    [run].data_file                 string
 
 
 Option scopes: