From: W. Trevor King <wking@tremily.us>
Date: Thu, 29 May 2014 23:21:46 +0000 (-0700)
Subject: Merge remote-tracking branch 'anarcat/bug-usage' into next
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83c7b16f69fe9bc0577a10ac50dc6043213235e4;p=irker.git

Merge remote-tracking branch 'anarcat/bug-usage' into next

* anarcat/bug-usage:
  fix usage for --log-level
---

83c7b16f69fe9bc0577a10ac50dc6043213235e4
diff --cc irkerd
index f21b3cc,0893381..66520cf
--- a/irkerd
+++ b/irkerd
@@@ -940,10 -942,7 +940,10 @@@ if __name__ == '__main__'
          help='file of trusted certificates for SSL/TLS')
      parser.add_argument(
          '-d', '--log-level', metavar='LEVEL', choices=LOG_LEVELS,
-         help='file of trusted certificates for SSL/TLS')
+         help='how much to log to the log file (one of %(choices)s)')
 +    parser.add_argument(
 +        '--syslog', action='store_const', const=True,
 +        help='log irkerd action to syslog instead of stderr')
      parser.add_argument(
          '-l', '--log-file', metavar='PATH',
          help='file for saving captured message traffic')