Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKissaki <kissaki@gmx.de>2009-03-09 16:52:27 +0300
committerThorvald Natvig <slicer@users.sourceforge.net>2009-03-10 01:13:06 +0300
commitcb67fc150fa0464dcc979a1260dc4d4467e4b927 (patch)
treed09e1a1884cb370e1f766cbec49a44efa33a05a2 /scripts/murmur.ini
parentb6a6e31d556e5f7c56be26878bb3c0fbc70e6fc7 (diff)
updated murmur.ini documentation
Diffstat (limited to 'scripts/murmur.ini')
-rw-r--r--scripts/murmur.ini16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 00c5fe5dd..d5a5acb5e 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -1,5 +1,5 @@
# Path to database. If blank, will search for
-# murmur.sqlite in default locations.
+# murmur.sqlite in default locations or create it if not found.
database=
# If you wish to use something other than SQLite, you'll need to set the name
@@ -19,7 +19,7 @@ database=
dbus=session
# Alternate service name. Only use if you are running distinct
-# murmurd processes connected to the same dbus daemon.
+# murmurd processes connected to the same D-Bus daemon.
#dbusservice=net.sourceforge.mumble.murmur
# If you want to use ZeroC ICE to communicate with Murmur, you need
@@ -44,9 +44,9 @@ dbus=session
# 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 DBus/SQL.
+# configure it here than through D-Bus/ICE/SQL.
#
-# Welcome message sent to users
+# 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
@@ -60,19 +60,19 @@ port=64738
serverpassword=
# Maximum bandwidth (in bytes per second) clients are allowed
-# send speech at.
+# to send speech at.
bandwidth=5000
# Maximum number of concurrent clients allowed.
users=50
# Murmur retains the per-server log entries in an internal database which
-# allows it to be accessed over D-Bus.
+# allows it to be accessed over D-Bus/ICE.
# How many days should such entries be kept?
#logdays=31
-# To enable public registration, the serverpassword must be blank, and this
-# must all be filled out.
+# To enable public server registration, the serverpassword must be blank, and
+# this must all be filled out.
# The password here is used to create a registry for the server name; subsequent
# updates will need the same password. Don't lose your password.
# The URL is your own website, and only set the registerHostname for static IP