Mercurial > mplayer.hg

changeset 11540:d480f7e36b74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
<application> attack
author wight
date Sun, 30 Nov 2003 13:07:40 +0000
parents 2364dda5fe7e
children 753ca0c44913
files DOCS/xml/en/audio.xml DOCS/xml/en/bugreports.xml DOCS/xml/en/bugs.xml DOCS/xml/en/cd-dvd.xml DOCS/xml/en/codecs.xml DOCS/xml/en/documentation.xml DOCS/xml/en/faq.xml DOCS/xml/en/formats.xml DOCS/xml/en/history.xml DOCS/xml/en/install.xml DOCS/xml/en/mail-lists.xml DOCS/xml/en/mencoder.xml DOCS/xml/en/ports.xml DOCS/xml/en/skin.xml DOCS/xml/en/tvinput.xml DOCS/xml/en/usage.xml DOCS/xml/en/users-vs-dev.xml DOCS/xml/en/video.xml
diffstat 18 files changed, 335 insertions(+), 295 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/en/audio.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/audio.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -400,7 +400,7 @@
 <term><option>3</option></term>
 <listitem><para>
 Use no automatic insertion of filters and no optimization.
-<emphasis>Warning:</emphasis> It may be possible to crash MPlayer
+<emphasis>Warning:</emphasis> It may be possible to crash <application>MPlayer</application>
 using this setting.
 </para></listitem>
 </varlistentry>
@@ -492,7 +492,7 @@
 <title>Up/Downsampling</title>
 
 <para>
-MPlayer fully supports sound up/down-sampling through the
+<application>MPlayer</application> fully supports sound up/down-sampling through the
 <option>resample</option> filter. It can be used if you
 have a fixed frequency sound card or if you are stuck with an old sound card
 that is only capable of max 44.1kHz. This filter is automatically enabled if
@@ -740,9 +740,9 @@
 
 <para>
 This filter has a second feature: It measures the overall maximum sound level
-and prints out that level when MPlayer exits. This volume estimate can be used
-for setting the sound level in MEncoder such that the maximum dynamic range is
-utilized.
+and prints out that level when <application>MPlayer</application> exits.
+This volume estimate can be used for setting the sound level in
+<application>MEncoder</application> such that the maximum dynamic range is utilized.
 </para>
 </sect4>
 
--- a/DOCS/xml/en/bugreports.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/bugreports.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -7,9 +7,9 @@
 software project. But just like writing good software, good problem reports
 involve some work. Please realize that most developers are extremely busy and
 receive obscene amounts of email. So while your feedback is crucial in improving
-MPlayer and very much appreciated, please understand that you have to provide
-<emphasis role="bold">all</emphasis> of the information we request and follow
-the instructions in this document closely.
+<application>MPlayer</application> and very much appreciated, please understand
+that you have to provide <emphasis role="bold">all</emphasis> of the information
+we request and follow the instructions in this document closely.
 </para>
 <sect1 id="bugreports_fix">
 <title>How to fix bugs</title>
@@ -17,7 +17,7 @@
 If you feel have the necessary skills you are invited to have a go at fixing the
 bug yourself. Or maybe you already did that? Please read
 <ulink url="../../tech/patches.txt">this short document</ulink> to find out how to
-get your code included in MPlayer. The people on the
+get your code included in <application>MPlayer</application>. The people on the
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng">mplayer-dev-eng</ulink>
 mailing list will assist you if you have questions.
 </para>
@@ -25,11 +25,12 @@
 <sect1 id="bugreports_report">
 <title>How to report bugs</title>
 <para>
-First of all please try the latest CVS version of MPlayer as your bug might
-already be fixed there. Development moves extremely fast, most problems in
-official releases are reported within days or even hours, so please use
-<emphasis role="bold">only CVS</emphasis> to report bugs. This includes
-binary packages of MPlayer. CVS instructions can be found at the bottom of
+First of all please try the latest CVS version of <application>MPlayer</application>
+as your bug might already be fixed there. Development moves extremely fast,
+most problems in official releases are reported within days or even hours, so
+please use <emphasis role="bold">only CVS</emphasis> to report bugs. This
+includes binary packages of <application>MPlayer</application>. CVS
+instructions can be found at the bottom of
 <ulink url="http://www.mplayerhq.hu/homepage/dload.html">this page</ulink> or in
 the README. If this did not help please refer to the list of
 <link linkend="bugs">known bugs</link> and the rest of the documentation. If your
@@ -40,7 +41,7 @@
 Please do not send bug reports privately to individual developers. This is
 community work and thus there might be several people interested in it. Sometimes
 other users already experienced your troubles and know how to circumvent a problem
-even if it is a bug in MPlayer code.
+even if it is a bug in <application>MPlayer</application> code.
 </para>
 
 <para>
@@ -245,9 +246,9 @@
 <para>
 Also upload a small text file having the same base name as your file with a .txt
 extension. Describe the problem you are having with the particular file there and
-include your email address as well as the output of MPlayer at verbosity level 1.
-Usually the first 1-5 MB of a file are enough to reproduce the problem, but to be
-sure we ask you to:
+include your email address as well as the output of <application>MPlayer</application>
+at verbosity level 1. Usually the first 1-5 MB of a file are enough to reproduce
+the problem, but to be sure we ask you to:
 <screen>dd if=<replaceable>yourfile</replaceable> of=<replaceable>smallfile</replaceable> bs=1024k count=5</screen>
 It will take the first five megabytes of '<emphasis role="bold">your-file</emphasis>'
 and write it to '<emphasis role="bold">small-file</emphasis>'. Then try again on
@@ -270,12 +271,12 @@
 <sect3 id="bugreports_debug">
 <title>How to conserve information about a reproducible crash</title>
 <para>
-Recompile MPlayer with debugging code enabled:
+Recompile <application>MPlayer</application> with debugging code enabled:
 <screen>
 ./configure --enable-debug=3
 make
 </screen>
-and then run MPlayer within gdb using:
+and then run <application>MPlayer</application> within gdb using:
 <screen>gdb ./mplayer</screen>
 You are now within gdb. Type:
 <screen>run -v <replaceable>options-to-mplayer</replaceable> <replaceable>filename</replaceable></screen>
@@ -309,18 +310,18 @@
 <title>I know what I am doing...</title>
 <para>
 If you created a proper bug report following the steps above and you are confident
-it is a bug in MPlayer, not a compiler problem or broken file, you have already
-read the documentation and you could not find a solution, your sound drivers are
-OK, then you might want to subscribe to the mplayer-advusers list and send your
-bug report there to get a better and faster answer.
+it is a bug in <application>MPlayer</application>, not a compiler problem or broken
+file, you have already read the documentation and you could not find a solution,
+your sound drivers are OK, then you might want to subscribe to the mplayer-advusers
+list and send your bug report there to get a better and faster answer.
 </para>
 
 <para>
 Please be advised that if you post newbie questions or questions answered in the
 manual there, you will be ignored or flamed instead of getting an appropriate answer.
 So do not flame us and subscribe to -advusers only if you really know what you are
-doing and feel like being an advanced MPlayer user or developer. If you meet these
-criteria it should not be difficult to find out how to subscribe...
+doing and feel like being an advanced <application>MPlayer</application> user or
+developer. If you meet these criteria it should not be difficult to find out how to subscribe...
 </para>
 
 </sect1>
--- a/DOCS/xml/en/bugs.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/bugs.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -13,13 +13,14 @@
 </listitem>
 <listitem>
 <para>General SIGILL (signal 4):</para>
-<para>Problem: you compiled and run MPlayer on different machines
-(for example compiled on P3 and running on Celeron)</para>
-<para>Solution: compile MPlayer on the same machine where you will use it!</para>
+<para>Problem: you compiled and run <application>MPlayer</application> on
+different machines (for example compiled on P3 and running on Celeron)</para>
+<para>Solution: compile <application>MPlayer</application> on the same machine
+where you will use it!</para>
 <para>Workaround: <command>./configure --disable-sse</command> etc. options</para>
 </listitem>
 <listitem>
-<para>&quot;Internal buffer inconsistency&quot; during MEncoder run:</para>
+<para>&quot;Internal buffer inconsistency&quot; during <application>MEncoder</application> run:</para>
 <para>Problem: known problem when lame &lt; 3.90 was compiled with gcc 2.96 or 3.x.</para>
 <para>Solution: use lame &gt;=3.90.</para>
 <para>Workaround: compile lame with gcc 2.95.x and remove any already installed
@@ -53,7 +54,7 @@
 <itemizedlist>
 <listitem>
 <para>audio buffer problems (buffer size badly detected)</para>
-<para>Workaround: MPlayer's <option>-abs</option> option</para>
+<para>Workaround: <application>MPlayer's</application> <option>-abs</option> option</para>
 </listitem>
 </itemizedlist>
 <itemizedlist>
--- a/DOCS/xml/en/cd-dvd.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/cd-dvd.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -93,9 +93,9 @@
 <application>MPlayer</application> uses <systemitem>libdvdread</systemitem> and
 <systemitem>libdvdcss</systemitem> for DVD decryption and playback. These two
 libraries are contained in the <filename class="directory">libmpdvdkit2/</filename>
