summaryrefslogtreecommitdiff
path: root/man/man1
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-03 19:10:24 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-03 19:10:24 -0400
commit0f2f84aac32441de6323bd3fa3607a2aeed410e9 (patch)
tree0768abd3ccf966955a9f73f2cf5fccde05ba7054 /man/man1
parent85165312ef23dcf1ae6b1ac9eb2e907400d30ace (diff)
updated monkeysphere update-authorized_keys explanation in monkeysphere.1
Diffstat (limited to 'man/man1')
-rw-r--r--man/man1/monkeysphere.125
1 files changed, 13 insertions, 12 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 43e3fd5..fe4fd36 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -37,18 +37,19 @@ if matching keys were found but none were acceptable. `k' may be used
in place of `update-known_hosts'.
.TP
.B update-authorized_keys
-Update the authorized_keys file. First all 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 monkeysphere(5)),
-the key is added to the user's authorized_keys file. If a key is
-found but is unacceptable for the user ID, any matching keys are
-removed from the user's authorized_keys file. If no gpg key is found
-for the user ID, nothing is done. This subcommand will exit with a
-status of 0 if at least one acceptable key was found for a user ID, 1
-if no matching keys were found at all, and 2 if matching keys were
-found but none were acceptable. `a' may be used in place of
+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
+queried for keys associated with that user ID, optionally querying a
+keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in
+monkeysphere(5)), the key is added to the user's authorized_keys file.
+If a key is found but is unacceptable for the user ID, any matching
+keys are removed from the user's authorized_keys file. If no gpg key
+is found for the user ID, nothing is done. This subcommand will exit
+with a status of 0 if at least one acceptable key was found for a user
+ID, 1 if no matching keys were found at all, and 2 if matching keys
+were found but none were acceptable. `a' may be used in place of
`update-authorized_keys'.
.TP
.B gen-subkey KEYID