Mercurial > mplayer.hg

diff DOCS/man/en/mplayer.1 @ 17869:9e1b5526b0da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author diego
date Tue, 14 Mar 2006 23:33:37 +0000
parents 8abdf3618732
children d526e19c56c3
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Tue Mar 14 22:15:24 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Mar 14 23:33:37 2006 +0000
@@ -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