-subdirectory of the MPlayer source tree, you do not have to install them separately.
-We opted for this solution because we had to fix a <systemitem>libdvdread</systemitem>
-bug and apply a patch which adds
+subdirectory of the <application>MPlayer</application> source tree, you do not have
+to install them separately. We opted for this solution because we had to fix a
+<systemitem>libdvdread</systemitem> bug and apply a patch which adds
 <emphasis role="bold">cracked CSS keys caching support</emphasis> to
 <systemitem>libdvdcss</systemitem> This results in a large speed increase because the
 keys do not have to be cracked every time before playing.
@@ -119,9 +119,10 @@
 <para>
 Useful if you want to play encoded VOBs from <emphasis role="bold">hard disk</emphasis>.
 Compile and install <emphasis role="bold">libcss</emphasis> 0.0.1 (not newer) for this
-(If MPlayer fails to detect it, use the <option>-csslib /path/to/libcss.so</option>
-option). To use it, you need to be root, use a suid root MPlayer binary or let
-MPlayer call the suid-root fibmap_mplayer wrapper program.
+(If <application>MPlayer</application> fails to detect it, use the
+<option>-csslib /path/to/libcss.so</option> option). To use it, you need to be root,
+use a suid root <application>MPlayer</application> binary or let
+<application>MPlayer</application> call the suid-root fibmap_mplayer wrapper program.
 </para>
 </formalpara>
 
--- a/DOCS/xml/en/codecs.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/codecs.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -531,14 +531,14 @@
 <procedure>
 <title>COMPILING MPLAYER WITH QUICKTIME LIBRARIES SUPPORT</title>
 <note><para>currently only 32bit Intel platforms are supported.</para></note>
-<step><para>download MPlayer CVS</para></step>
+<step><para>download <application>MPlayer</application> CVS</para></step>
 <step><para>download QuickTime DLL pack from
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/>
 </para></step>
 <step><para>extract QuickTime DLL pack to your Win32 codecs directory
 (default: <filename class="directory">/usr/local/lib/codecs/</filename>)
 </para></step>
-<step><para>compile MPlayer</para></step>
+<step><para>compile <application>MPlayer</application></para></step>
 </procedure>
 
 </sect3>
@@ -726,7 +726,8 @@
 AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4
 files. An open source decoder called FAAD is available from
 <ulink url="http://www.audiocoding.com"/>.
-MPlayer includes libfaad 2.0RC1, so you do not need to get it separately.
+<application>MPlayer</application> includes libfaad 2.0RC1, so you do not need
+to get it separately.
 </para>
 
 <para>
--- a/DOCS/xml/en/documentation.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/documentation.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -28,7 +28,7 @@
 
 <book id="index" lang="en">
 <bookinfo id="toc">
-<title>MPlayer - The Movie Player for LINUX</title>
+<title><application>MPlayer</application> - The Movie Player for LINUX</title>
 <subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
 <date>March 24, 2003</date>
 <copyright>
@@ -112,18 +112,19 @@
 </para>
 
 <para>
-<application>MEncoder</application> (MPlayer's Movie Encoder) is a simple movie
-encoder, designed to encode MPlayer-playable movies
+<application>MEncoder</application> (<application>MPlayer's</application> Movie
+Encoder) is a simple movie encoder, designed to encode
+<application>MPlayer</application>-playable movies
 (<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>)
-to other MPlayer-playable formats (see below). It can encode with various codecs,
-like <emphasis role="bold">DivX4</emphasis> (1 or 2 passes), libavcodec,
-<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> audio. Also has powerful plugin
-system for video manipulation.
+to other <application>MPlayer</application>-playable formats (see below). It
+can encode with various codecs, like <emphasis role="bold">DivX4</emphasis>
+(1 or 2 passes), libavcodec, <emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
+audio. Also has powerful plugin system for video manipulation.
 </para>
 
 
 <itemizedlist>
-<title>MEncoder features</title>
+<title><application>MEncoder</application> features</title>
 <listitem><simpara>
   Encoding from the wide range of fileformats and decoders of
   <application>MPlayer</application>
--- a/DOCS/xml/en/faq.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/faq.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -25,7 +25,7 @@
 <answer><para>
 We are more than happy to accept your hardware and software
 <ulink url="http://www.mplayerhq.hu/homepage/donations.html">donations</ulink>.
-They help us in continuously improving MPlayer.
+They help us in continuously improving <application>MPlayer</application>.
 </para></answer>
 </qandaentry>
 
@@ -112,7 +112,7 @@
 
 <qandaentry>
 <question><para>
-Configure ends with this text, and MPlayer won't compile!
+Configure ends with this text, and <application>MPlayer</application> won't compile!
 <screen>Your gcc does not support even i386 for '-march' and '-mcpu'</screen>
 </para></question>
 <answer><para>
@@ -144,14 +144,14 @@
 </para></question>
 <answer><para>
 No, since there have been/are issues with these compilers as well.
-To check the status of current compilers' MPlayer support, see the
-<link linkend="install">Installation</link> section.
+To check the status of current compilers' <application>MPlayer</application>
+support, see the <link linkend="install">Installation</link> section.
 </para></answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>
-I tried to compile MPlayer, but I got this output:
+I tried to compile <application>MPlayer</application>, but I got this output:
 <screen>
     In file included from /usr/include/g++-v3/bits/std_cwchar.h:42,
                      from /usr/include/g++-v3/bits/fpos.h:40,
@@ -185,12 +185,13 @@
 And we have idegs. And our idegcounter overflowed again and again.
 </para>
 <para>
-Unfortunately MPlayer is out of our control. It's used by lamers, Linux
-users who can't even use Windows, and never tried to compile a kernel. They
-installed (with default options) Mandrake or Red Hat or SuSE, and without
-RTFM'ing they send messages saying 'it doesn't work! help me! please! i'm
-new to Linux! help! oh! help me!'. We can't stop them, but at least we try
-to force them to RTFM and to read the messages of ./configure and MPlayer.
+Unfortunately <application>MPlayer</application> is out of our control.
+It's used by lamers, Linux users who can't even use Windows, and never
+tried to compile a kernel. They installed (with default options) Mandrake
+or Red Hat or SuSE, and without RTFM'ing they send messages saying
+'it doesn't work! help me! please! i'm new to Linux! help! oh! help me!'.
+We can't stop them, but at least we try to force them to RTFM and to read
+the messages of ./configure and <application>MPlayer</application>.
 </para>
 <para>
 And you clever guys come and flame us with gcc 2.96 and binary packages.
@@ -290,8 +291,8 @@
 
 <qandaentry>
 <question><para>
-During 'make', MPlayer complains about X11 libraries. I don't understand,
-I DO have X installed!?
+During 'make', <application>MPlayer</application> complains about X11 libraries.
+I don't understand, I DO have X installed!?
 </para></question>
 <answer><para>
 ... but you don't have the X development package installed. Or not correctly.
@@ -321,7 +322,8 @@
 
 <qandaentry>
 <question><para>
-I compiled MPlayer with libdvdcss/libdivxdecore support, but when I try to start it, it says:
+I compiled <application>MPlayer</application> with libdvdcss/libdivxdecore support,
+but when I try to start it, it says:
 <screen>
 error while loading shared libraries: lib*.so.0: cannot load shared object file: No such file or directory
 </screen>
@@ -346,7 +348,7 @@
 
 <qandaentry>
 <question><para>
-MPlayer dies with segmentation fault upon pthread check!
+<application>MPlayer</application> dies with segmentation fault upon pthread check!
 </para></question>
 <answer><para>
 <command>chmod 644 /usr/lib/libc.so</command>
@@ -515,7 +517,7 @@
 </para></question>
 <answer><para>
 &quot;Fasz&quot; is a Hungarian word you don't want to know, the others are
-connected to the perverted minds of the MPlayer developers.
+connected to the perverted minds of the <application>MPlayer</application> developers.
 </para></answer>
 </qandaentry>
 
@@ -601,7 +603,7 @@
 
 <qandaentry>
 <question><para>
-How can I run MPlayer in the background?
+How can I run <application>MPlayer</application> in the background?
 </para></question>
 <answer><para>
 Use:
@@ -622,7 +624,7 @@
 <filename>~/.mplayer/</filename>, <filename>/etc/</filename>,
 <filename>/usr/local/etc/</filename> or a similar location? Remove it,
 outdated <filename>codecs.conf</filename> files can cause obscure
-problems. MPlayer will use its builtin one instead.
+problems. <application>MPlayer</application> will use its builtin one instead.
 </para></answer>
 </qandaentry>
 
@@ -665,7 +667,7 @@
 patches (for example Solar Designer's OpenWall patch) which forces loading
 libraries to very low addresses. Because <filename>l3codeca.acm</filename> is a
 non-relocatable DLL, it must be loaded to <literal>0x00400000</literal>, we can't
-change this. You should use a non-patched kernel, or use MPlayer's
+change this. You should use a non-patched kernel, or use <application>MPlayer's</application>
 <option>-afm 1</option> option to disable using <filename>l3codeca.acm</filename>.
 </para></answer>
 </qandaentry>
@@ -687,10 +689,11 @@
 <screen>MPlayer interrupted by signal 4 in module: decode_video</screen>
 </para></question>
 <answer><para>
-Try running MPlayer on the machine you compiled on. Or recompile with runtime
-CPU detection (<command>./configure --enable-runtime-cpudetection</command>).
-Don't use MPlayer on a CPU different from the one it was compiled on, without
-using the feature mentioned just now.
+Try running <application>MPlayer</application> on the machine you compiled on.
+Or recompile with runtime CPU detection
+(<command>./configure --enable-runtime-cpudetection</command>).
+Don't use <application>MPlayer</application> on a CPU different from the one
+it was compiled on, without using the feature mentioned just now.
 </para></answer>
 </qandaentry>
 
@@ -759,7 +762,7 @@
 <itemizedlist>
 <listitem><para>
 Your CPU <emphasis role="bold">and/or</emphasis> video card <emphasis role="bold">and/or</emphasis>
-bus is too slow. MPlayer displays a message if this is the case (and the
+bus is too slow. <application>MPlayer</application> displays a message if this is the case (and the
 dropped frames counter goes up fast).
 </para></listitem>
 <listitem><para>
@@ -884,7 +887,7 @@
 <answer><para>
 Are you running KDE or GNOME with the ARTS or ESD sound daemon? Try disabling
 the sound daemon or use the <option>-ao arts</option> or <option>-ao esd</option>
-option to make MPlayer use ARTS or ESD.
+option to make <application>MPlayer</application> use ARTS or ESD.
 </para></answer>
 </qandaentry>
 
@@ -908,8 +911,8 @@
 </para></question>
 <answer><para>
 It works only if running as root! It's a DGA limitation. You should become root
-(<command>su -</command>), and try again. Another solution is making MPlayer SUID
-root, but it's not recommended!
+(<command>su -</command>), and try again. Another solution is making
+<application>MPlayer</application> SUID root, but it's not recommended!
 <screen>
      chown root /usr/local/bin/mplayer
      chmod 755 /usr/local/bin/mplayer
@@ -918,7 +921,7 @@
 <warning><para>
 This is a <emphasis role="bold">big</emphasis> security risk! <emphasis role="bold">Never</emphasis>
 do this on a server or on a computer that you do not control completely because
-other users can gain root privileges through SUID root MPlayer.
+other users can gain root privileges through SUID root <application>MPlayer</application>.
 <emphasis role="bold">You have been warned</emphasis>.
 </para></warning>
 </para></answer>
@@ -1038,7 +1041,7 @@
 
 <qandaentry>
 <question><para>
-What about subtitles? Can MPlayer display them?
+What about subtitles? Can <application>MPlayer</application> display them?
 </para></question>
 <answer><para>
 Yes. See the <link linkend="dvd">DVD chapter</link>.
@@ -1070,8 +1073,9 @@
 </para></question>
 <answer><para>
 You don't need to. Use <emphasis role="bold">libmpdvdkit2</emphasis>, which is
-present in the MPlayer source, and used by default. You can get the mentioned
-packages from the <ulink url="http://www.dtek.chalmers.se/groups/dvd/">Ogle site</ulink>.
+present in the <application>MPlayer</application> source, and used by default.
+You can get the mentioned packages from the
+<ulink url="http://www.dtek.chalmers.se/groups/dvd/">Ogle site</ulink>.
 </para></answer>
 </qandaentry>
 
@@ -1100,8 +1104,9 @@
 <title>Feature requests</title>
 <qandaentry>
 <question><para>
-If MPlayer is paused and I try to seek or press any key at all, MPlayer
-ceases to be paused. I would like to be able to seek in the paused movie.
+If <application>MPlayer</application> is paused and I try to seek or press any key at all,
+<application>MPlayer</application> ceases to be paused. I would like to be able
+to seek in the paused movie.
 </para></question>
 <answer><para>
 This is very tricky to implement without losing A/V synchronization.
@@ -1121,7 +1126,8 @@
 
 <qandaentry>
 <question><para>
-How can I make MPlayer remember the options I use for this particular file?
+How can I make <application>MPlayer</application> remember the options I use
+for this particular file?
 </para></question>
 <answer><para>
 Create a file named <filename>movie.avi.conf</filename> with the file-specific
@@ -1138,7 +1144,8 @@
 How can I encode?
 </para></question>
 <answer><para>
-Read the <link linkend="mencoder">MEncoder</link> section.
+Read the <link linkend="mencoder"><application>MEncoder</application></link>
+section.
 </para></answer>
 </qandaentry>
 
@@ -1249,7 +1256,7 @@
 </para></question>
 <answer><para>
 Just pass the <option>-sub &lt;filename&gt;</option> (or <option>-sid</option>,
-<option>-vobsub</option>, respectively) option to MEncoder.
+<option>-vobsub</option>, respectively) option to <application>MEncoder</application>.
 </para></answer>
 </qandaentry>
 
--- a/DOCS/xml/en/formats.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/formats.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -25,7 +25,7 @@
 does not have the necessary fields to describe its video and audio streams).
 Or you might put MPEG1 video into an AVI file.
 <ulink url="http://ffmpeg.sourceforge.net/">FFmpeg</ulink> and
-<link linkend="mencoder">MEncoder</link> can create these files.
+<link linkend="mencoder"><application>MEncoder</application></link> can create these files.
 </para>
 
 
@@ -155,8 +155,8 @@
 audio, but most players expect CBR audio, thus they fail with VBR. VBR is
 uncommon and Microsoft's AVI specs only describe CBR audio. I also noticed
 that most AVI encoders/multiplexers create bad files when using VBR audio.
-There are only two known exceptions:
-<application>NanDub</application> and <link linkend="mencoder">MEncoder</link>.
+There are only two known exceptions: <application>NanDub</application> and
+<link linkend="mencoder"><application>MEncoder</application></link>.
 </para>
 </sect3>
 
@@ -337,8 +337,8 @@
 <para>
 The <emphasis role="bold">GIF</emphasis> format is a common format for web
 graphics. There are two versions of the GIF spec, GIF87a and GIF89a. The
-main difference is that GIF89a allows for animation. MPlayer supports both
-formats through use of <systemitem class="library">libungif</systemitem> or
+main difference is that GIF89a allows for animation. <application>MPlayer</application>
+supports both formats through use of <systemitem class="library">libungif</systemitem> or
 another libgif-compatible library. Non-animated GIFs will be displayed as
 single frame videos. (Use the <option>-loop</option> and <option>-fixed-vo</option>
 options to display these longer.)
--- a/DOCS/xml/en/history.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/history.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -6,104 +6,109 @@
  
 <blockquote><para>
 This began a year ago...  I have tried lots of players under linux
-(mtv, xmps, dvdview, livid/oms, videolan, xine, xanim, avifile, xmmp) but
-they all have some problem. Mostly with special files or with audio/video
-sync.  Most of them are unable to play both MPEG1, MPEG2 and AVI (DivX)
-files. Many players have image quality or speed problems too. So I've
-decided to write/modify one...
+(<application>mtv</application>, <application>xmps</application>,
+<application>dvdview</application>, <application>livid/oms</application>,
+<application>videolan</application>, <application>xine</application>,
+<application>xanim</application>, <application>avifile</application>,
+<application>xmmp</application>) but they all have some problem. Mostly with
+special files or with audio/video sync. Most of them are unable to play both
+MPEG1, MPEG2 and AVI (DivX) files. Many players have image quality or speed
+problems too. So I've decided to write/modify one...
 </para></blockquote><para>A'rpi, 2001</para>
 
 <para>
 <itemizedlist>
 <listitem><para>
-  <emphasis role="bold">mpg12play v0.1-v0.3</emphasis>: Sep 22-25, 2000
+  <emphasis role="bold"><application>mpg12play</application> v0.1-v0.3</emphasis>: Sep 22-25, 2000
   </para>
   <para>The first try, hacked together in a half hour!  I've used libmpeg3
   from <ulink url="http://www.heroinewarrior.com"/> up to the version 0.3, but
   there were image quality and speed problems with it.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">mpg12play v0.5-v0.87</emphasis>: Sep 28-Oct 20, 2000
+  <emphasis role="bold"><application>mpg12play</application> v0.5-v0.87</emphasis>: Sep 28-Oct 20, 2000
   </para><para>Mpeg codec replaced with DVDview by Dirk Farin, it was a
   great stuff, but it was slow and was written in C++ (A'rpi hates C++!!!)
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">mpg12play v0.9-v0.95pre5</emphasis>: Oct 21-Nov 2, 2000
+  <emphasis role="bold"><application>mpg12play</application> v0.9-v0.95pre5</emphasis>: Oct 21-Nov 2, 2000
   </para><para>Mpeg codec was libmpeg2 (mpeg2dec) by Aaron Holtzman and
   Michel Lespinasse.  It's great, optimized very fast C code with perfect
   image quality and 100% MPEG standard conformance.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer v0.3-v0.9</emphasis>: Nov 18-Dec 4, 2000
+  <emphasis role="bold"><application>MPlayer</application> v0.3-v0.9</emphasis>: Nov 18-Dec 4, 2000
   </para><para>It was a pack of two programs: mpg12play v0.95pre6 and my
   new simple AVI player 'avip' based on avifile's Win32 DLL loader.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer v0.10</emphasis>: Jan 1, 2001
+  <emphasis role="bold"><application>MPlayer</application> v0.10</emphasis>: Jan 1, 2001
   </para><para>The MPEG and AVI player in a single binary!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer v0.11pre series</emphasis>:
-  </para><para>Some new developers joined and since 0.11 the MPlayer project
-  is a team-work!  Added ASF file support, and OpenDivX
+  <emphasis role="bold"><application>MPlayer</application> v0.11pre series</emphasis>:
+  </para><para>Some new developers joined and since 0.11 the <application>MPlayer</application>
+  project is a team-work! Added ASF file support, and OpenDivX
   (see <ulink url="http://www.projectmayo.com"/>) en/decoding.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer v0.17a "The IdegCounter"</emphasis> Apr 27, 2001
+  <emphasis role="bold"><application>MPlayer</application> v0.17a "The IdegCounter"</emphasis> Apr 27, 2001
   </para><para>The release version of the 0.11pre after 4 months of heavy
   development!  Try it, and be amazed! Thousands of new features added...
   and of course old code was improved too, bugs removed etc.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.18 "The BugCounter"</emphasis> Jul 9, 2001
+  <emphasis role="bold"><application>MPlayer</application> 0.18 "The BugCounter"</emphasis> Jul 9, 2001
   </para><para>2 months since 0.17 and here's a new release.. Completed ASF
   support, more subtitle formats, introduced libao (similar to libvo but to
   audio), even more stable than ever, and so on. It's a MUST!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.50 "The Faszom(C)ounter"</emphasis> Oct 8, 2001
+  <emphasis role="bold"><application>MPlayer</application> 0.50 "The Faszom(C)ounter"</emphasis> Oct 8, 2001
   </para><para>Hmm. Release again. Tons of new features, beta GUI version,
   bugs fixed, new vo and ao drivers, ported to many systems, including
   opensource DivX codecs and much more. Try it!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.60 "The RTFMCounter"</emphasis> Jan 3, 2002
+  <emphasis role="bold"><application>MPlayer</application> 0.60 "The RTFMCounter"</emphasis> Jan 3, 2002
   </para><para>MOV/VIVO/RM/FLI/NUV fileformats support, native CRAM, Cinepak,
   ADPCM codecs, and support for XAnim's binary codecs; DVD subtitles support,
-  first release of MEncoder, TV grabbing, cache, liba52, countless fixes.
+  first release of <application>MEncoder</application>, TV grabbing, cache,
+  liba52, countless fixes.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.90pre10 "The BirthdayCounter"</emphasis> Nov 11, 2002
+  <emphasis role="bold"><application>MPlayer</application> 0.90pre10 "The BirthdayCounter"</emphasis> Nov 11, 2002
   </para><para> Although this is not a release, I am going to mention it because it
-  came out 2 years after MPlayer v0.01. Happy birthday, MPlayer!
+  came out 2 years after <application>MPlayer</application> v0.01.
+  Happy birthday, <application>MPlayer</application>!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.90rc1 "The CodecCounter"</emphasis> Dec 7, 2002
+  <emphasis role="bold"><application>MPlayer</application> 0.90rc1 "The CodecCounter"</emphasis> Dec 7, 2002
   </para><para>Again not a release, but after adding Sorenson 3 (QuickTime)
-  and Windows Media 9 support, MPlayer is the world's first movie player with
-  support for all known video formats!
+  and Windows Media 9 support, <application>MPlayer</application> is the
+  world's first movie player with support for all known video formats!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.90 "The CounterCounter"</emphasis> Apr 6, 2003
+  <emphasis role="bold"><application>MPlayer</application> 0.90 "The CounterCounter"</emphasis> Apr 6, 2003
   </para><para>After more than 1 year, we finally concluded that the code was indeed
     stable again, and ready to be published as a release. Unfortunately we
     forgot even to increase the version number, and other annoying bugs went
     in, so get ready for...
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.91</emphasis> Aug 13, 2003
+  <emphasis role="bold"><application>MPlayer</application> 0.91</emphasis> Aug 13, 2003
   </para><para>The above mentioned and lot of other bugs have been fixed.
     This is the latest stable version.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 1.0pre1 "Development on the beach"</emphasis> Sep 1, 2003
+  <emphasis role="bold"><application>MPlayer</application> 1.0pre1 "Development on the beach"</emphasis> Sep 1, 2003
   </para><para>Although this is not a stable release, I am going to mention
-    it because it is the first pre version of the 1.0 series of MPlayer and
-    it is intended to help the <emphasis>big bug hunting party</emphasis>.
+    it because it is the first pre version of the 1.0 series of <application>MPlayer</application>
+    and it is intended to help the <emphasis>big bug hunting party</emphasis>.
     This is a huge step forward!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 1.0</emphasis> date yet unknown
+  <emphasis role="bold"><application>MPlayer</application> 1.0</emphasis> date yet unknown
   </para></listitem>
 </itemizedlist>
 </para>
--- a/DOCS/xml/en/install.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/install.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -187,7 +187,8 @@
   and encoding. Features:
   <itemizedlist>
   <listitem><simpara>
-    1 pass or 2 pass encoding with <link linkend="mencoder">MEncoder</link>
+    1 pass or 2 pass encoding with
+    <link linkend="mencoder"><application>MEncoder</application></link>
     </simpara></listitem>
   <listitem><simpara>
     can play old <emphasis role="bold">DivX3</emphasis> movies much faster than
@@ -203,7 +204,8 @@
   Divx4Linux. Features:
   <itemizedlist>
   <listitem><simpara>
-    1 pass or 2 pass encoding with <link linkend="mencoder">MEncoder</link>
+    1 pass or 2 pass encoding with
+    <link linkend="mencoder"><application>MEncoder</application></link>
     </simpara></listitem>
   <listitem><simpara>
     it's open-source, so it's multiplatform.
@@ -426,7 +428,8 @@
   </para></listitem>
 <listitem><para>
   If you want to install <application>MEncoder</application> (our great
-  all-purpose encoder), see the <link linkend="mencoder">MEncoder</link> section.
+  all-purpose encoder), see the
+  <link linkend="mencoder"><application>MEncoder</application></link> section.
   </para></listitem>
 <listitem><para>
   If you have a V4L compatible <emphasis role="bold">TV tuner</emphasis> card,
@@ -463,9 +466,9 @@
 Note that if you have a <filename>codecs.conf</filename> in
 <filename>~/.mplayer/</filename>,  the builtin and system
 <filename>codecs.conf</filename> will be ignored completely.
-Do not do this unless you want to fiddle with MPlayer internals as this can
-can cause many problems.  If you want to change the codecs search order, use
-the <option>-vc</option>, <option>-ac</option>, <option>-vfm</option>,
+Do not do this unless you want to fiddle with <application>MPlayer</application>
+internals as this can can cause many problems. If you want to change the codecs
+search order, use the <option>-vc</option>, <option>-ac</option>, <option>-vfm</option>,
 or <option>-afm</option> options either on the command line or in your
 config file (see the manual page).
 </para>
@@ -494,8 +497,8 @@
 <para>
 Though not mandatory, the fonts should be installed in order to gain OSD,
 and subtitle functionality. The recommended method is installing a TTF
-font file and telling MPlayer to use it. See the <link linkend="subosd">Subtitles
-and OSD</link> section for details.
+font file and telling <application>MPlayer</application> to use it.
+See the <link linkend="subosd">Subtitles and OSD</link> section for details.
 </para>
 
 </sect2>
@@ -543,8 +546,8 @@
 <title>Subtitles and OSD</title>
 
 <para>
-MPlayer can display subtitles along with movie files. Currently the
-following formats are supported:
+<application>MPlayer</application> can display subtitles along with movie files.
+Currently the following formats are supported:
 <itemizedlist>
 <listitem><para>VobSub</para></listitem>
 <listitem><para>OGM</para></listitem>
@@ -563,7 +566,7 @@
 </para>
 
 <para>
-MPlayer can dump the previously listed subtitle formats
+<application>MPlayer</application> can dump the previously listed subtitle formats
 (<emphasis role="bold">except the three first</emphasis>) into the following
 destination formats, with the given options:
 <itemizedlist>
@@ -576,7 +579,8 @@
 </para>
 
 <para>
-MEncoder can dump DVD subtitles into <link linkend="menc-feat-extractsub">VobSub</link> format.
+<application>MEncoder</application> can dump DVD subtitles into
+<link linkend="menc-feat-extractsub">VobSub</link> format.
 </para>
 
 <para>
@@ -644,7 +648,8 @@
 <application>MPlayer</application> has no way to guess the frame rate of
 the subtitle file, you have to manually convert the frame rate. There is a
 little perl script in the <filename class="directory">contrib</filename>
-directory of the MPlayer FTP site to do this conversion for you.
+directory of the <application>MPlayer</application> FTP site to do this
+conversion for you.
 </para>
 
 <para>
@@ -653,7 +658,7 @@
 
 
 <sect2 id="mpsub">
-<title>MPlayer's own subtitle format (MPsub)</title>
+<title><application>MPlayer's</application> own subtitle format (MPsub)</title>
 
 <para>
 <application>MPlayer</application> introduces a new subtitle format called
@@ -701,8 +706,8 @@
 <title>Installing OSD and subtitles</title>
 
 <para>
-You need an MPlayer font package to be able to use OSD/SUB feature.
-There are many ways to get it:
+You need an <application>MPlayer</application> font package to be able to use
+OSD/SUB feature. There are many ways to get it:
 </para>
 
 <itemizedlist>
@@ -720,10 +725,10 @@
       </itemizedlist>
   </para></listitem>
 <listitem><para>
-  Download ready-to-use font packages from MPlayer site.  Note: currently
-  available fonts are limited for ISO 8859-1/2 support, but there are some
-  other (including Korean, Russian, ISO 8859-8 etc) fonts at contrib/font
-  section of FTP, made by users.
+  Download ready-to-use font packages from <application>MPlayer</application>
+  site. Note: currently available fonts are limited for ISO 8859-1/2 support,
+  but there are some other (including Korean, Russian, ISO 8859-8 etc) fonts at
+  contrib/font section of FTP, made by users.
   </para><para>
   <!-- FIXME: this para should be before the list -->
   Font should have appropriate <filename>font.desc</filename> file which
@@ -824,7 +829,7 @@
 <title>OSD menu</title>
 
 <para>
-MPlayer has a completely user definiable OSD Menu interface.
+<application>MPlayer</application> has a completely user definiable OSD Menu interface.
 </para>
 
 <note><simpara>
@@ -871,7 +876,7 @@
 <sect1 id="rtc">
 <title>RTC</title>
 <para>
-There are three timing methods in MPlayer.
+There are three timing methods in <application>MPlayer</application>.
 
 <itemizedlist>
 <listitem><simpara>
--- a/DOCS/xml/en/mail-lists.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/mail-lists.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -14,27 +14,28 @@
 are in a hurry) <ulink url="http://www.xs4all.nl/~hanb/documents/quotingguide.html">Quoting HOWTO</ulink>.
 <itemizedlist>
 <listitem><para>
