diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-02 20:37:25 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-02 20:37:25 -0400 |
| commit | 8308d8f9ae389c514ddd08a805fe7b07b989342d (patch) | |
| tree | 64a3c2c9848f63473753dba2d4068a285f0cdcb7 | |
| parent | d4dc8a9e491063144a8f4f845f5d05140ce19ed6 (diff) | |
| parent | ca7568cbe62bef653cf39106248cddd0a4b1296f (diff) | |
Merge commit 'jrollins/master'
| -rw-r--r-- | man/man1/monkeysphere-ssh-proxycommand.1 | 2 | ||||
| -rw-r--r-- | man/man1/monkeysphere.1 | 4 | ||||
| -rw-r--r-- | man/man8/monkeysphere-server.8 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1 index 9aad232..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 diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 5ed2153..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, VERBOSE, 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 4848625..25dfac7 100644 --- a/man/man8/monkeysphere-server.8 +++ b/man/man8/monkeysphere-server.8 @@ -183,7 +183,7 @@ the monkeysphere-server.conf configuration file (defaults in parentheses): .TP MONKEYSPHERE_LOG_LEVEL -Set the log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in +Set the log level (INFO). Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in increasing order of verbosity. .TP MONKEYSPHERE_KEYSERVER |