[MPlayer-DOCS] r33684 - in trunk/DOCS/man: de/mplayer.1 en/mplayer.1

[ib]

Author: ib
Date: Mon Jun 20 01:52:04 2011
New Revision: 33684

Log:
Explain role of the GUI configuration file in
conjunction with the other configuration files.

Modified:
   trunk/DOCS/man/en/mplayer.1

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/de/mplayer.1

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Mon Jun 20 01:32:17 2011	(r33683)
+++ trunk/DOCS/man/en/mplayer.1	Mon Jun 20 01:52:04 2011	(r33684)
@@ -497,8 +497,10 @@ specific one is '~/\:.mplayer/\:config'.
 The configuration file for MEncoder is 'mencoder.conf' in your configuration
 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the
 user specific one is '~/\:.mplayer/\:mencoder.conf'.
-User specific options override system-wide options and options given on the
-command line override either.
+User specific options override system-wide options (in case of
+.BR gmplayer ,
+gui.conf options override user specific options) and options given on the
+command line override all.
 The syntax of the configuration files is 'option=<value>', everything after
 a '#' is considered a comment.
 Options that work without values can be enabled by setting them to 'yes'