-MPlayer announce list:
+<application>MPlayer</application> announce list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-announce"/>
-List for MPlayer announcements. Subscribe here if you want to get
-announcements about new features.
+List for <application>MPlayer</application> announcements.
+Subscribe here if you want to get announcements about new features.
 </para></listitem>
 <listitem><para>
-MPlayer developers list:
+<application>MPlayer</application> developers list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng"/>
-This list is about MPlayer development! Talking about interface/API changes,
-new libraries, code optimization, configure changes is ontopic here. Send patches
-but not bug reports, user questions, feature requests or flames here to keep the
-list traffic low.
+This list is about <application>MPlayer</application> development!
+Talking about interface/API changes, new libraries, code optimization,
+configure changes is ontopic here. Send patches but not bug reports,
+user questions, feature requests or flames here to keep the list traffic low.
 </para></listitem>
 <listitem><para>
-MPlayer DOCS list:
+<application>MPlayer</application> DOCS list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-docs"/>
-This list is about MPlayer documentation and translation discussions.
+This list is about <application>MPlayer</application> documentation
+and translation discussions.
 Documentation and homepage related CVS logs are also sent here.
 </para></listitem>
 <listitem><para>
-MPlayer users list:
+<application>MPlayer</application> users list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-users"/>
   <itemizedlist>
   <listitem><para>
@@ -52,7 +53,7 @@
   </itemizedlist>
 </para></listitem>
 <listitem><para>
-MPlayer Hungarian users list:
+<application>MPlayer</application> Hungarian users list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-felhasznalok"/>
   <itemizedlist>
   <listitem><para>
@@ -64,7 +65,7 @@
   </itemizedlist>
 </para></listitem>
 <listitem><para>
-MPlayer &amp; Matrox G200/G400/G450/G550 users:
+<application>MPlayer</application> &amp; Matrox G200/G400/G450/G550 users:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-matrox"/>
 Matrox related questions like
   <itemizedlist>
@@ -80,30 +81,30 @@
   </itemizedlist>
 </para></listitem>
 <listitem><para>
-MPlayer &amp; DVB card users:
+<application>MPlayer</application> &amp; DVB card users:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-dvb"/>
 Things related to the hardware decoder card called DVB (not <emphasis role="bold">DXR3</emphasis>!).
 </para></listitem>
 <listitem><para>
-MPlayer CVS-log:
+<application>MPlayer</application> CVS-log:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog"/>
-All changes in MPlayer code are automatically sent to this list. Only
-questions about these changes belong here (if you do not understand why a
-change is required or you have a better fix or you have noticed a possible
-bug/problem in the commit).
+All changes in <application>MPlayer</application> code are automatically
+sent to this list. Only questions about these changes belong here
+(if you do not understand why a change is required or you have a better
+fix or you have noticed a possible bug/problem in the commit).
 </para></listitem>
 <listitem><para>
-MPlayer Cygwin-porting list:
+<application>MPlayer</application> Cygwin-porting list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin"/>
-List for discussion about MPlayer's Cygwin port.
+List for discussion about <application>MPlayer's</application> Cygwin port.
 </para></listitem>
 <listitem><para>
-MPlayer OS/2-porting list:
+<application>MPlayer</application> OS/2-porting list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-os2"/>
-List for discussion about MPlayer's OS/2 port.
+List for discussion about <application>MPlayer's</application> OS/2 port.
 </para></listitem>
 <listitem><para>
-MPlayer Weekly News' editors and translators list:
+<application>MPlayer</application> Weekly News' editors and translators list:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-mwn"/>
 List for discussion about the Weekly News releases.
 </para></listitem>
--- a/DOCS/xml/en/mencoder.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/mencoder.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision$ -->
 <chapter id="mencoder">
-<title>Encoding with MEncoder</title>
+<title>Encoding with <application>MEncoder</application></title>
 
 <para>
 For the complete list of available <application>MEncoder</application> options
@@ -76,7 +76,7 @@
 mencoder <replaceable>file/DVD</replaceable> -oac copy -ovc lavc -lavcopts vcodec=mpeg4:vpass=1:vbitrate=<replaceable>bitrate</replaceable><!--
 --></screen>
 This is the first pass of video encoding. Optionally specify the video
-bitrate MEncoder printed at the end of the previous pass.
+bitrate <application>MEncoder</application> printed at the end of the previous pass.
   </para></step>
 <step><para>
   <emphasis>Third pass:</emphasis>
@@ -118,12 +118,13 @@
 
 <para>
 this feature is not very useful right now, aside that it probably has many bugs,
-but the more importantly because MEncoder currently cannot encode MPEG1 layer 2
-(MP2) audio, which all other players expect in MPEG files.
+but the more importantly because <application>MEncoder</application> currently
+cannot encode MPEG1 layer 2 (MP2) audio, which all other players expect in MPEG files.
 </para>
 
 <para>
-To change MEncoder's output file format, use the <option>-of mpeg</option> option.
+To change <application>MEncoder's</application> output file format,
+use the <option>-of mpeg</option> option.
 </para>
 
 <para>
@@ -215,8 +216,8 @@
 <title>Appending multiple AVI files</title>
 
 <para>
-As a side-effect, the broken AVI fixer function enables MEncoder to append
-2 (or more) AVI files:
+As a side-effect, the broken AVI fixer function enables <application>MEncoder</application>
+to append 2 (or more) AVI files:
 </para>
 
 <para>
--- a/DOCS/xml/en/ports.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/ports.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -8,24 +8,25 @@
 <para>
 The main development platform is Linux on x86, although
 <application>MPlayer</application> works on many other Linux ports.
-Binary packages of MPlayer are available from several sources. However,
-<emphasis role="bold">none of these packages are supported</emphasis>.
+Binary packages of <application>MPlayer</application> are available from several
+sources. However, <emphasis role="bold">none of these packages are supported</emphasis>.
 Report problems to the authors, not to us.
 </para>
 
 <sect2 id="debian">
 <title>Debian packaging</title>
 <para>
-To build a Debian package, run the following command in the MPlayer
-source directory:
+To build a Debian package, run the following command in the
+<application>MPlayer</application> source directory:
 <screen>fakeroot debian/rules binary</screen>
 As root you can then install the <filename>.deb</filename> package as usual:
 <screen>dpkg -i ../mplayer_<replaceable>version</replaceable>.deb</screen>
 </para>
 
 <para>
-Christian Marillat has been making unofficial Debian MPlayer, MEncoder and font
-packages for a while, you can (apt-)get them from his
+Christian Marillat has been making unofficial Debian
+<application>MPlayer</application>, <application>MEncoder</application> and
+font packages for a while, you can (apt-)get them from his
 <ulink url="http://marillat.free.fr/">homepage</ulink>.
 </para>
 </sect2>
