Fixes minor inconsistencies between docs and script arguments/options.

Troy Melhase · Troy Melhase · commit 17d2469bf51f · 2012-02-04T20:07:25.000-05:00
diff --git a/bin/j2py b/bin/j2py
@@ -177,15 +177,15 @@ def config(argv):
 
     add = parser.add_argument
     add(dest='inputfile', nargs='?',
-        help='Read from INPUTFILE.  May use - for stdin (default).',
-        metavar='INPUTFILE', default=None)
+        help='Read from INPUT.  May use - for stdin (default).',
+        metavar='INPUT', default=None)
     add(dest='outputfile', nargs='?',
-        help='Write to OUTPUTFILE.  May use - for stdout (default).',
-        metavar='OUTPUTFILE', default=None)
+        help='Write to OUTPUT.  May use - for stdout (default).',
+        metavar='OUTPUT', default=None)
     add('-c', '--config', dest='configs',
         help='Use CONFIG file or module.  May be repeated.',
         metavar='CONFIG', default=[], action='append')
-    add('-d', '--configdir', dest='configdirs',
+    add('-d', '--config-dir', dest='configdirs',
         help='Use DIR to match input filename with config filename.',
         metavar='DIR', default=[], action='append')
     add('-f', '--profile', dest='profile',
@@ -197,16 +197,16 @@ def config(argv):
     add('-k', '--skip-compile', dest='skipcompile',
         help='Skip compile check on translated source.',
         default=False, action='store_true')
-    add('-l', '--loglevel', dest='loglevel',
+    add('-l', '--log-level', dest='loglevel',
         help='Set log level by name or value.',
         default='WARN', type=logLevel)
-    add('-n', '--nodefaults', dest='includedefaults',
+    add('-n', '--no-defaults', dest='includedefaults',
         help='Ignore default configuration module.',
         default=True, action='store_false')
     add('-p', '--python-tree', dest='pytree',
         help='Print python object tree to stderr.',
         default=False, action='store_true')
-    add('-r', '--nocolor', dest='nocolor',
+    add('-r', '--no-color', dest='nocolor',
         help='Disable color output.' +\
             ('  No effect on Win OS.' if isWindows() else ''),
         default=False, action='store_true')
diff --git a/doc/usage.md b/doc/usage.md
@@ -27,7 +27,7 @@ to change code generation behavior, refer to the [customization](customization.m
 page.
 
 
-Code generation:
+#### Code Generation
 
   * `[INPUT]`
 
@@ -39,7 +39,7 @@ Code generation:
     Write to the given file.  Specify `-` for `stdout`.  If not
     given the command will write to `stdout`.
 
-  * `-l LEVEL`, `--loglevel LEVEL`
+  * `-l LEVEL`, `--log-level LEVEL`
 
     Set the logging package to the specified log level.  The log level
     may given as an integer (e.g., `50` for critical) or by name
@@ -57,30 +57,32 @@ Code generation:
     See the [customization](customization.md) page for details of the
     configuration system and available configuration points.
 
-  * `-d DIR`, `--configdir DIR`
+  * `-d DIR`, `--config-dir DIR`
 
     Use the given directory name to match input file names to
-    configuration file names.  For example, to translate
+    configuration file names.  This option may be repeated.
+    
+    For example, to translate
     `FooBar.java` and use the configuration stored in
     `./cfg/FooBar.py`, specify `-d ./cfg`.
 
   * `-k`, `--skip-compile`
 
     Do not check the output for valid Python syntax by byte compiling it.
 
-  * `-n`, `--nodefaults`
+  * `-n`, `--no-defaults`
 
     Ignore the default configuration module.
 
-  * `-r`, `--nocolor`
+  * `-r`, `--no-color`
 
     Disable colorized output.
 
     Colorized output is not available on Windows and this option has no effect
     there.
 
 
-Development:
+#### Development
 
   * `-p`, `--python-tree`
 
@@ -103,7 +105,7 @@ Development:
     `-j`.
 
 
-Meta:
+#### Meta
 
   * `-h`, `--help`
 
