Clean up help messages

2 files changed, 13 insertions, 14 deletions

diff --git a/README.md b/README.md
index d38b7e8..94349e4 100644
--- a/README.md
+++ b/README.md
@@ -4,25 +4,25 @@ tsig-keygen.py
 ```
 usage: tsig-keygen.py [-h] [-a {hmac-sha256,hmac-sha384,hmac-sha512}]
                       [-d DIRECTORY] [-f {bind9,nsd}] [-k KEY] [-n NAME]
-                      [-o OUTPUT] [-s SERVERS [SERVERS ...]]
-                      [-z ZONES [ZONES ...]]
+                      [-o OUTPUT] [-s SERVER [SERVER ...]]
+                      [-z ZONE [ZONE ...]]
 
 Pure Python TSIG key generator with multiple output formats.
 
 optional arguments:
   -h, --help            show this help message and exit
   -a {hmac-sha256,hmac-sha384,hmac-sha512}, --algorithm {hmac-sha256,hmac-sha384,hmac-sha512}
-                        TSIG algorithm
+                        TSIG algorithm (default: hmac-sha256)
   -d DIRECTORY, --directory DIRECTORY
                         where to store secondary zone files
   -f {bind9,nsd}, --format {bind9,nsd}
-                        output format (default: nsd
+                        output format (default: nsd)
   -k KEY, --key KEY     TSIG shared secret (default: generate new secret)
   -n NAME, --name NAME  DNS name for TSIG shared secret
   -o OUTPUT, --output OUTPUT
                         output file
-  -s SERVERS [SERVERS ...], --servers SERVERS [SERVERS ...]
+  -s SERVER [SERVER ...], --servers SERVER [SERVER ...]
                         address(es) of primary nameserver(s)
-  -z ZONES [ZONES ...], --zones ZONES [ZONES ...]
+  -z ZONE [ZONE ...], --zones ZONE [ZONE ...]
                         zone(s) to xfr from specified nameserver(s)
 ```
diff --git a/tsig-keygen.py b/tsig-keygen.py
index 2241759..fef9f45 100755
--- a/tsig-keygen.py
+++ b/tsig-keygen.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 
-"""
-Pure Python TSIG key generator with multiple output formats.
-"""
+"Pure Python TSIG key generator with multiple output formats."
 
 import os, base64, argparse, jinja2
 
@@ -55,14 +53,15 @@ zone:
 ''')
 
 ap = argparse.ArgumentParser(description = __doc__)
-ap.add_argument("-a", "--algorithm", choices = algorithm_choices, default = algorithm_choices[0], help = "TSIG algorithm")
+ap.add_argument("-a", "--algorithm", choices = algorithm_choices, default = algorithm_choices[0],
+                help = "TSIG algorithm (default: " + algorithm_choices[0] + ")")
 ap.add_argument("-d", "--directory", default = "secondary", help = "where to store secondary zone files")
-ap.add_argument("-f", "--format",    choices = tuple(templates), default = "nsd", help = "output format (default: nsd")
-ap.add_argument("-k", "--key",       help = "TSIG shared secret (default: generate new secret)")
+ap.add_argument("-f", "--format",    choices = tuple(templates), default = "nsd", help = "output format (default: nsd)")
+ap.add_argument("-k", "--key", help = "TSIG shared secret (default: generate new secret)")
 ap.add_argument("-n", "--name",      default = "tsig.example.org", help = "DNS name for TSIG shared secret")
 ap.add_argument("-o", "--output",    default = "-", type = argparse.FileType("w"), help = "output file")
-ap.add_argument("-s", "--servers",   nargs = "+", default = [], help = "address(es) of primary nameserver(s)")
-ap.add_argument("-z", "--zones",     nargs = "+", default = [], help = "zone(s) to xfr from specified nameserver(s)")
+ap.add_argument("-s", "--servers",   nargs = "+", default = [], metavar = "SERVER", help = "address(es) of primary nameserver(s)")
+ap.add_argument("-z", "--zones",     nargs = "+", default = [], metavar = "ZONE", help = "zone(s) to xfr from specified nameserver(s)")
 args = ap.parse_args()
 
 if args.key is None: