moved monkeysphere(5) to section 7 of the manual. Thanks, Stew!

[monkeysphere.git] / man / man8 / monkeysphere-server.8

diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 416cc87b753b24a1c31c3bf8bed0e210112dc3d1..f207e2cebe03e0c1df77f395aac03003b75b6a98 100644 (file)
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -27,7 +27,7 @@ specified account, the user ID's listed in the account's
 authorized_user_ids file are processed.  For each user ID, 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 account's
+monkeysphere(7)), the key is added to the account's
 monkeysphere-controlled authorized_keys file.  If the
 RAW_AUTHORIZED_KEYS variable is set, then a separate authorized_keys
 file (usually ~USER/.ssh/authorized_keys) is appended to the
@@ -71,10 +71,6 @@ in place of `revoke-hostname'.
 Output gpg information about host's OpenPGP key.  `s' may be used in
 place of `show-key'.
 .TP
-.B fingerprint
-Output just the fingerprint for the host's OpenPGP key.  `f' may be
-used in place of `fingerprint'.
-.TP
 .B publish-key
 Publish the host's OpenPGP key to the keyserver.  `p' may be used in
 place of `publish-key'.
@@ -158,8 +154,8 @@ Remote user's will then be granted access to a local user account
 based on the appropriately signed and valid keys associated with user
 IDs listed in the authorized_user_ids file of the local user.  By
 default, the authorized_user_ids file for local users is found in
-~/.config/monkeysphere/authorized_user_ids.  This can be changed in
-the monkeysphere-server.conf file.
+~/.monkeysphere/authorized_user_ids.  This can be changed in the
+monkeysphere-server.conf file.
 
 The \fBupdate-users\fP command can then be used to generate
 authorized_keys file for local users based on the authorized user IDs
@@ -186,12 +182,16 @@ The following environment variables will override those specified in
 the monkeysphere-server.conf configuration file (defaults in
 parentheses):
 .TP
+MONKEYSPHERE_LOG_LEVEL
+Set the log level (INFO).  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+increasing order of verbosity.
+.TP
 MONKEYSPHERE_KEYSERVER
 OpenPGP keyserver to use (subkeys.pgp.net).
 .TP
 MONKEYSPHERE_AUTHORIZED_USER_IDS
 Path to user authorized_user_ids file
-(%h/.config/monkeysphere/authorized_user_ids).
+(%h/.monkeysphere/authorized_user_ids).
 .TP
 MONKEYSPHERE_RAW_AUTHORIZED_KEYS
 Path to user-controlled authorized_keys file.  `-' means not to add
@@ -230,6 +230,6 @@ Gillmor <dkg@fifthhorseman.net>
 .SH SEE ALSO
 
 .BR monkeysphere (1),
-.BR monkeysphere (5),
+.BR monkeysphere (7),
 .BR gpg (1),
 .BR ssh (1)