@@ -40,24 +41,25 @@
 
 <para>
 Mandrake RPM packages are available from the <ulink url="http://plf.zarb.org/">P.L.F.</ulink>.
-SuSE used to include a crippled version of MPlayer in their distribution.
-They have removed it in their latest releases. You can get working RPMs
-from <ulink url="http://packman.links2linux.de/?action=128">links2linux.de</ulink>.
+SuSE used to include a crippled version of <application>MPlayer</application>
+in their distribution. They have removed it in their latest releases. You can
+get working RPMs from
+<ulink url="http://packman.links2linux.de/?action=128">links2linux.de</ulink>.
 </para>
 </sect2>
 
 <sect2 id="arm">
 <title>ARM</title>
 <para>
-MPlayer works on Linux PDAs with ARM CPU e.g. Sharp Zaurus, Compaq Ipaq. The
-easiest way to obtain MPlayer is to get it from one of the
-<ulink url="http://www.openzaurus.org">OpenZaurus</ulink> package feeds. If
+<application>MPlayer</application> works on Linux PDAs with ARM CPU e.g. Sharp Zaurus,
+Compaq Ipaq. The easiest way to obtain <application>MPlayer</application> is to get it
+from one of the<ulink url="http://www.openzaurus.org">OpenZaurus</ulink> package feeds. If
 you want to compile it yourself, you should look at the
 <ulink url="http://openzaurus.bkbits.net:8080/buildroot/src/packages/mplayer?nav=index.html|src/.|src/packages">MPlayer</ulink>
 and the
 <ulink url="http://openzaurus.bkbits.net:8080/buildroot/src/packages/libavcodec?nav=index.html|src/.|src/packages">libavcodec</ulink>
 directory in the OpenZaurus distribution buildroot. These always have the latest
-Makefile and patches used for building a CVS MPlayer with libavcodec.
+Makefile and patches used for building a CVS <application>MPlayer</application> with libavcodec.
 If you need a GUI frontend, you can use xmms-embedded.
 </para>
 </sect2>
@@ -67,24 +69,25 @@
 <title>*BSD</title>
 <para>
 <application>MPlayer</application> runs on FreeBSD, OpenBSD, NetBSD,
-BSD/OS and Darwin. There are ports/pkgsrc/fink/etc versions of MPlayer
+BSD/OS and Darwin. There are ports/pkgsrc/fink/etc versions of <application>MPlayer</application>
 available that are probably easier to use than our raw sources.
 </para>
 
 <para>
-To build MPlayer you will need GNU make (gmake - native BSD make
-will not work) and a recent version of binutils.
+To build <application>MPlayer</application> you will need GNU make
+(gmake - native BSD make will not work) and a recent version of binutils.
 </para>
 
 <para>
-If MPlayer complains about not finding <filename>/dev/cdrom</filename> or
-<filename>/dev/dvd</filename>, create an appropriate symbolic link:
+If <application>MPlayer</application> complains about not finding <filename>/dev/cdrom</filename>
+or <filename>/dev/dvd</filename>, create an appropriate symbolic link:
 <screen>ln -s /dev/<replaceable>your_cdrom_device</replaceable> /dev/cdrom</screen>
 </para>
 
 <para>
-To use Win32 DLLs with MPlayer you will need to re-compile the kernel with
-&quot;<envar>option USER_LDT</envar>&quot; (unless you run FreeBSD-CURRENT,
+To use Win32 DLLs with <application>MPlayer</application> you will need to
+re-compile the kernel with &quot;<envar>option USER_LDT</envar>&quot;
+(unless you run FreeBSD-CURRENT,
 where this is the default).
 </para>
 
@@ -123,10 +126,10 @@
 </para>
 
 <para>
-On <emphasis role="bold">UltraSPARCs</emphasis>, MPlayer takes advantage of their
-<emphasis role="bold">VIS</emphasis> extensions (equivalent to MMX), currently
-only in <emphasis>libmpeg2</emphasis>, <emphasis>libvo</emphasis> and
-<emphasis>libavcodec</emphasis>, but not in mp3lib. You can watch a VOB file
+On <emphasis role="bold">UltraSPARCs</emphasis>, <application>MPlayer</application>
+takes advantage of their <emphasis role="bold">VIS</emphasis> extensions
+(equivalent to MMX), currently only in <emphasis>libmpeg2</emphasis>, <emphasis>libvo</emphasis>
+and <emphasis>libavcodec</emphasis>, but not in mp3lib. You can watch a VOB file
 on a 400MHz CPU. You'll need
 <ulink url="http://www.sun.com/sparc/vis/mediaLib.html">mLib</ulink> installed.
 </para>
@@ -212,7 +215,7 @@
 <para>
 On Solaris with an UltraSPARC CPU, you can get some extra speed by using the
 CPU's VIS instructions for certain time consuming operations. VIS acceleration
-can be used in MPlayer by calling functions in Sun's
+can be used in <application>MPlayer</application> by calling functions in Sun's
 <ulink url="http://www.sun.com/sparc/vis/mediaLib.html">mediaLib</ulink>.
 </para>
 
@@ -245,7 +248,7 @@
 
   $(INSTALL) -m 644 codecs.conf $(CONFDIR)/
 </programlisting>
-And then do (from within the MPlayer source dir):
+And then do (from within the <application>MPlayer</application> source dir):
 <screen>cp DOCS/mplayer.1 . ; cp etc/codecs.conf .</screen>
 and then go on with building and installing.
 </para>
@@ -268,9 +271,9 @@
 <sect1 id="windows">
 <title>Windows</title>
 
-<para>Yes, MPlayer runs on Windows under
-  <ulink url="http://www.cygwin.com/">Cygwin</ulink> and
-  <ulink url="http://www.mingw.org/">MinGW</ulink>.
+<para>Yes, <application>MPlayer</application> runs on Windows under
+  <ulink url="http://www.cygwin.com/"><application>Cygwin</application></ulink> and
+  <ulink url="http://www.mingw.org/"><application>MinGW</application></ulink>.
   It does not have a GUI yet, but the command line version is almost completely
   functional. <ulink url="../../tech/patches.txt">Patches</ulink> are always welcome.
   You should check out the
@@ -290,16 +293,18 @@
 <para>You can use Win32 codecs and Real Win32 codecs (not Real Linux codecs)
   if you want to. Put the codecs somewhere in your path or pass
   <option>--with-codecsdir=c:/path/to/your/codecs</option> (alternatively
-  <option>--with-codecsdir=/path/to/your/codecs</option> only on Cygwin) to
-  <filename>configure</filename>. We have had some reports that Real DLLs need
-  to be writable by the user running MPlayer, but only on some systems. Try
-  making them writable if you have problems. QuickTime DLLs also work, but you
-  will have to put them in your Windows system directory
+  <option>--with-codecsdir=/path/to/your/codecs</option> only on
+  <application>Cygwin</application>) to <filename>configure</filename>. We
+  have had some reports that Real DLLs need to be writable by the user running
+  <application>MPlayer</application>, but only on some systems. Try making
+  them writable if you have problems. QuickTime DLLs also work, but you will
+  have to put them in your Windows system directory
   (<filename class="directory">C:\Windows\system\</filename> or similar).</para>
 
-<para>The Cygwin/MinGW console is rather slow. Redirecting output or using
-  the <option>-quiet</option> option has been reported to improve performance
-  on some systems. Direct rendering (<option>-dr</option>) may also help.
+<para>The <application>Cygwin</application>/<application>MinGW</application>
+  console is rather slow. Redirecting output or using the
+  <option>-quiet</option> option has been reported to improve performance on
+  some systems. Direct rendering (<option>-dr</option>) may also help.
   You can prevent OSD flicker through double buffering with the
   <option>-double</option> option. If playback is jerky, try
   <option>-autosync 100</option>. If some of these options help you, you
@@ -311,7 +316,7 @@
   <ulink url="http://www.mplayerhq.hu/homepage/projects.html">our projects page</ulink>.</para>
 
 <sect2 id="cygwin">
-<title>Cygwin</title>
+<title><application>Cygwin</application></title>
 
 <para>Cygwin versions prior to 1.5.0 do not include <filename>inttypes.h</filename>.
   Put this
@@ -322,7 +327,8 @@
 <para>DirectX header files need to be extracted to <filename class="directory">/usr/include/</filename> or
   <filename class="directory">/usr/local/include/</filename>.</para>
 
-<para>Instructions and files for making SDL run under Cygwin can be found on the
+<para>Instructions and files for making SDL run under
+  <application>Cygwin</application> can be found on the
   <ulink url="http://www.libsdl.org/extras/win32/cygwin/">libsdl site</ulink>.</para>
 
 <para>You can play VCDs by playing the <filename>.DAT</filename> or <filename>.MPG</filename> files
@@ -342,21 +348,22 @@
 
 
 <sect2 id="mingw">
-<title>MinGW</title>
+<title><application>MinGW</application></title>
 
