From: Jameson Graef Rollins Date: Sun, 27 Jul 2008 19:04:38 +0000 (-0700) Subject: fix typo in man page; update changelog X-Git-Tag: monkeysphere_0.5-1~11 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=aa9752d23ba4c3c5281b25650ccf3d4edbde7b9d;p=monkeysphere.git fix typo in man page; update changelog --- diff --git a/debian/changelog b/debian/changelog index 1711a69..4f3c905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monkeysphere (0.5-1) experimental; urgency=low + + * Tweak how empty authorized_user_ids and known_hosts files are handled. + + -- Jameson Graef Rollins Sun, 27 Jul 2008 12:03:30 -0700 + monkeysphere (0.4-1) experimental; urgency=low [ Daniel Kahn Gillmor ] diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 43102d3..2ca8a73 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -37,17 +37,17 @@ 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 monkeysphere authorized_keys file. 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 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