<application> attack

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11541 b3059339-0415-0410-9bf9-f77b7e298cf2

18 files changed, 335 insertions, 295 deletions

diff --git a/DOCS/xml/en/audio.xml b/DOCS/xml/en/audio.xml
index 4d32a9fabc..94be9fcd71 100644
--- a/DOCS/xml/en/audio.xml
+++ b/DOCS/xml/en/audio.xml
@@ -400,7 +400,7 @@ Use automatic insertion of filters and optimize for quality.
 <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 @@ to rectify the difference.
 <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 @@ would amplify the sound by 10.1dB and hard-clip if the sound level is too high.
 
 <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>
 
diff --git a/DOCS/xml/en/bugreports.xml b/DOCS/xml/en/bugreports.xml
index 59c0551841..82baeea5ff 100644
--- a/DOCS/xml/en/bugreports.xml
+++ b/DOCS/xml/en/bugreports.xml
@@ -7,9 +7,9 @@ Good bug reports are a very valuable contribution to the development of any
 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 @@ the instructions in this document closely.
 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 @@ mailing list will assist you if you have questions.
 <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 @@ problem is not known or not solvable by our instructions, then please report the
 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 @@ If your problem is specific to one or more files, then please upload the offende
 <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 @@ the crash you can extract useful information from the Core file. Here's how:
 <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 @@ Then simply execute this command:
 <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>
diff --git a/DOCS/xml/en/bugs.xml b/DOCS/xml/en/bugs.xml
index ae3a61d115..50b0f36b44 100644
--- a/DOCS/xml/en/bugs.xml
+++ b/DOCS/xml/en/bugs.xml
@@ -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 @@ it's sound card (driver) problem.
 <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>
diff --git a/DOCS/xml/en/cd-dvd.xml b/DOCS/xml/en/cd-dvd.xml
index 60533d90da..c172a0d10d 100644
--- a/DOCS/xml/en/cd-dvd.xml
+++ b/DOCS/xml/en/cd-dvd.xml
@@ -93,9 +93,9 @@ line with the <option>-dvd-device</option> option.
 <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 @@ facilities.
 <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>
 
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 418aefe1e8..83c1a2a9d5 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -531,14 +531,14 @@ decoders:
 <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 @@ libraries. For installation instructions please see the
 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>
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index 808a4f37e6..a340237554 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -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 @@ but the speed is also amazing.
 </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>
diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index b420968486..e4435f5d62 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -25,7 +25,7 @@ How can I support <application>MPlayer</application> development?
 <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 @@ to 3.1 to solve the problem. How to install gcc is described in the
 
 <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 @@ Great, I have gcc 3.0.1 from Red Hat/Mandrake, then I'm fine!
 </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 @@ list (the word 'ideg' is described below):
 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 @@ Upgrade your kernel, modutils and <application>MPlayer</application>.
 
 <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 @@ You have to edit SVGAlib's <filename>Makefile.cfg</filename> and comment
 
 <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 @@ or newer should be good). Since it is not our fault, please do
 
 <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 @@ And what is &quot;Faszom(C)ounter&quot;?
 </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 @@ to <systemitem>Yes</systemitem></para></listitem>
 
 <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 @@ Do you have a stray <filename>codecs.conf</filename> file in
 <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 @@ then there is a problem with your kernel/libc. Maybe you are using some security
 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 @@ documentation to see if you can improve performance.
 <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 @@ This can have multiple reasons.
 <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 @@ I have no sound when playing a video and get error messages similar to this one:
 <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 @@ Help me!
 </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 @@ root, but it's not recommended!
 <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 @@ in <application>MPlayer</application> source, and used by default.
 
 <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 @@ Where can I get libdvdread and libdvdcss packages?
 </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 @@ in the <link linkend="drives">CD chapter</link>).
 <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 @@ Feel free to implement it, and send a patch. Don't ask for it.
 
 <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 @@ in the same directory as the file.
 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 @@ How can I put subtitles in the output file?
 </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>
 
diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml
index 4dab6be07e..315674bc03 100644
--- a/DOCS/xml/en/formats.xml
+++ b/DOCS/xml/en/formats.xml
@@ -25,7 +25,7 @@ players will not play it, since they expect MPEG1 video and MP2 audio (unlike
 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 @@ supported by most players. The file format makes it possible to use VBR
 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 @@ The PVA specifications can be downloaded from the following address:
 <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.)
diff --git a/DOCS/xml/en/history.xml b/DOCS/xml/en/history.xml
index f93e0d9563..2b624920e3 100644
--- a/DOCS/xml/en/history.xml
+++ b/DOCS/xml/en/history.xml
@@ -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