aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJérôme Quelin <jquelin@gmail.com>2009-01-14 14:27:17 +0100
committerMax Kellermann <max@duempel.org>2009-01-14 14:31:55 +0100
commitae5517b0b3a01c4e3e678f77d85f30b7ac3f3273 (patch)
tree0e49bb5110d8110be0b4df17b27116eae8913130 /doc
parent642b861526084658a7b10beb9cbb81000d23432d (diff)
downloadmpd-ae5517b0b3a01c4e3e678f77d85f30b7ac3f3273.tar.gz
mpd-ae5517b0b3a01c4e3e678f77d85f30b7ac3f3273.tar.xz
mpd-ae5517b0b3a01c4e3e678f77d85f30b7ac3f3273.zip
allow ~/.mpd/mpd.conf as alternate config file
mpd uses some additional files to work, such as pid_file, state_file, db_file, etc. when running mpd as non-root user, it is often that those files end in ~/.mpd in that case, we end up with 2 entries in a user's home, .mpdconf and .mpd - which clutters homedirs. this patch allows ~/.mpd/mpd.conf as an alternative to ~/.mpdconf, allowing for a cleaner homedir
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.conf.54
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index cced775a7..0440dda06 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -3,8 +3,8 @@
mpd.conf \- Music Player Daemon configuration file
.SH DESCRIPTION
\fBmpd.conf\fP is the configuration file for mpd(1). If not specified on the
-command line, MPD first searches for it at \fB~/.mpdconf\fP and then in
-\fB/etc/mpd.conf\fP.
+command line, MPD first searches for it at \fB~/.mpdconf\fP then at
+\fB~/.mpd/mpd.conf\fP and then in \fB/etc/mpd.conf\fP.
Lines beginning with a "#" character are comments. All other non-empty lines
specify parameters and their values. These lines contain the parameter name