summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--man/man1/monkeysphere-ssh-proxycommand.15
-rw-r--r--man/man1/monkeysphere.14
-rw-r--r--man/man8/monkeysphere-server.84
4 files changed, 5 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 1cc1dd8..92c56ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ monkeysphere (0.12-1) UNRELEASED; urgency=low
* debian/control: switched Homepage: and Vcs-Git: to canonicalized
upstream hostnames.
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Mon, 01 Sep 2008 23:55:56 -0700
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 02 Sep 2008 18:54:29 -0400
monkeysphere (0.11-1) experimental; urgency=low
diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index c3c7993..9aad232 100644
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -55,11 +55,6 @@ All environment variables defined in monkeysphere(1) can also be used
for the proxy command, with one note:
.TP
-MONKEYSPHERE_LOG_LEVEL
-Set the log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing
-order of verbosity.
-
-.TP
MONKEYSPHERE_CHECK_KEYSERVER
Setting this variable (to `true' or `false') will override the policy
defined in KEYSERVER CHECKING above.
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 26327f4..5ed2153 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -84,8 +84,8 @@ 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. Can be SILENT, ERROR, INFO, DEBUG, in increasing
-order of verbosity.
+Set the log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+increasing order of verbosity.
.TP
MONKEYSPHERE_GNUPGHOME, GNUPGHOME
GnuPG home directory (~/.gnupg).
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index b63f659..4848625 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -183,8 +183,8 @@ the monkeysphere-server.conf configuration file (defaults in
parentheses):
.TP
MONKEYSPHERE_LOG_LEVEL
-Set the log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing
-order of verbosity.
+Set the log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+increasing order of verbosity.
.TP
MONKEYSPHERE_KEYSERVER
OpenPGP keyserver to use (subkeys.pgp.net).