summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-10-26 10:26:20 -0400
committerJameson Rollins <jrollins@finestructure.net>2010-10-26 10:26:20 -0400
commitbe329ef6caff54b907a1abfeb58526f98d6ac669 (patch)
treef52f7f3bd9eb0765e4267d286d7c5c70c341d210
parent52b5254120e8140ef72277408f8ba1f6addd1cf7 (diff)
add note about CHECK_KEYSERVER var in msph-auth man page
-rw-r--r--Changelog4
-rw-r--r--man/man8/monkeysphere-authentication.83
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 54db99c..b874282 100644
--- a/Changelog
+++ b/Changelog
@@ -7,8 +7,10 @@ monkeysphere (0.34~pre) unstable; urgency=low
* update authorized_keys and known_hosts in temp file that are
atomically moved into place
* don't fail if authorized_keys file not already present (Closes: 600644)
+ * document CHECK_KEYSERVER in monkeysphere-authentication man page
+ (close MS #2556)
- -- Jameson Rollins <jrollins@finestructure.net> Fri, 22 Oct 2010 16:23:31 -0400
+ -- Jameson Rollins <jrollins@finestructure.net> Tue, 26 Oct 2010 10:24:58 -0400
monkeysphere (0.33) unstable; urgency=low
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index 1592c99..1d49f9f 100644
--- a/man/man8/monkeysphere-authentication.8
+++ b/man/man8/monkeysphere-authentication.8
@@ -158,6 +158,9 @@ increasing order of verbosity. (INFO)
MONKEYSPHERE_KEYSERVER
OpenPGP keyserver to use. (pool.sks\-keyservers.net)
.TP
+MONKEYSPHERE_CHECK_KEYSERVER
+Whether or not to check the keyserver when making gpg queries. (true)
+.TP
MONKEYSPHERE_AUTHORIZED_USER_IDS
Path to user's authorized_user_ids file. %h gets replaced with the
user's homedir, %u with the username.