summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorkaliko <kaliko@azylum.org>2020-11-07 16:53:10 +0100
committerMax Kellermann <max@musicpd.org>2020-11-10 15:58:34 +0100
commit004d6a3b6605cbe0c555daad9690806f31d8caa9 (patch)
treee2f7b69a24636015f5b622c6e538851d1b4646ff /doc
parent3e79e62c17bd3b7b1445b3b5753e2d708735c02e (diff)
doc/mpd.1.rst: Update config file documentation.
Have similar information about config file in both mpd.1 ans mpd.conf.5
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.1.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/mpd.1.rst b/doc/mpd.1.rst
index 7dbbb1344..5a1d47288 100644
--- a/doc/mpd.1.rst
+++ b/doc/mpd.1.rst
@@ -13,7 +13,7 @@ DESCRIPTION
MPD is a daemon for playing music. Music is played through the configured audio output(s) (which are generally local, but can be remote). The daemon stores info about all available music, and this info can be easily searched and retrieved. Player control, info retrieval, and playlist management can all be managed remotely.
MPD searches for a config file in ``$XDG_CONFIG_HOME/mpd/mpd.conf``
-then ``~/.mpdconf`` then ``/etc/mpd.conf`` or uses ``CONF_FILE``.
+then ``~/.mpdconf`` then ``~/.mpd/mpd.conf`` then ``/etc/mpd.conf`` or uses ``CONF_FILE``.
Read more about MPD at http://www.musicpd.org/
@@ -53,8 +53,8 @@ OPTIONS
FILES
-----
-:file:`~/.mpdconf`
- User configuration file.
+:file:`$XDG_CONFIG_HOME/mpd/mpd.conf`
+ User configuration file (usually :file:`~/.config/mpd/mpd.conf`).
:file:`/etc/mpd.conf`
Global configuration file.