[MPlayer-DOCS] CVS: main/DOCS/xml/en audio.xml, 1.12, 1.13 cd-dvd.xml, 1.10, 1.11 install.xml, 1.31, 1.32 tvinput.xml, 1.8, 1.9 usage.xml, 1.14, 1.15 video.xml, 1.42, 1.43

[Maciej Paszta CVS]

Update of /cvsroot/mplayer/main/DOCS/xml/en
In directory mail:/tmp/cvs-serv23548

Modified Files:
	audio.xml cd-dvd.xml install.xml tvinput.xml usage.xml 
	video.xml 
Log Message:
<replaceable> tags' attack :P

Index: audio.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/audio.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audio.xml	30 Nov 2003 13:07:40 -0000	1.12
+++ audio.xml	1 Jan 2004 17:44:41 -0000	1.13
@@ -346,7 +346,7 @@
 
 <para>
 Example:
-<screen>mplayer -af resample,pan movie.avi</screen>
+<screen>mplayer -af resample,pan <replaceable>movie.avi</replaceable></screen>
 would run the sound through the resampling filter followed by the pan filter.
 Observe that the list must not contain any spaces, else it will fail.
 </para>
@@ -356,7 +356,7 @@
 are explained in detail in the sections below. A filter will execute using
 default settings if its options are omitted. Here is an example of how to use
 filters in combination with filter specific options:
-<screen>mplayer -af resample=11025,pan=1:0.5:0.5 -channels 1 -srate 11025 media.avi</screen>
+<screen>mplayer -af resample=11025,pan=1:0.5:0.5 -channels 1 -srate 11025 <replaceable>media.avi</replaceable></screen>
 would set the output frequency of the resample filter to 11025Hz and downmix
 the audio to 1 channel using the pan filter.
 </para>
@@ -595,7 +595,7 @@
 
 <para>
 Example 1:
-<screen>mplayer -af channels=4:4:0:1:1:0:2:2:3:3 media.avi</screen>
+<screen>mplayer -af channels=4:4:0:1:1:0:2:2:3:3 <replaceable>media.avi</replaceable></screen>
 would change the number of channels to 4 and set up 4 routes that swap
 channel 0 and channel 1 and leave channel 2 and 3 intact. Observe that
 if media containing two channels was played back, channels 2 and 3 would
@@ -604,7 +604,7 @@
 
 <para>
 Example 2:
-<screen>mplayer -af channels=6:4:0:0:0:1:0:2:0:3 media.avi</screen>
+<screen>mplayer -af channels=6:4:0:0:0:1:0:2:0:3 <replaceable>media.avi</replaceable></screen>
 would change the number of channels to 6 and set up 4 routes that copy
 channel 0 to channels 0 to 3. Channel 4 and 5 will contain silence.
 </para>
@@ -642,7 +642,7 @@
 
 <para>
 Example:
-<screen>mplayer -af format=4:float media.avi</screen>
+<screen>mplayer -af format=4:float <replaceable>media.avi</replaceable></screen>
 would set the output format to 4 bytes per sample floating point data.
 </para>
 </sect4>
@@ -691,7 +691,7 @@
 
 <para>
 Example:
-<screen>mplayer -af delay=10.5:10.5:0:0:7:0 media.avi</screen>
+<screen>mplayer -af delay=10.5:10.5:0:0:7:0 <replaceable>media.avi</replaceable></screen>
 would delay front left and right by 10.5ms, the two rear channels and the sub
 by 0ms and the center channel by 7ms.
 </para>
@@ -734,7 +734,7 @@
 
 <para>
 Example:
-<screen>mplayer -af volume=10.1:0 media.avi</screen>
+<screen>mplayer -af volume=10.1:0 <replaceable>media.avi</replaceable></screen>
 would amplify the sound by 10.1dB and hard-clip if the sound level is too high.
 </para>
 
@@ -802,7 +802,7 @@
 
 <para>
 Example:
-<screen>mplayer -af equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi</screen>
+<screen>mplayer -af equalizer=11:11:10:5:0:-12:0:5:12:12 <replaceable>media.avi</replaceable></screen>
 would amplify the sound in the upper and lower frequency region while
 canceling it almost completely around 1kHz.
 </para>
@@ -853,13 +853,13 @@
 
 <para>
 Example 1:
-<screen>mplayer -af pan=1:0.5:0.5 -channels 1 media.avi</screen>
+<screen>mplayer -af pan=1:0.5:0.5 -channels 1 <replaceable>media.avi</replaceable></screen>
 would down-mix from stereo to mono.
 </para>
 
 <para>
 Example 2:
-<screen>mplayer -af pan=3:1:0:1:0.5:0.5 -channels 3 media.avi</screen>
+<screen>mplayer -af pan=3:1:0:1:0.5:0.5 -channels 3 <replaceable>media.avi</replaceable></screen>
 would give 3 channel output leaving channels 0 and 1 intact, and mix
 channels 0 and 1 into output channel 2 (which could be sent to a
 sub-woofer for example).
@@ -904,7 +904,7 @@
 
 <para>
 Example:
-<screen>mplayer -af sub=100:4 -channels 5 media.avi</screen>
+<screen>mplayer -af sub=100:4 -channels 5 <replaceable>media.avi</replaceable></screen>
 would add a sub-woofer channel with a cutoff frequency of
 100Hz to output channel 4.
 </para>
@@ -937,7 +937,7 @@
 
 <para>
 Example:
-<screen>mplayer -af surround=15 -channels 4 media.avi</screen>
+<screen>mplayer -af surround=15 -channels 4 <replaceable>media.avi</replaceable></screen>
 would add surround sound decoding with 15ms delay for the sound to the
 rear speakers.
 </para>
@@ -978,7 +978,7 @@
 
 <para>
 Example:
-<screen>mplayer -af export=/tmp/mplayer-af_export:1024 media.avi</screen>
+<screen>mplayer -af export=/tmp/mplayer-af_export:1024 <replaceable>media.avi</replaceable></screen>
 would export 1024 samples per channel to <filename>/tmp/mplayer-af_export</filename>.
 </para>
 </sect4>
@@ -999,7 +999,7 @@
 <option>list</option> argument is required and determines which plugins
 should be used and in which order they should be executed. Example:
 
-<screen>mplayer media.avi -aop list=resample,format</screen>
+<screen>mplayer <replaceable>media.avi</replaceable> -aop list=resample,format</screen>
 
 would run the sound through the resampling plugin followed by the format
 plugin.
@@ -1011,7 +1011,7 @@
 execute using default settings if its switches are omitted.  Here is an
 example of how to use plugins in combination with plugin specific switches:
 
-<screen>mplayer media.avi -aop list=resample,format:fout=44100:format=0x8</screen>
+<screen>mplayer <replaceable>media.avi</replaceable> -aop list=resample,format:fout=44100:format=0x8</screen>
 
 would set the output frequency of the resample plugin to 44100 Hz and the
 output format of the format plugin to AFMT_U8.

Index: cd-dvd.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/cd-dvd.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cd-dvd.xml	8 Dec 2003 22:15:42 -0000	1.10
+++ cd-dvd.xml	1 Jan 2004 17:44:41 -0000	1.11
@@ -78,7 +78,7 @@
 
 <para>
 Example:
-<screen>mplayer dvd://1 -dvd-device /dev/hdc</screen>
+<screen>mplayer dvd://<replaceable>1</replaceable> -dvd-device <replaceable>/dev/hdc</replaceable></screen>
 </para>
 
 <para>
@@ -251,7 +251,7 @@
 standard Video CD (VCD) is as follows:
 <screen>mplayer vcd://<replaceable>&lt;track&gt;</replaceable> [-cdrom-device <replaceable>&lt;device&gt;</replaceable>]</screen>
 Example:
-<screen>mplayer vcd://2 -cdrom-device /dev/hdc</screen>
+<screen>mplayer vcd://<replaceable>2</replaceable> -cdrom-device <replaceable>/dev/hdc</replaceable></screen>
 The default VCD device is <filename>/dev/cdrom</filename>. If your setup
 differs, make a symlink or specify the correct device on the command line
 with the <option>-cdrom-device</option> option.

Index: install.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/install.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- install.xml	26 Dec 2003 15:06:03 -0000	1.31
+++ install.xml	1 Jan 2004 17:44:41 -0000	1.32
@@ -592,10 +592,12 @@
 <para>
 VobSub subtitles consist of a big (some megabytes) <filename>.SUB</filename> file,
 and optional <filename>.IDX</filename> and/or <filename>.IFO</filename>
