X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere.conf;h=ce6e82a5dd46df97fb05731b04bb03b8e0fed2d7;hb=117605f3a266c41593cade3f6344d108a772096d;hp=d9bbad34a7fff598db0b44ce7500eb6366ad3d97;hpb=bb2427c28bf40179c4881b22c23f23f9bea78f55;p=monkeysphere.git

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index d9bbad3..ce6e82a 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -1,30 +1,31 @@
-# MonkeySphere system-wide client configuration file.
+# Monkeysphere system-wide client configuration file.
 
 # This is an sh-style shell configuration file.  Variable names should
-# be separated from their assignements by a single '=' and no spaces.
-# Environement variables with the same names as these variables but
-# prefeced by "MONKEYSPHERE_" will take precedence over the values
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# prefaced by "MONKEYSPHERE_" will take precedence over the values
 # specified here.
 
-# Log level.  Can be SILENT, ERROR, INFO, DEBUG, in increasing order
-# of verbosity.
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
 #LOG_LEVEL=INFO
 
 # GPG home directory.  If not specified either here or in the
 # MONKEYSPHERE_GNUPGHOME environment variable, then the value of the
 # GNUPGHOME environment variable will be used.  If GNUPGHOME is not
 # set either, then the default value is listed below.
-# GNUPGHOME=~/.gnupg
+#GNUPGHOME=~/.gnupg
 
 # GPG keyserver to search for keys.
-#KEYSERVER=subkeys.pgp.net
+#KEYSERVER=pool.sks-keyservers.net
 
 # Set whether or not to check keyservers at every monkeysphere
 # interaction, including all ssh connections if you use the
-# monkeysphere-ssh-proxycommand.
-# NOTE: setting CHECK_KEYSERVER to true will leak information about
-# the timing and frequency of your ssh connections to the maintainer
-# of the keyserver.
+# monkeysphere ssh-proxycommand.  Leave unset for default behavior
+# (see KEYSERVER CHECKING in monkeysphere(1)), or set to true or false.
+# NOTE: setting CHECK_KEYSERVER explicitly to true will leak
+# information about the timing and frequency of your ssh connections
+# to the maintainer of the keyserver.
 #CHECK_KEYSERVER=true
 
 # The path to the SSH known_hosts file.
@@ -36,3 +37,7 @@
 
 # The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys
+
+# Set to true to enable validation agent during X session startup
+# where available.
+#USE_VALIDATION_AGENT=false