summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-21 16:09:08 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-21 16:09:08 -0500
commitc32c51f0326fa1d27ad8aba929edcf79ffa3adda (patch)
treeb9adb83a5d05e1fcd462fa18a56be692b6ecce05 /man
parent35559940b9ccab1df260da9da30dff5991a1778e (diff)
parent5eba4661d75f977b46c8db028c0e79241dd36d76 (diff)
merged jrollins/master
Diffstat (limited to 'man')
-rw-r--r--man/man8/monkeysphere-host.811
1 files changed, 5 insertions, 6 deletions
diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index 0a9fc1b..7909b62 100644
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -23,14 +23,13 @@ connection authentication.
\fBmonkeysphere-host\fP takes various subcommands:
.TP
-.B import-key FILE [NAME[:PORT]]
+.B import-key FILE NAME[:PORT]
Import a pem-encoded ssh secret host key from file FILE. If FILE
is '-', then the key will be imported from stdin. NAME[:PORT] is used
-to specify the hostname (and port) used in the user ID of the new
-OpenPGP key. If NAME is not specified, then the system
-fully-qualified domain name will be used (ie. `hostname -f'). If PORT
-is not specified, the no port is added to the user ID, which means
-port 22 is assumed. `i' may be used in place of `import-key'.
+to specify the fully-qualified hostname (and port) used in the user ID
+of the new OpenPGP key. If PORT is not specified, the no port is
+added to the user ID, which means port 22 is assumed. `i' may be used
+in place of `import-key'.
.TP
.B show-key
Output information about host's OpenPGP and SSH keys. `s' may be used