-files.  If you have files like <filename>sample.sub</filename>,
-<filename>sample.ifo</filename> (optional), <filename>sample.idx</filename> -
-you have to pass <application>MPlayer</application> the
-<option>-vobsub sample [-vobsubid <replaceable>id</replaceable>]</option> options
+files.  If you have files like
+<filename><replaceable>sample.sub</replaceable></filename>,
+<filename><replaceable>sample.ifo</replaceable></filename> (optional),
+<filename><replaceable>sample.idx</replaceable></filename> - you have to pass
+<application>MPlayer</application> the <option>-vobsub sample
+[-vobsubid <replaceable>id</replaceable>]</option> options
 (full path optional). The <option>-vobsubid</option> option is like
 <option>-sid</option> for DVDs, you can choose between subtitle tracks
 (languages) with it. In case that <option>-vobsubid</option> is omitted,
@@ -611,8 +613,9 @@
 <para>
 The other formats consist of a single text file containing timing,
 placement and text information. Usage: If you have a file like
-<filename>sample.txt</filename>, you have to pass the option <option>-sub
-sample.txt</option> (full path optional).
+<filename><replaceable>sample.txt</replaceable></filename>,
+you have to pass the option <option>-sub
+<replaceable>sample.txt</replaceable></option> (full path optional).
 </para>
 </formalpara>
 
@@ -687,7 +690,7 @@
 editing/timing/joining/cutting easy</emphasis>. And, if you - say - get an
 SSA subtitle but it's badly timed/delayed to your version of the movie, you
 simply do a
-<screen>mplayer dummy.avi -sub source.ssa -dumpmpsub</screen>
+<screen>mplayer <replaceable>dummy.avi</replaceable> -sub source.ssa -dumpmpsub</screen>
 A <filename>dump.mpsub</filename> file will be created in the
 current directory, which will contain the source subtitle's text, but in
 <emphasis role="bold">MPsub</emphasis> format. Then you can freely add/subtract
@@ -741,7 +744,8 @@
   <systemitem class="library">fontconfig</systemitem> font name
   and defaults to the sans-serif font. To get a list of fonts known to 
   <systemitem class="library">fontconfig</systemitem>,
-  use <command>fc-list</command>. Example: <option>-font 'Bitstream Vera Sans'</option>
+  use <command>fc-list</command>. Example: <option>-font
+  <replaceable>'Bitstream Vera Sans'</replaceable></option>
   </para></listitem>
 <listitem><para>
   Download ready-to-use font packages from <application>MPlayer</application>
@@ -794,7 +798,7 @@
 one of the extracted directories to <filename class="directory">font</filename>,
 for example:
 
-<screen>ln -s ~/.mplayer/arial-24 ~/.mplayer/font</screen>
+<screen>ln -s <replaceable>~/.mplayer/arial-24</replaceable> ~/.mplayer/font</screen>
 
 Now you have to see a timer at the upper left corner of the movie (switch
 it off with the <keycap>o</keycap> key).
@@ -866,7 +870,7 @@
   </simpara></listitem>
 <listitem><para>
   start <application>MPlayer</application> by the following example:
-  <screen>$ mplayer -menu file.avi</screen>
+  <screen>$ mplayer -menu <replaceable>file.avi</replaceable></screen>
   </para></listitem>
 <listitem><simpara>
   push any menu key you defined

Index: tvinput.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/tvinput.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tvinput.xml	30 Nov 2003 13:07:40 -0000	1.8
+++ tvinput.xml	1 Jan 2004 17:44:41 -0000	1.9
@@ -178,7 +178,7 @@
      mencoder -tv driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \
      -oac mp3lame -lameopts cbr:br=64 \
-     -vf crop=720:544:24:16,pp=lb -o output.avi tv://
+     -vf crop=720:544:24:16,pp=lb -o <replaceable>output.avi</replaceable> tv://
 </screen>
 </para>
 </informalexample>
@@ -194,7 +194,7 @@
      mencoder -tv driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=350:vhq:vqmax=31:keyint=300 \
      -oac mp3lame -lameopts cbr:br=48 \
-     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o output.avi tv://
+     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o <replaceable>output.avi</replaceable> tv://
 </screen>
 It's also possible to specify smaller image dimensions in the <option>-tv</option>
 option and omit the software scaling but this approach uses the maximum available

Index: usage.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/usage.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- usage.xml	30 Nov 2003 16:36:04 -0000	1.14
+++ usage.xml	1 Jan 2004 17:44:41 -0000	1.15
@@ -15,7 +15,7 @@
 and options written after filenames, that apply only to the given
 filename/URL/whatever, for example:
 
