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

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

diff --cc irkerd
index f21b3cc60bab35a5fd5c6b75cc86a6fe30736cb5,0893381cb6a3cddfcc09b37d4158ab03b0c6d030..66520cf83ccd698334a425d01615b4ed6816e33d
--- 1/irkerd
--- 2/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')