summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-17 02:55:31 +0200
committerwm4 <wm4@nowhere>2014-10-17 02:55:31 +0200
commit01e1d0948d69a1bf6d830de5cae54bd4c1cdab47 (patch)
tree4a8c890aebd8b3e4cf2c4f33e4ca7c38be635da4 /DOCS
parent41b2927f39f08f54039093746e1d1eded826101e (diff)
downloadmpv-01e1d0948d69a1bf6d830de5cae54bd4c1cdab47.tar.bz2
mpv-01e1d0948d69a1bf6d830de5cae54bd4c1cdab47.tar.xz
options: don't load per-file config files by default
Generally useless feature, and might be slightly dangerous if paths can "escape" from the profile dir. (Normally this shouldn't be possible, though.)
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/mpv.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index a005b92349..5078aac61a 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -356,7 +356,7 @@ 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
``~/.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``
+as the file to be played. Both require you to set 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 ``~/.config/mpv``. In addition, the