summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/man1/monkeysphere-ssh-proxycommand.17
-rw-r--r--man/man1/monkeysphere.14
-rw-r--r--man/man8/monkeysphere-server.84
3 files changed, 5 insertions, 10 deletions
diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index c3c7993..41b2e40 100644
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -37,7 +37,7 @@ connection to the host itself.
.SH KEYSERVER CHECKING
The proxy command has a fairly nuanced policy for when keyservers are
-queried when processing host. If the host userID is not found in
+queried when processing a host. If the host userID is not found in
either the user's keyring or in the known_hosts file, then the
keyserver is queried for the host userID. If the host userID is found
in the user's keyring, then the keyserver is not checked. This
@@ -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..b0c896f 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 (INFO). 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..25dfac7 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 (INFO). Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+increasing order of verbosity.
.TP
MONKEYSPHERE_KEYSERVER
OpenPGP keyserver to use (subkeys.pgp.net).