Merge commit 'micah/master'

[monkeysphere.git] / man / man1 / monkeysphere.1

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 92ba2fa076512043c404495c37d73b53802f84e7..cabe953d231437e5946f3a67f589389f0f7cd7ab 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -83,6 +83,10 @@ Output a brief usage summary.  `h' or `?' may be used in place of
 The following environment variables will override those specified in
 the monkeysphere.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_GNUPGHOME, GNUPGHOME
 GnuPG home directory (~/.gnupg).
 .TP
@@ -104,13 +108,13 @@ Path to ssh authorized_keys file (~/.ssh/authorized_keys).
 .SH FILES
 
 .TP
-~/.config/monkeysphere/monkeysphere.conf
+~/.monkeysphere/monkeysphere.conf
 User monkeysphere config file.
 .TP
 /etc/monkeysphere/monkeysphere.conf
 System-wide monkeysphere config file.
 .TP
-~/.config/monkeysphere/authorized_user_ids
+~/.monkeysphere/authorized_user_ids
 OpenPGP user IDs associated with keys that will be checked for
 addition to the authorized_keys file.