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

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
comparison
equal deleted inserted replaced
17868:03f12c4dac0d 17869:9e1b5526b0da
474 The system-wide configuration file 'mplayer.conf' is in your configuration 474 The system-wide configuration file 'mplayer.conf' is in your configuration
475 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the user 475 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the user
476 specific one is '~/\:.mplayer/\:config'. 476 specific one is '~/\:.mplayer/\:config'.
477 The configuration file for MEncoder is 'mencoder.conf' in your configuration 477 The configuration file for MEncoder is 'mencoder.conf' in your configuration
478 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the 478 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the
479 user specific one is '~/\:.mplayer/\:mencoder. 479 user specific one is '~/\:.mplayer/\:mencoder.conf.
480 User specific options override system-wide options and options given on the 480 User specific options override system-wide options and options given on the
481 command line override either. 481 command line override either.
482 The syntax of the configuration files is 'option=<value>', everything after 482 The syntax of the configuration files is 'option=<value>', everything after
483 a '#' is considered a comment. 483 a '#' is considered a comment.
484 Options that work without values can be enabled by setting them to 'yes' 484 Options that work without values can be enabled by setting them to 'yes'
9558 .TP 9558 .TP
9559 ~/.mplayer/\:config 9559 ~/.mplayer/\:config
9560 MPlayer user settings 9560 MPlayer user settings
9561 . 9561 .
9562 .TP 9562 .TP
9563 ~/.mplayer/\:mencoder 9563 ~/.mplayer/\:mencoder.conf
9564 MEncoder user settings 9564 MEncoder user settings
9565 . 9565 .
9566 .TP 9566 .TP
9567 ~/.mplayer/\:input.conf 9567 ~/.mplayer/\:input.conf
9568 input bindings (see '\-input keylist' for the full list) 9568 input bindings (see '\-input keylist' for the full list)