From: Matt Goins <mjgoins@openflows.com>
Date: Sat, 31 Jan 2009 23:32:12 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~160
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26bdfd9c0aa0853ca1ea80e1980e7e9849646e10;p=monkeysphere.git

Merge commit 'dkg/master'

Conflicts:

	src/monkeysphere-host
---

26bdfd9c0aa0853ca1ea80e1980e7e9849646e10
diff --cc src/monkeysphere-host
index 31f031e,19ab5fc..9439264
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@@ -48,12 -53,13 +48,12 @@@ 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
 -   --revoker (-r) FINGERPRINT          add a revoker
    diagnostics (d)                    monkeysphere host status
  
   version (v)                         show version number