-<para>Installing a version of MinGW that could compile MPlayer used to be quite
-  tricky, but it works out of the box now. Just install MinGW 3.1.0 or later
-  and MSYS 1.0.9 or later and tell the MSYS postinstall that MinGW is
-  installed.</para>
+<para>Installing a version of <application>MinGW</application> that could
+  compile <application>MPlayer</application> used to be quite tricky, but it
+  works out of the box now. Just install <application>MinGW</application>
+  3.1.0 or later and MSYS 1.0.9 or later and tell the MSYS postinstall that
+  <application>MinGW</application> is installed.</para>
 
-<para>If you use a version of MinGW before 3.1.0, you need to replace
-  <filename>/mingw/include/sys/types.h</filename> with this
+<para>If you use a version of <application>MinGW</application> before 3.1.0,
+  you need to replace <filename>/mingw/include/sys/types.h</filename> with this
   <ulink url="http://www.mplayerhq.hu/MPlayer/releases/win32-beta/contrib/types.h"><filename>types.h</filename></ulink>.</para>
 
 <para>Extract DirectX header files to <filename class="directory">/mingw/include/</filename>.</para>
 
-<para>VCDs and DVDs work almost like Cygwin (adjust for the drive letter of your
-  CD-ROM/DVD-ROM):</para>
+<para>VCDs and DVDs work almost like <application>Cygwin</application> (adjust
+  for the drive letter of your CD-ROM/DVD-ROM):</para>
 
 <screen>mplayer d:/mpegav/avseq01.dat</screen>
 
--- a/DOCS/xml/en/skin.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/skin.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision$ -->
 <appendix id="skin">
-<title>MPlayer skin format</title>
+<title><application>MPlayer</application> skin format</title>
 <para>
-The purpose of this document is to describe the MPlayer skin format.
-The information contained here might be wrong, for
+The purpose of this document is to describe the
+<application>MPlayer</application> skin format. The information contained here
+might be wrong, for
 <orderedlist>
 <listitem><para>It is not me who wrote the GUI.</para></listitem>
 <listitem><para>The GUI is not finished.</para></listitem>
@@ -21,9 +22,9 @@
 <title>Overview</title>
 <para>
 It does not really have anything to do with the skin format, but you should
-know that MPlayer has <emphasis role="bold">no</emphasis> builtin skin, so
-<emphasis role="bold">at least one skin must be installed in order to be able
-to use the GUI.</emphasis>
+know that <application>MPlayer</application> has <emphasis role="bold">no</emphasis>
+builtin skin, so <emphasis role="bold">at least one skin must be installed
+in order to be able to use the GUI.</emphasis>
 </para>
 
 <sect2 id="skin-overview-directories">
@@ -44,9 +45,9 @@
 </para>
 
 <para>
-Note that the first path may vary according to the way MPlayer was configured
-(see the <option>--prefix</option> and <option>--datadir</option> arguments of
-the <command>configure</command> script).
+Note that the first path may vary according to the way <application>MPlayer</application>
+was configured (see the <option>--prefix</option> and <option>--datadir</option>
+arguments of the <command>configure</command> script).
 </para>
 
 <para>