-<screen>mplayer -vfm 5 movie1.avi movie2.avi -vfm 4</screen>
+<screen>mplayer -vfm 5 movie1.avi <replaceable>movie2.avi</replaceable> -vfm 4</screen>
 </para>
 
 <para>
@@ -86,11 +86,11 @@
 <para>
 Examples:
 <screen>
-mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
-mplayer vcd://2 -cd-rom-device /dev/hdc
-mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
-mplayer dvd://1 -dvd-device /dev/hdc
-mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi<!--
+mplayer -vo x11 <replaceable>/mnt/Films/Contact/contact2.mpg</replaceable>
+mplayer vcd://<replaceable>2</replaceable> -cd-rom-device <replaceable>/dev/hdc</replaceable>
+mplayer -afm 3 <replaceable>/mnt/DVDtrailers/alien4.vob</replaceable>
+mplayer dvd://<replaceable>1</replaceable> -dvd-device <replaceable>/dev/hdc</replaceable>
+mplayer -abs 65536 -delay -0.4 -nobps <replaceable>~/movies/test.avi</replaceable><!--
 --></screen>
 </para>
 </sect1>
@@ -416,19 +416,19 @@
 <application>MPlayer</application> also honors the
 <envar>http_proxy</envar> environment variable, and uses proxy if
 available.  Proxy usage can also be forced:
-<screen>mplayer http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf</screen>
+<screen>mplayer <replaceable>http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf</replaceable></screen>
 </para>
 
 <para>
 <application>MPlayer</application> can read from stdin
 (<emphasis>not</emphasis> named pipes). This can be for example used to
 play from FTP:
-<screen>wget ftp://micorsops.com/something.avi -O - | mplayer -</screen>
+<screen>wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -</screen>
 </para>
 
 <note><para>
 Note: it's also recommended to enable <option>-cache</option> when playback from network:
-<screen>wget ftp://micorsops.com/something.avi -O - | mplayer -cache 8192 -</screen>
+<screen>wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -cache 8192 -</screen>
 </para></note>
 </sect1>
 
@@ -465,11 +465,11 @@
 line arguments so just enter <filename>netstream</filename>. Now you can
 for example play the second track of a VCD on the server with :
 <screen>
-mplayer -cache 5000 mpst://servername/vcd://2
+mplayer -cache 5000 <replaceable>mpst://servername/vcd://2</replaceable>
 </screen>
 You can also access files on this server :
 <screen>
-mplayer -cache 5000 mpst://servername//usr/local/movies/lol.avi
+mplayer -cache 5000 <replaceable>mpst://servername//usr/local/movies/lol.avi</replaceable>
 </screen>
 Note that paths which aren't starting with a / will be relative to
 the directory where the server is running. The <option>-cache</option> option is not

Index: video.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/video.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- video.xml	30 Nov 2003 13:07:40 -0000	1.42
+++ video.xml	1 Jan 2004 17:44:41 -0000	1.43
@@ -387,9 +387,9 @@
 user, then install <application>MPlayer</application> SUID root:
 
 <screen>
-chown root /usr/local/bin/mplayer
-chmod 750 /usr/local/bin/mplayer
-chmod +s /usr/local/bin/mplayer
+chown root <replaceable>/usr/local/bin/mplayer</replaceable>
+chmod 750 <replaceable>/usr/local/bin/mplayer</replaceable>
+chmod +s <replaceable>/usr/local/bin/mplayer</replaceable>
 </screen>
 
 Now it works as a simple user, too.
@@ -817,7 +817,9 @@
 
 <para>
 If you want to change to a specific mode, then use
-<screen>mplayer -vm -fbmode <replaceable>name_of_mode</replaceable> <replaceable>filename</replaceable></screen>
+<screen>
+mplayer -vm -fbmode <replaceable>name_of_mode</replaceable> <replaceable>filename</replaceable>
+</screen>
 </para>
 
 <itemizedlist>
@@ -1387,9 +1389,9 @@
 Also you can specify VIDIX's driver directly as third subargument in
 command line:
 
-<screen>mplayer -vo xvidix:mga_vid.so -fs -zoom -double file.avi</screen>
+<screen>mplayer -vo xvidix:mga_vid.so -fs -zoom -double <replaceable>file.avi</replaceable></screen>
 or
