summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-06 20:55:12 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-06 20:55:12 -0400
commiteb815bce0da27a24ad718c31b77e45032e3a5916 (patch)
tree02231e9ef092a77496362f6930cdb72be32a8219 /man
parent835a7d2e53e2b1c1a971fad5fa5bc9b82ee1ce41 (diff)
describe authorized_user_ids more clearly in man pages.
Diffstat (limited to 'man')
-rw-r--r--man/man1/monkeysphere.16
-rw-r--r--man/man8/monkeysphere-authentication.86
2 files changed, 10 insertions, 2 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 5badaa9..1c9217f 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -182,8 +182,10 @@ User monkeysphere config file.
System-wide monkeysphere config file.
.TP
~/.monkeysphere/authorized_user_ids
-OpenPGP user IDs associated with keys that will be checked for
-addition to the authorized_keys file.
+A list of OpenPGP user IDs, one per line. OpenPGP keys with an
+exactly-matching User ID (calculated valid by the designated identity
+certifiers), will have any valid authorization-capable keys or subkeys
+added to the given user's authorized_keys file.
.SH AUTHOR
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index 811e47a..d3d3b95 100644
--- a/man/man8/monkeysphere-authentication.8
+++ b/man/man8/monkeysphere-authentication.8
@@ -169,6 +169,12 @@ System monkeysphere-authentication config file.
.TP
/var/lib/monkeysphere/authorized_keys/USER
Monkeysphere-generated user authorized_keys files.
+.TP
+~/.monkeysphere/authorized_user_ids
+A list of OpenPGP user IDs, one per line. OpenPGP keys with an
+exactly-matching User ID (calculated valid by the designated identity
+certifiers), will have any valid authorization-capable keys or subkeys
+added to the given user's authorized_keys file.
.SH AUTHOR