@@ -62,8 +63,8 @@
 <para>
 In the main window and in the playbar (see below) you can use images with
 `transparency': Regions filled with the color #FF00FF (magenta) are fully
-transparent when viewed by MPlayer. This means that you can even have shaped
-windows if your X server has the XShape extension.
+transparent when viewed by <application>MPlayer</application>. This means
+that you can even have shaped windows if your X server has the XShape extension.
 </para>
 </sect2>
 
@@ -85,11 +86,11 @@
 <itemizedlist>
 <listitem><para>
   The <emphasis role="bold">main window</emphasis> and/or the
-  <emphasis role="bold">playbar</emphasis> is where you can control MPlayer.
-  The background of the window is an image. Various items can (and must) be placed
-  in the window: <emphasis>buttons</emphasis>, <emphasis>potmeters</emphasis>
-  (sliders) and <emphasis>labels</emphasis>. For every item, you must specify its
-  position and size.
+  <emphasis role="bold">playbar</emphasis> is where you can control
+  <application>MPlayer</application>. The background of the window is an image.
+  Various items can (and must) be placed in the window: <emphasis>buttons</emphasis>,
+  <emphasis>potmeters</emphasis> (sliders) and <emphasis>labels</emphasis>.
+  For every item, you must specify its position and size.
 </para><para>
   A <emphasis role="bold">button</emphasis> has three states (pressed, released,
   disabled), thus its image must be divided into three parts vertically. See the
@@ -125,12 +126,13 @@
 </para></listitem>
 
 <listitem><para>
-  The <emphasis role="bold">skin menu</emphasis> is just a way to control MPlayer by
-  means of menu entries. Two images are required for the menu: one of them is
-  the base image that shows the menu in its normal state, the other one is used
-  to display the selected entries. When you pop up the menu, the first image is
-  shown. If you move the mouse over the menu entries, the currently selected
-  entry is copied from the second image over the menu entry below the mouse pointer
+  The <emphasis role="bold">skin menu</emphasis> is just a way to control
+  <application>MPlayer</application> by means of menu entries. Two images
+  are required for the menu: one of them is the base image that shows the
+  menu in its normal state, the other one is used to display the selected
+  entries. When you pop up the menu, the first image is shown. If you move
+  the mouse over the menu entries, the currently selected entry is copied
+  from the second image over the menu entry below the mouse pointer
   (the second image is never shown as a whole).
 </para><para>
   A menu entry is defined by its position and size in the image (see the
@@ -141,9 +143,10 @@
 
 <para>
   There is an important thing not mentioned yet: For buttons, potmeters and
-  menu entries to work, MPlayer must know what to do if they are clicked. This
-  is done by <link linkend="skin-gui">messages</link> (events). For these items
-  you must define the messages to be generated when they are clicked.
+  menu entries to work, <application>MPlayer</application> must know what to
+  do if they are clicked. This is done by <link linkend="skin-gui">messages</link>
+  (events). For these items you must define the messages to be generated when
+  they are clicked.
 </para>
 </sect2>
 
@@ -154,8 +157,8 @@
 <itemizedlist>
 <listitem><para>
   The configuration file named <link linkend="skin-file">skin</link> tells
-  MPlayer how to put different parts of the skin together and what to do if
-  you click somewhere in the window.
+  <application>MPlayer</application> how to put different parts of the skin
+  together and what to do if you click somewhere in the window.
 </para></listitem>
 <listitem><para>
   The background image for the main window.
@@ -266,7 +269,7 @@
 The name of an image file must be given without leading directories - images
 are searched for in the <filename class="directory">Skin</filename> directory.
 You may (but you need not) specify the extension of the file. If the file does
-not exist, MPlayer tries to load the file
+not exist, <application>MPlayer</application> tries to load the file
 <filename>&lt;filename&gt;.&lt;ext&gt;</filename>, where <literal>png</literal>
 and <literal>PNG</literal> are tried for <filename>&lt;ext&gt;</filename>
 (in this order). The first matching file will be used.
@@ -295,8 +298,8 @@
 Here is an example to make this clear. Suppose that you have an image called
 <filename>main.png</filename> that you use for the main window:
 <programlisting>base = main, -1, -1</programlisting>
-MPlayer tries to load <filename>main</filename>, <filename>main.png</filename>,
-<filename>main.PNG</filename> files.
+<application>MPlayer</application> tries to load <filename>main</filename>,
+<filename>main.png</filename>, <filename>main.PNG</filename> files.
 </para>
 
 
--- a/DOCS/xml/en/tvinput.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/tvinput.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -82,9 +82,9 @@
 <listitem>
 <para>
 Watch out for CPU load. It shouldn't cross the 90% boundary for most of the
-time. If you have a large capture buffer, MEncoder can survive an overload
-for few seconds but nothing more. It's better to turn off the 3D OpenGL
-screensavers and similar stuff.
+time. If you have a large capture buffer, <application>MEncoder</application>
+can survive an overload for few seconds but nothing more. It's better to
+turn off the 3D OpenGL screensavers and similar stuff.
 </para>
 </listitem>
 
@@ -92,10 +92,10 @@
 <para>
 Don't mess with the system clock. <application>MEncoder</application> uses the
 system clock for doing A/V sync. If you adjust the system clock (especially
-backwards in time), MEncoder gets confused and you will lose frames. This is
-an important issue if you are hooked to a network and run some time
-synchronization software like NTP. You have to turn NTP off during the capture
-process if you want to capture reliably.
+backwards in time), <application>MEncoder</application> gets confused and you
+will lose frames. This is an important issue if you are hooked to a network
+and run some time synchronization software like NTP. You have to turn NTP
+off during the capture process if you want to capture reliably.
 </para>
 </listitem>
 
@@ -129,7 +129,8 @@
 or using the built-in ADC in the bt878 chip. In the latter case, you have to
 load the <emphasis role="bold">btaudio</emphasis> driver. Read the
 <filename>linux/Documentation/sound/btaudio</filename> file (in the kernel
-tree, not MPlayer's) for some instructions on using this driver.
+tree, not <application>MPlayer's</application>) for some instructions on using
+this driver.
 </para>
 </listitem>
 
@@ -169,10 +170,10 @@
 
 <informalexample>
 <para>
-A more sophisticated example. This makes MEncoder capture the full PAL
-image, crop the margins, and deinterlace the picture using a linear blend
-algorithm. Audio is compressed with a constant bitrate of 64kbps, using
-LAME codec. This setup is suitable for capturing movies.
+A more sophisticated example. This makes <application>MEncoder</application>
+capture the full PAL image, crop the margins, and deinterlace the picture
+using a linear blend algorithm. Audio is compressed with a constant bitrate
+of 64kbps, using LAME codec. This setup is suitable for capturing movies.
 <screen>
      mencoder -tv driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \
--- a/DOCS/xml/en/usage.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/usage.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -112,8 +112,8 @@
 
 <para>
 <application>MPlayer</application> allows you bind any key/button to any
-MPlayer command using a simple config file.  The syntax consist of a key
-name followed by a command. The default config file location is
+<application>MPlayer</application> command using a simple config file.
+The syntax consist of a key name followed by a command. The default config file location is
 <filename>$HOME/.mplayer/input.conf</filename> but it can be overridden
 using the <option>-input <replaceable>conf</replaceable></option> option
 (relative path are relative to <filename>$HOME/.mplayer</filename>).
--- a/DOCS/xml/en/users-vs-dev.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/users-vs-dev.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -76,9 +76,10 @@
 go for the 3.0.4 packages offered for version 7.2 and later. You can also
 get <ulink url="ftp://people.redhat.com/jakub/gcc/3.2.3-11/">gcc-3.2.3-11 packages</ulink>
 (unofficial, but working fine)
-and you can install them along the gcc-2.96 you already have. MPlayer will
-detect it and use 3.2 instead of 2.96. If you do not want to or cannot use
-the binary packages, here is how you can compile GCC 3 from source:
+and you can install them along the gcc-2.96 you already have.
+<application>MPlayer</application> will detect it and use 3.2 instead of 2.96.
+If you do not want to or cannot use the binary packages, here is how you can
+compile GCC 3 from source:
 </para>
 
 <procedure>
@@ -173,7 +174,7 @@
 <para>
 Joe Barr became infamous in december 2001 by writing a less than favorable
 <application>MPlayer</application> review called
-<ulink url="http://www.linuxworld.com/story/32880.htm">MPlayer: The project from hell</ulink>.
+<ulink url="http://www.linuxworld.com/story/32880.htm"><application>MPlayer</application>: The project from hell</ulink>.
 He found <application>MPlayer</application> hard to install, and concluded
 that the developers were unfriendly and the documentation
 incomplete and insulting. You be the judge of that.
--- a/DOCS/xml/en/video.xml	Sun Nov 30 03:10:46 2003 +0000
+++ b/DOCS/xml/en/video.xml	Sun Nov 30 13:07:40 2003 +0000
@@ -219,9 +219,10 @@
 </para>
 
 <para>
-However, MPlayer contains a <link linkend="vidix">VIDIX</link> driver for most
-nVidia cards. Currently it is in beta stage, and has some drawbacks.  For more
-information, see <link linkend="vidix-nvidia">nVidia VIDIX</link> section.
+However, <application>MPlayer</application> contains a
+<link linkend="vidix">VIDIX</link> driver for most nVidia cards. Currently it
+is in beta stage, and has some drawbacks. For more information, see
+<link linkend="vidix-nvidia">nVidia VIDIX</link> section.
 </para>
 </sect5>
 
@@ -288,8 +289,8 @@
 </para>
 
 <para>
-Alternatively, MPlayer contains a <link linkend="vidix">VIDIX</link> driver
-for the Cyberblade/i1 card.
+Alternatively, <application>MPlayer</application> contains a
+<link linkend="vidix">VIDIX</link> driver for the Cyberblade/i1 card.
 </para>
 
 </sect5>
@@ -1708,8 +1709,8 @@
 <title>Using your DVB card for watching Digital TV (DVB input module)</title>
 <para>
   First you need to pass the <literal>dvb_shutdown_timeout=0</literal>
-  parameter to the kernel module <filename>dvb-core</filename>, or MPlayer
-  will die after 10 seconds.
+  parameter to the kernel module <filename>dvb-core</filename>, or
+  <application>MPlayer</application> will die after 10 seconds.
 </para>
 </formalpara>
 
@@ -1733,8 +1734,8 @@
 
 <para>
   Make sure that you have have <emphasis>only</emphasis> Free to Air
-  channels in your <filename>channels.conf</filename> file, or MPlayer
-  will hang on the others.
+  channels in your <filename>channels.conf</filename> file, or
+  <application>MPlayer</application> will hang on the others.
 </para>
 
 <para>
@@ -1810,7 +1811,8 @@
 
 <sect4 id="dxr2">
 <title>DXR2</title>
-<para>MPlayer supports hardware accelerated playback with the Creative DXR2 card.</para>
+<para><application>MPlayer</application> supports hardware accelerated playback
+  with the Creative DXR2 card.</para>
 <para>
 First of all you will need properly installed DXR2 drivers. You can find
 the drivers and installation instructions at the
@@ -1874,25 +1876,27 @@
 way to configure the overlay is to first run autocal. Then run mplayer with
 dxr3 output and without overlay turned on, run dxr3view. In dxr3view you can
 tweak the overlay settings and see the effects in realtime, perhaps this feature
-will be supported by the MPlayer GUI in the future. When overlay is properly set
-up you will no longer need to use dxr3view.
+will be supported by the <application>MPlayer</application> GUI in the future.
+When overlay is properly set up you will no longer need to use dxr3view.
 <option>prebuf</option> turns on prebuffering. Prebuffering is a feature of the
 em8300 chip that enables it to hold more than one frame of video at a time. This
-means that when you are running with prebuffering MPlayer will try to keep the
-video buffer filled with data at all times. If you are on a slow machine MPlayer
-will probably use close to, or precisely 100% of CPU. This is especially common
-if you play pure MPEG streams (like DVDs, SVCDs a.s.o.) since MPlayer will not
-have to reencode it to MPEG it will fill the buffer very fast.
+means that when you are running with prebuffering <application>MPlayer</application>
+will try to keep the video buffer filled with data at all times. If you are on
+a slow machine <application>MPlayer</application> will probably use close to,
+or precisely 100% of CPU. This is especially common if you play pure MPEG streams
+(like DVDs, SVCDs a.s.o.) since <application>MPlayer</application> will not have
+to reencode it to MPEG it will fill the buffer very fast.
 With prebuffering video playback is <emphasis role="bold">much</emphasis>
 less sensitive to other programs hogging the CPU, it will not drop frames unless
 applications hog the CPU for a long time.
 When running without prebuffering the em8300 is much more sensitive to CPU load,
-so it is highly suggested that you turn on MPlayer's <option>-framedrop</option>
-option to avoid further loss of sync.
+so it is highly suggested that you turn on <application>MPlayer's</application>
+<option>-framedrop</option> option to avoid further loss of sync.
 <option>sync</option> will turn on the new sync-engine. This is currently an
 experimental feature. With the sync feature turned on the em8300's internal clock
-will be monitored at all times, if it starts to deviate from MPlayer's clock it
-will be reset causing the em8300 to drop any frames that are lagging behind.
+will be monitored at all times, if it starts to deviate from
+<application>MPlayer's</application> clock it will be reset causing the em8300 to
+drop any frames that are lagging behind.
 <option>norm=x</option> will set the TV norm of the DXR3 card without the need
 for external tools like em8300setup. Valid norms are 5 = NTSC, 4 = PAL-60,
 3 = PAL. Special norms are 2 (auto-adjust using PAL/PAL-60) and 1 (auto-adjust
@@ -1948,11 +1952,11 @@
 <term><option>-vf expand=-1:-1:-1:-1:1</option></term>
 <listitem><para>
 Although the DXR3 driver can put some OSD onto the MPEG1/2/4 video, it has
-much lower quality than MPlayer's traditional OSD, and has several refresh
-problems as well. The command line above will firstly convert the input
-video to MPEG4 (this is mandatory, sorry), then apply an expand filter which
-won't expand anything (-1: default), but apply the normal OSD onto the picture
-(that's what the "1" at the end does).
+much lower quality than <application>MPlayer's</application> traditional OSD,
+and has several refresh problems as well. The command line above will firstly
+convert the input video to MPEG4 (this is mandatory, sorry), then apply an
+expand filter which won't expand anything (-1: default), but apply the normal
+OSD onto the picture (that's what the "1" at the end does).
 </para></listitem>
 </varlistentry>
 
@@ -2054,8 +2058,8 @@
 Finally an important remark: Do not start or stop XawTV on the playback device
 during playback, it will crash your computer. It is, however, fine to
 <emphasis role="bold">FIRST</emphasis> start XawTV, <emphasis role="bold">THEN</emphasis>
-start MPlayer, wait for MPlayer to finish and <emphasis role="bold">THEN</emphasis>
-stop XawTV.
+start <application>MPlayer</application>, wait for <application>MPlayer</application>
+to finish and <emphasis role="bold">THEN</emphasis> stop XawTV.
 </para>
 </sect4>