# HG changeset patch
# User reimar
# Date 1251920655 0
# Node ID 78bb10138aa44be816c5580496dd9bed34e32521
# Parent  ccdfb20713eb3b821062263002af965f1e96dd3f
Document directory-specific configuration file.

diff -r ccdfb20713eb -r 78bb10138aa4 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Wed Sep 02 19:43:05 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Sep 02 19:44:15 2009 +0000
@@ -527,6 +527,11 @@
 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