summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/man1/monkeysphere.16
-rw-r--r--man/man8/monkeysphere-host.82
2 files changed, 4 insertions, 4 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 327a623..320cdfd 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -42,8 +42,8 @@ were found but none were acceptable. `k' may be used in place of
.B update\-authorized_keys
Update the authorized_keys file for the user executing the command
(see MONKEYSPHERE_AUTHORIZED_KEYS in ENVIRONMENT, below). First all
-monkeysphere keys are cleared from the authorized_keys file. Then, or
-each user ID in the user's authorized_user_ids file, gpg will be
+monkeysphere keys are cleared from the authorized_keys file. Then,
+for each user ID in the user's authorized_user_ids file, gpg will be
queried for keys associated with that user ID, optionally querying a
keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in
.BR monkeysphere (7)),
@@ -65,7 +65,7 @@ will be used. The length of the generated key can be specified with
the `\-\-length' or `\-l' option. `g' may be used in place of
`gen\-subkey'.
.TP
-.B ssh\-proxycommand
+.B ssh\-proxycommand [--no-connect] HOST [PORT]
An ssh ProxyCommand that can be used to trigger a monkeysphere update
of the ssh known_hosts file for a host that is being connected to with
ssh. This works by updating the known_hosts file for the host first,
diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index 3e01105..e96a497 100644
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -27,7 +27,7 @@ Import a pem-encoded ssh secret host key from file FILE. If FILE is
`\-', then the key will be imported from stdin. Only RSA keys are
supported at the moment. NAME[:PORT] is used 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
+OpenPGP key. If PORT is not specified, then no port is added to the
user ID, which means port 22 is assumed. `i' may be used in place of
`import\-key'.
.TP