summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-02 19:44:15 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-02 19:44:15 +0000
commit8eaac761417661ed0939181f1d354a0bb00106fa (patch)
tree4cb720a0962f7c7140b10a1c4039413668c7b793 /DOCS/man/en
parent7e8ff35fd2a29aef702b3a3170f7d7123e449a9a (diff)
downloadmpv-8eaac761417661ed0939181f1d354a0bb00106fa.tar.bz2
mpv-8eaac761417661ed0939181f1d354a0bb00106fa.tar.xz
Document directory-specific configuration file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29635 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/man/en')
-rw-r--r--DOCS/man/en/mplayer.15
1 files changed, 5 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 0f23f7004d..c7b879ba99 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -527,6 +527,11 @@ named 'movie.avi.conf' with the file-specific options in it and put it in
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 file-specific configuration file is found in the same directory, no file-specific
+one is loaded from ~/.mplayer.
+In addition the \-use\-filedir\-conf also enables directory-specific configuration files,
+MPlayer tries to first load a mplayer.conf from the same directory as the file played
+and then tries to load any file-specific configuration.
.PP
.I EXAMPLE MPLAYER CONFIGURATION FILE:
.sp 1