Various murmur.ini fixes.

 * Consistently refer to Mumrur as 'Murmur'.
 * Consistently end comments with a period.
 * Update the comments for logfile and pidfile
   to reflect what actually happens in practice.

1 files changed, 22 insertions, 17 deletions

diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index bc76381ba..12f61a2f8 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -1,4 +1,4 @@
-# murmur configuration file.
+# Murmur configuration file.
 #
 # General notes:
 # * Settings in this file are default settings and many of them can be overridden
@@ -29,11 +29,11 @@ database=
 #dbOpts=
 
 # Murmur defaults to not using D-Bus. If you wish to use dbus, which is one of the
-# RPC methods available in murmur, please specify so here.
+# RPC methods available in Murmur, please specify so here.
 #
 dbus=session
 
-# Alternate service name. Only use if you are running distinct
+# Alternate D-Bus service name. Only use if you are running distinct
 # murmurd processes connected to the same D-Bus daemon.
 #dbusservice=net.sourceforge.mumble.murmur
 
@@ -68,28 +68,33 @@ icesecretwrite=
 #autobanTimeframe = 120
 #autobanTime = 300
 
-# Murmur default to logging to murmur.log. If you leave this blank,
-# murmur will log to the console (linux) or through message boxes (win32).
+# Specifies the file Murmur should log to. By default, Murmur
+# logs to the file 'murmur.log'. If you leave this field blank
+# on Unix-like systems, Murmur will force itself into foreground
+# mode which logs to the console.
 #logfile=murmur.log
 
-# If set, murmur will write its process ID to this file.
+# If set, Murmur will write its process ID to this file
+# when running in daemon mode (when the -fg flag is not
+# specified on the command line). Only available on
+# Unix-like systems.
 #pidfile=
 
 # The below will be used as defaults for new configured servers.
 # If you're just running one server (the default), it's easier to
 # configure it here than through D-Bus or Ice.
 #
-# Welcome message sent to clients when they connect
+# Welcome message sent to clients when they connect.
 welcometext="<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />"
 
-# Port to bind TCP and UDP sockets to
+# Port to bind TCP and UDP sockets to.
 port=64738
 
 # Specific IP or hostname to bind to.
-# If this is left blank (default), murmur will bind to all available addresses.
+# If this is left blank (default), Murmur will bind to all available addresses.
 #host=
 
-# Password to join server
+# Password to join server.
 serverpassword=
 
 # Maximum bandwidth (in bits per second) clients are allowed
@@ -107,12 +112,12 @@ users=100
 # InnoDB will fail when operating on deeply nested channels.
 #channelnestinglimit=10
 
-# Regular expression used to validate channel names
-# (note that you have to escape backslashes with \ )
+# Regular expression used to validate channel names.
+# (Note that you have to escape backslashes with \ )
 #channelname=[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+
 
-# Regular expression used to validate user names
-# (note that you have to escape backslashes with \ )
+# Regular expression used to validate user names.
+# (Note that you have to escape backslashes with \ )
 #username=[-=\\w\\[\\]\\{\\}\\(\\)\\@\\|\\.]+
 
 # Maximum length of text messages in characters. 0 for no limit.
@@ -127,7 +132,7 @@ users=100
 # Murmur retains the per-server log entries in an internal database which
 # allows it to be accessed over D-Bus/ICE.
 # How many days should such entries be kept?
-# Set to 0 to keep forever, or -1 to disable logging to the DB
+# Set to 0 to keep forever, or -1 to disable logging to the DB.
 #logdays=31
 
 # To enable public server registration, the serverpassword must be blank, and
@@ -155,8 +160,8 @@ users=100
 #sslCert=
 #sslKey=
 
-# If murmur is started as root, which user should it switch to?
-# This option is ignored if murmur isn't started with root privileges.
+# If Murmur is started as root, which user should it switch to?
+# This option is ignored if Murmur isn't started with root privileges.
 #uname=
 
 # If this options is enabled, only clients which have a certificate are allowed