Merge commit 'dkg/master'

I DON"T UNDERSTAND

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 94392647c32693ce74bce898debcfd818e69170b..1f6825662382232440d1f85edb5b5eed53febf39 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -48,10 +48,10 @@ subcommands:
  publish-key (p)                     publish server host key to keyserver
 
  expert
-  import-key (i)  NAME[:PORT]        import existing ssh key to gpg
+  import-key (i) [NAME[:PORT]]       import existing ssh key to gpg
    --keyfile (-f) FILE                 key file to import
    --expire (-e) EXPIRE                date to expire
-  gen-key (g) NAME[:PORT]            generate gpg key for the host
+  gen-key (g) [NAME[:PORT]]          generate gpg key for the host
    --length (-l) BITS                  key length in bits (2048)
    --expire (-e) EXPIRE                date to expire
   diagnostics (d)                    monkeysphere host status