aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.conf.510
-rw-r--r--doc/mpdconf.example14
2 files changed, 18 insertions, 6 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index efe95167d..d52f07200 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -71,10 +71,14 @@ reports from what address a connection is opened, and when it is closed, and
"verbose" records excessive amounts of information for debugging purposes. The
default is "default".
.TP
+.B zeroconf_enabled <yes or no>
+If yes, and MPD has been compiled with support for Avahi or Bonjour, service
+information will be published with Zeroconf. The default is yes.
+.TP
.B zeroconf_name <name>
-If Zerconf is compiled into MPD, this is the service name to publish. This
-should be unique to your local network, but name collisions will be properly
-dealt with.
+If Zeroconf is enabled, this is the service name to publish. This name should
+be unique to your local network, but name collisions will be properly dealt
+with. The default is "Music Player".
.TP
.B password <password@permissions>
This specifies a password for access to mpd. The format is
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 8cd367541..aff3db430 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -45,9 +45,17 @@ error_file "~/.mpd/mpd.error"
#
#log_level "default"
#
-# If Zeroconf is configured, the service name to publish. This
-# should be unique on your local network, but name collisions
-# will be taken care of for you.
+################################################################
+
+
+########################### ZEROCONF ###########################
+#
+# If yes, service information will be published with Zeroconf.
+#
+#zeroconf_enabled "yes"
+#
+# The service name to publish. This name should be unique on
+# your local network.
#
#zeroconf_name "Music Player"
#