Merge commit 'dkg/master'

2 files changed, 19 insertions, 20 deletions

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index adbac7e..b69420a 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -1,29 +1,28 @@
-# MonkeySphere server configuration file.
+# Monkeysphere server 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.
 
 # User who controls the monkeysphere authentication keyring.
 #MONKEYSPHERE_USER=monkeysphere
 
-# 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
 
 # Path to authorized_user_ids file to process to create
 # authorized_keys file.  '%h' will be replaced by the home directory
-# of the user, and %u will be replaced by the username of the user.
+# of the user, and '%u' will be replaced by the username of the user.
 # For purely admin-controlled authorized_user_ids, you might put them
-# in /etc/monkeysphere/authorized_user_ids/%u
+# in /etc/monkeysphere/authorized_user_ids/%u, for instance.
 #AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
 
-# Whether to add user controlled authorized_keys file to
-# monkeysphere-generated authorized_keys file.  Should be path to file
-# where '%h' will be replaced by the home directory of the user or
-# '%u' by the username.  To not add any user-controlled file, put "-"
-# FIXME: this usage of "-" contravenes the normal convention where "-"
-# means standard in/out.  Why not use "none" or "" instead?
+# Path to a user controlled authorized_keys file to be added to the
+# monkeysphere-generated authorized_keys file.  '%h' will be replaced
+# by the home directory of the user, and '%u' will by replaced by the
+# username of the user.  To not add any user-controlled file set this
+# variable to be the empty string, "".
 #RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index a45fff0..2f0b877 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -1,13 +1,13 @@
-# 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