summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 15:37:30 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 15:37:30 -0500
commitbb8f498db80efcfffdf60ef317254d7355ea54ef (patch)
treeac8cafd6ac23f1f0a69fa5bb667a40e900681c4d /man
parentdbb8acd9a45eb2b9f3f412b98d6a777d39b368ac (diff)
import-key now requires a hostname be specified, and no longer does
any hostname guessing. this is so that we don't have to worry about prompting the user when guessing the hostname. also updated documentation.
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