summaryrefslogtreecommitdiffstats
path: root/DOCS/man/mpv.rst
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-10-03 02:18:48 -0700
committerwm4 <wm4@nowhere>2014-10-04 01:29:12 +0200
commitd4d37245a6e694d7723dc74f4fb01f312bf5be91 (patch)
treeb071083b7ca31a4eb778e7cbf7649308e9cabe40 /DOCS/man/mpv.rst
parentcc9973f4e0268bc17cf95ec39af194d0136e0c0d (diff)
downloadmpv-d4d37245a6e694d7723dc74f4fb01f312bf5be91.tar.bz2
mpv-d4d37245a6e694d7723dc74f4fb01f312bf5be91.tar.xz
manpage: improve consistency with new ~/.config/mpv default
Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'DOCS/man/mpv.rst')
-rw-r--r--DOCS/man/mpv.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 16c2a89308..f4069fedce 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -265,7 +265,7 @@ need to escape special characters. To work this around, the path can be
additionally wrapped in the ``%n%string_of_length_n`` syntax (see above).
Some mpv options interpret paths starting with ``~``. Currently, the prefix
-``~~/`` expands to the mpv configuration directory (usually ``~/.mpv/``).
+``~~/`` expands to the mpv configuration directory (usually ``~/.config/mpv/``).
``~/`` expands to the user's home directory. (The trailing ``/`` is always
required.)
@@ -355,11 +355,11 @@ File-specific Configuration Files
You can also write file-specific configuration files. If you wish to have a
configuration file for a file called 'video.avi', create a file named
'video.avi.conf' with the file-specific options in it and put it in
-``~/.mpv/``. You can also put the configuration file in the same directory
+``~/.config/mpv/``. You can also put the configuration file in the same directory
as the file to be played, as long as you give the ``--use-filedir-conf``
option (either on the command line or in your global config file). If a
file-specific configuration file is found in the same directory, no
-file-specific configuration is loaded from ``~/.mpv``. In addition, the
+file-specific configuration is loaded from ``~/.config/mpv``. In addition, the
``--use-filedir-conf`` option enables directory-specific configuration files.
For this, mpv first tries to load a mpv.conf from the same directory
as the file played and then tries to load any file-specific configuration.