diff options
| author | J. Alexander Treuman <jat@spatialrift.net> | 2007-06-03 20:09:12 +0000 |
|---|---|---|
| committer | J. Alexander Treuman <jat@spatialrift.net> | 2007-06-03 20:09:12 +0000 |
| commit | 652c2fc8b0ae2e081f5e94c5810365ead33e726e (patch) | |
| tree | 4c39eced77571cf695730c17ed6535e03e48a13e | |
| parent | 7e2cbdee0575a16211a76d3c9b8afaca09894fa6 (diff) | |
Adding ChangeLog entry for zeroconf_enabled, adding Zeroconf section to
mpdconf.example, and updating the zeroconf_* docs.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6474 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | doc/mpd.conf.5 | 9 | ||||
| -rw-r--r-- | doc/mpdconf.example | 12 |
3 files changed, 14 insertions, 8 deletions
@@ -1,6 +1,7 @@ ver 0.14.0 (????/??/??) * New null audio output plugin * Zeroconf support using Bonjour +* New zeroconf_enabled option so that Zeroconf support can be disabled ver 0.13.0 (2007/5/28) * New JACK audio output diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index c1625c52..d52f0720 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -72,12 +72,13 @@ reports from what address a connection is opened, and when it is closed, and default is "default". .TP .B zeroconf_enabled <yes or no> -Specifies if zeroconf should be enabled or not. +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 3a657c7f..bddc4d48 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -45,13 +45,17 @@ error_file "~/.mpd/mpd.error" # #log_level "default" # -# If Zeroconf support should be enabled. +################################################################ + + +########################### ZEROCONF ########################### +# +# If yes, service information will be published with Zeroconf. # #zeroconf_enabled "yes" # -# 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. +# The service name to publish. This name should be unique on +# your local network. # #zeroconf_name "Music Player" # |