diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-04 14:36:22 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-04 14:36:22 +0200 |
| commit | 9326ce53ecd225269147109d87af763fc3846ddf (patch) | |
| tree | 510b468db4f9007502516c1bf7dc8db65c655da6 /doc | |
| parent | fcb7233b25f21c15e132a9c0e0de5ab5b4f492c7 (diff) | |
| parent | d8217c364a182a12fb8abd19732341af1515ffb0 (diff) | |
| download | mpd-9326ce53ecd225269147109d87af763fc3846ddf.tar.gz mpd-9326ce53ecd225269147109d87af763fc3846ddf.tar.xz mpd-9326ce53ecd225269147109d87af763fc3846ddf.zip | |
Merge tag 'release-0.17.5'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/mpd.conf.5 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 59d5e623a..62f5565e1 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -29,29 +29,18 @@ See \fBdocs/mpdconf.example\fP in the source tarball for an example configuration file. .SH REQUIRED PARAMETERS .TP -.B follow_outside_symlinks <yes or no> -Control if MPD will follow symbolic links pointing outside the music dir. -You must recreate the database after changing this option. -The default is "yes". -.TP -.B follow_inside_symlinks <yes or no> -Control if MPD will follow symbolic links pointing inside the music dir, -potentially adding duplicates to the database. -You must recreate the database after changing this option. -The default is "yes". -.TP .B db_file <file> This specifies where the db file will be stored. .TP -.B sticker_file <file> -The location of the sticker database. This is a database which -manages dynamic information attached to songs. -.TP .B log_file <file> This specifies where the log file should be located. The special value "syslog" makes MPD use the local syslog daemon. .SH OPTIONAL PARAMETERS .TP +.B sticker_file <file> +The location of the sticker database. This is a database which +manages dynamic information attached to songs. +.TP .B pid_file <file> This specifies the file to save mpd's process ID in. .TP @@ -99,6 +88,17 @@ 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 follow_outside_symlinks <yes or no> +Control if MPD will follow symbolic links pointing outside the music dir. +You must recreate the database after changing this option. +The default is "yes". +.TP +.B follow_inside_symlinks <yes or no> +Control if MPD will follow symbolic links pointing inside the music dir, +potentially adding duplicates to the database. +You must recreate the database after changing this option. +The default is "yes". +.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. |