[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.1239,1.1240

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/DOCS/man/en
In directory mail:/var2/tmp/cvs-serv8495/DOCS/man/en

Modified Files:
	mplayer.1 
Log Message:
The system-wide and the user-specific MEncoder configuration file should both
be called 'mencoder.conf', not two different names over which code and
documentation disagree.


Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -r1.1239 -r1.1240
--- mplayer.1	14 Mar 2006 21:57:58 -0000	1.1239
+++ mplayer.1	14 Mar 2006 23:33:36 -0000	1.1240
@@ -476,7 +476,7 @@
 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.
+user specific one is '~/\:.mplayer/\:mencoder.conf.
 User specific options override system-wide options and options given on the
 command line override either.
 The syntax of the configuration files is 'option=<value>', everything after
@@ -9560,7 +9560,7 @@
 MPlayer user settings
 .
 .TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
 MEncoder user settings
 .
 .TP