-<screen>mplayer -vo vesa:vidix:radeon_vid.so -fs -zoom -double -bpp 32 file.avi</screen>
+<screen>mplayer -vo vesa:vidix:radeon_vid.so -fs -zoom -double -bpp 32 <replaceable>file.avi</replaceable></screen>
 
 But it's dangerous, and you shouldn't do that. In this case given driver
 will be forced and result is unpredictable (it may
@@ -1516,7 +1518,7 @@
   wmv7, wmv8</systemitem> and some others. Please note that this is only
   a temporal inconvenience. The usage syntax is as follows:
   <screen>
-    mplayer -vf format=uyvy -vc divxds divx3file.avi
+    mplayer -vf format=uyvy -vc divxds <replaceable>divx3file.avi</replaceable>
   </screen>
   </para></listitem>
 </itemizedlist>
@@ -1527,7 +1529,7 @@
   framebuffer or X magic whatsoever. For this purpose, we'll have to use the
   <option>cvidix</option> video output, as the following example shows:
   <screen>
-    mplayer -vf format=uyvy -vc divxds -vo cvidix example.avi
+    mplayer -vf format=uyvy -vc divxds -vo cvidix <replaceable>example.avi</replaceable>
   </screen>
 </para>
 
@@ -1638,15 +1640,17 @@
 </para>
 </formalpara>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes file.mpg|vob</screen></para>
+<para>
+<screen>mplayer -ao mpegpes -vo mpegpes <replaceable>file.mpg|vob</replaceable></screen>
+</para>
 
 <para>
 Software decoding or transcoding different formats to MPEG1 can be achieved using
 a command like this:
 </para>
 <para><screen>
-mplayer -ao mpegpes -vo mpegpes yourfile.ext
-mplayer -ao mpegpes -vo mpegpes -vf expand yourfile.ext
+mplayer -ao mpegpes -vo mpegpes <replaceable>yourfile.ext</replaceable>
+mplayer -ao mpegpes -vo mpegpes -vf expand <replaceable>yourfile.ext</replaceable>
 </screen></para>
 
 <para>
@@ -1666,18 +1670,24 @@
 640x384 DivX, try:
 </para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vf expand=640:576 file.avi
-</screen></para>
+<para>
+<screen>mplayer -ao mpegpes -vo mpegpes -vf expand=640:576 <replaceable>file.avi</replaceable>
+</screen>
+</para>
 
 <para>If your CPU is too slow for a full size 720x576 DivX, try downscaling:</para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 file.avi
-</screen></para>
+<para>
+<screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 <replaceable>file.avi</replaceable>
+</screen>
+</para>
 
 <para>If speed does not improve, try vertical downscaling, too:</para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:288 file.avi
-</screen></para>
+<para>
+<screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:288 <replaceable>file.avi</replaceable>
+</screen>
+</para>
 
 <para>
 For OSD and subtitles use the OSD feature of the expand filter. So, instead of
@@ -2015,7 +2025,9 @@
 the movie to a width of 768, 384 or 192. For performance and quality reasons,
 I would choose to scale the movie to 384x204 using the fast bilinear software
 scaler. The commandline is
-<screen>mplayer -vo zr -sws 0 -vf scale=384:204 movie.avi</screen>
+<screen>
+mplayer -vo zr -sws 0 -vf scale=384:204 <replaceable>movie.avi</replaceable>
+</screen>
 </para>
 
 <para>
@@ -2023,12 +2035,16 @@
 driver itself. Suppose that a movie is too wide for display on your Buz and
 that you want to use <option>-zrcrop</option> to make the movie less wide,
 then you would issue the following command
-<screen>mplayer -vo zr -zrcrop 720x320+80+0 benhur.avi</screen>
+<screen>
+mplayer -vo zr -zrcrop 720x320+80+0 <replaceable>benhur.avi</replaceable>
+</screen>
 </para>
 
 <para>
 if you want to use the <option>crop</option> filter, you would do
-<screen>mplayer -vo zr -vf crop=720:320:80:0 benhur.avi</screen>
+<screen>
+mplayer -vo zr -vf crop=720:320:80:0 <replaceable>benhur.avi</replaceable>
+</screen>
 </para>
 
 <para>
@@ -2042,7 +2058,8 @@
 issue the following command
 <screen>
 mplayer -vo zr -zrdev /dev/video0 -zrcrop 352x288+352+0 -zrxdoff 0 -zrbw \
-          -zrcrop 352x288+0+0 -zrdev /dev/video1 -zrquality 10 movie.avi
+          -zrcrop 352x288+0+0 -zrdev /dev/video1 -zrquality 10 \
+	  <replaceable>movie.avi</replaceable>
 </screen>
 </para>