Sat Dec 23 16:58:03 CET 2006

Author: torinthiel
Date: Sat Dec 23 16:58:02 2006
New Revision: 21741

Modified:
   trunk/DOCS/xml/en/codecs.xml
   trunk/DOCS/xml/en/containers.xml
   trunk/DOCS/xml/en/documentation.xml
   trunk/DOCS/xml/en/install.xml
   trunk/DOCS/xml/en/usage.xml
   trunk/DOCS/xml/en/video.xml

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/cs/codecs.xml
   trunk/DOCS/xml/cs/containers.xml
   trunk/DOCS/xml/cs/documentation.xml
   trunk/DOCS/xml/cs/install.xml
   trunk/DOCS/xml/cs/usage.xml
   trunk/DOCS/xml/cs/video.xml
   trunk/DOCS/xml/de/codecs.xml
   trunk/DOCS/xml/de/containers.xml
   trunk/DOCS/xml/de/documentation.xml
   trunk/DOCS/xml/de/install.xml
   trunk/DOCS/xml/de/usage.xml
   trunk/DOCS/xml/de/video.xml
   trunk/DOCS/xml/hu/codecs.xml
   trunk/DOCS/xml/hu/containers.xml
   trunk/DOCS/xml/hu/documentation.xml
   trunk/DOCS/xml/hu/install.xml
   trunk/DOCS/xml/hu/usage.xml
   trunk/DOCS/xml/hu/video.xml
   trunk/DOCS/xml/pl/codecs.xml
   trunk/DOCS/xml/pl/containers.xml
   trunk/DOCS/xml/pl/documentation.xml
   trunk/DOCS/xml/pl/install.xml
   trunk/DOCS/xml/pl/usage.xml
   trunk/DOCS/xml/pl/video.xml
   trunk/DOCS/xml/ru/codecs.xml
   trunk/DOCS/xml/ru/containers.xml
   trunk/DOCS/xml/ru/documentation.xml
   trunk/DOCS/xml/ru/install.xml
   trunk/DOCS/xml/ru/usage.xml
   trunk/DOCS/xml/ru/video.xml
   trunk/DOCS/xml/zh_CN/documentation.xml

Log:
Massive <simpara> -> <para>, as no <simpara>'s are actually needed.


Modified: trunk/DOCS/xml/en/codecs.xml
==============================================================================

--- trunk/DOCS/xml/en/codecs.xml	(original)
+++ trunk/DOCS/xml/en/codecs.xml	Sat Dec 23 16:58:02 2006
@@ -19,57 +19,57 @@
 </para>
 
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   <emphasis role="bold">MPEG-1</emphasis> (<emphasis role="bold">VCD</emphasis>) and
   <emphasis role="bold">MPEG-2</emphasis> (<emphasis role="bold">DVD</emphasis>) video
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   native decoders for <emphasis role="bold">all DivX variants,
   3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   native decoder for <emphasis role="bold">Windows Media Video 7/8</emphasis>
   (<emphasis role="bold">WMV1/WMV2</emphasis>), and Win32 DLL decoder
   for <emphasis role="bold">Windows Media Video 9</emphasis>
   (<emphasis role="bold">WMV3</emphasis>),
   both used in <filename>.wmv</filename> files
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   native <emphasis role="bold">Sorenson 1 (SVQ1)</emphasis> decoder
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   native <emphasis role="bold">Sorenson 3 (SVQ3)</emphasis> decoder
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">3ivx</emphasis> v1, v2 decoder
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Cinepak and <emphasis role="bold">Intel Indeo</emphasis> codecs
   (3.1,3.2,4.1,5.0)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">MJPEG</emphasis>, AVID, VCR2, ASV2 and other hardware
   formats
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   VIVO 1.0, 2.0, I263 and other <emphasis role="bold">H.263(+)</emphasis>
   variants
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   FLI/FLC
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">RealVideo 1.0 &amp; 2.0</emphasis> from
   <systemitem class="library">libavcodec</systemitem>, and
   <emphasis role="bold">RealVideo 3.0 &amp; 4.0</emphasis> codecs using
   RealPlayer libraries
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   native decoder for HuffYUV
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Various old simple RLE-like formats
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -346,50 +346,50 @@
 
 <itemizedlist>
 <title>The most important audio codecs above all:</title>
-<listitem><simpara>
+<listitem><para>
   MPEG layer 1/2/3 (MP1/2/3) audio (<emphasis role="bold">native</emphasis>
   code, with MMX/SSE/3DNow! optimization)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Windows Media Audio 7 and 8 (AKA WMAv1 and WMAv2)
   (<emphasis role="bold">native</emphasis> code, with
   <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Windows Media Audio 9 (WMAv3) (using DMO DLL)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   AC3 Dolby audio (<emphasis role="bold">native</emphasis> code, with
   MMX/SSE/3DNow! optimization)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   AC3 passing through sound card hardware
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   AAC
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Ogg Vorbis audio codec (<emphasis role="bold">native</emphasis> library)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   RealAudio: DNET (low bitrate AC3), Cook, Sipro and ATRAC3
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   QuickTime: Qualcomm and QDesign audio codecs
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   VIVO audio (g723, Vivo Siren)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Voxware audio (using DirectShow DLL)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   alaw and ulaw, various gsm, adpcm and pcm formats and other simple old
   audio codecs
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Adaptive Multi-Rate (AMR) speech codecs
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <!-- ********** -->
@@ -612,13 +612,13 @@
 DirectShow is the newer Video API, which is even worse than its predecessor.
 Things are harder with DirectShow, since
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   <filename>system.ini</filename> does not contain the needed information,
   instead it is stored in the registry and
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   we need the GUID of the codec.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 </para>
 

Modified: trunk/DOCS/xml/en/containers.xml
==============================================================================
--- trunk/DOCS/xml/en/containers.xml	(original)
+++ trunk/DOCS/xml/en/containers.xml	Sat Dec 23 16:58:02 2006
@@ -46,33 +46,33 @@
 </para>
 
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   MPG: This is the most <emphasis role="bold">basic</emphasis> form of the
   MPEG file formats. It contains MPEG-1 video, and MP2 (MPEG-1 layer 2) or
   rarely MP1 audio.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   DAT: This is the very same format as MPG with a different extension. It
   is used on <emphasis role="bold">Video CDs</emphasis>. Due to the way VCDs
   are created and Linux is designed, the DAT files cannot be played nor copied
   from VCDs as regular files. You have to use <option>vcd://</option>
   to play a Video CD.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
   It is the same as MPG, plus the capability to contain subtitles or non-MPEG
   (AC3) audio. It contains encoded MPEG-2 video and usually AC3 audio, but DTS,
   MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the
   <link linkend="dvd">DVD</link> section</emphasis>!
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   TY: This is a TiVo MPEG stream. It contains MPEG PES data for audio and
   video streams, as well as extra information like closed captions. The
   container is not an MPEG program stream, but a closed format created by
   TiVo. For more information on TiVo stream format, please refer to
   <ulink url="http://dvd-create.sourceforge.net/tystudio/tystream.shtml">
   the TyStudio page</ulink>.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -128,7 +128,7 @@
 <para>
 There are two kinds of AVI files:
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   <emphasis role="bold">Interleaved:</emphasis> Audio and video content is
   interleaved. This is the standard usage. Recommended and mostly used. Some
   tools create interleaved AVIs with bad sync.
@@ -136,12 +136,12 @@
   climaxes in loss of A/V sync, probably at seeking.
   These files should be played as non-interleaved
   (with the <option>-ni</option> option).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">Non-interleaved:</emphasis> First comes the whole
   video stream, then the whole audio stream. It thus needs a lot of seeking,
   making playing from network or CD-ROM difficult.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 </para>
 
@@ -149,20 +149,20 @@
 <application>MPlayer</application> supports two kinds of timings for AVI
 files:
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   <emphasis role="bold">bps-based:</emphasis> It is based on the
   bitrate/samplerate of the video/audio stream. This method is used by
   most players, including <ulink url="http://avifile.sf.net">avifile</ulink>
   and <application>Windows Media Player</application>. Files with broken
   headers, and files created with VBR audio but not VBR-compliant encoder
   will result in A/V desync with this method (mostly at seeking).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">interleaving-based:</emphasis> It does not use the
   bitrate value of the header, instead it uses the relative position of
   interleaved audio and video chunks,
   making badly encoded files with VBR audio playable.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 </para>
 

Modified: trunk/DOCS/xml/en/documentation.xml
==============================================================================
--- trunk/DOCS/xml/en/documentation.xml	(original)
+++ trunk/DOCS/xml/en/documentation.xml	Sat Dec 23 16:58:02 2006
@@ -109,65 +109,65 @@
 
 <itemizedlist>
 <title><application>MEncoder</application> features</title>
-<listitem><simpara>
+<listitem><para>
   Encoding from the wide range of fileformats and decoders of
   <application>MPlayer</application>
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Encoding to all the codecs of FFmpeg's
   <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Video encoding from <emphasis role="bold">V4L compatible TV tuners</emphasis>
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Encoding/multiplexing to interleaved AVI files with proper index
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Creating files from external audio stream
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   1, 2 or 3 pass encoding
-</simpara></listitem>
+</para></listitem>
 <listitem><para>
   <emphasis role="bold">VBR</emphasis> MP3 audio
-  <important><simpara>
+  <important><para>
   VBR MP3 audio doesn't always play nicely on windows players!
-  </simpara></important>
+  </para></important>
 </para></listitem>
-<listitem><simpara>
+<listitem><para>
   PCM audio
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Stream copying
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Input A/V synchronizing (PTS-based, can be disabled with
   <option>-mc 0</option> option)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   fps correction with <option>-ofps</option> option (useful when encoding
   30000/1001 fps VOB to 24000/1001 fps AVI)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Using our very powerful filter system (crop, expand, flip, postprocess,
   rotate, scale, rgb/yuv conversion)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Can encode DVD/VOBsub <emphasis role="bold">AND</emphasis> text subtitles
   into the output file
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Can rip DVD subtitles to VOBsub format
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <itemizedlist>
 <title>Planned features</title>
-<listitem><simpara>
+<listitem><para>
   Even wider variety of available en/decoding formats/codecs
   (creating VOB files with DivX4/Indeo5/VIVO streams :).
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <!-- FIXME: the license should be in bookinfo -->

Modified: trunk/DOCS/xml/en/install.xml
==============================================================================
--- trunk/DOCS/xml/en/install.xml	(original)
+++ trunk/DOCS/xml/en/install.xml	Sat Dec 23 16:58:02 2006
@@ -320,40 +320,40 @@
 OSD Menu interface.
 </para>
 
-<note><simpara>
+<note><para>
 the Preferences menu is currently UNIMPLEMENTED!
-</simpara></note>
+</para></note>
 
 <orderedlist>
 <title>Installation</title>
-<listitem><simpara>
+<listitem><para>
   compile <application>MPlayer</application> by passing the
   <option>--enable-menu</option> to <filename>./configure</filename>
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   make sure you have an OSD font installed
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   copy <filename>etc/menu.conf</filename> to your
   <filename class="directory">.mplayer</filename> directory
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   copy <filename>etc/input.conf</filename> to your
   <filename class="directory">.mplayer</filename> directory, or to the
   system-wide <application>MPlayer</application> config dir (default:
   <filename class="directory">/usr/local/etc/mplayer</filename>)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   check and edit <filename>input.conf</filename> to enable menu movement keys
   (it is described there).
-</simpara></listitem>
+</para></listitem>
 <listitem><para>
   start <application>MPlayer</application> by the following example:
   <screen>mplayer -menu <replaceable>file.avi</replaceable></screen>
   </para></listitem>
-<listitem><simpara>
+<listitem><para>
   push any menu key you defined
-</simpara></listitem>
+</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>

Modified: trunk/DOCS/xml/en/usage.xml
==============================================================================
--- trunk/DOCS/xml/en/usage.xml	(original)
+++ trunk/DOCS/xml/en/usage.xml	Sat Dec 23 16:58:02 2006
@@ -192,22 +192,22 @@
 <title>Adjusting subtitle timing and placement:</title>
 <varlistentry>
   <term><option>-subdelay <replaceable>sec</replaceable></option></term>
-  <listitem><simpara>
+  <listitem><para>
     Delays subtitles by <option><replaceable>sec</replaceable></option> seconds.
     Can be negative. The value is added to movie's time position counter.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-subfps <replaceable>RATE</replaceable></option></term>
-  <listitem><simpara>
+  <listitem><para>
     Specify frame/sec rate of subtitle file (float number).
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-subpos <replaceable>0-100</replaceable></option></term>
-  <listitem><simpara>
+  <listitem><para>
     Specify the position of subtitles.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -776,48 +776,48 @@
 
 <orderedlist spacing="compact">
 <title>mono</title>
-  <listitem override="0"><simpara>center</simpara></listitem>
+  <listitem override="0"><para>center</para></listitem>
 </orderedlist>
 
 <orderedlist spacing="compact">
 <title>stereo</title>
-  <listitem override="0"><simpara>left</simpara></listitem>
-  <listitem><simpara>right</simpara></listitem>
+  <listitem override="0"><para>left</para></listitem>
+  <listitem><para>right</para></listitem>
 </orderedlist>
 
 <orderedlist spacing="compact">
 <title>quadraphonic</title>
-  <listitem override="0"><simpara>left front</simpara></listitem>
-  <listitem><simpara>right front</simpara></listitem>
-  <listitem><simpara>left rear</simpara></listitem>
-  <listitem><simpara>right rear</simpara></listitem>
+  <listitem override="0"><para>left front</para></listitem>
+  <listitem><para>right front</para></listitem>
+  <listitem><para>left rear</para></listitem>
+  <listitem><para>right rear</para></listitem>
 </orderedlist>
 
 <orderedlist spacing="compact">
 <title>surround 4.0</title>
-  <listitem override="0"><simpara>left front</simpara></listitem>
-  <listitem><simpara>right front</simpara></listitem>
-  <listitem><simpara>center rear</simpara></listitem>
-  <listitem><simpara>center front</simpara></listitem>
+  <listitem override="0"><para>left front</para></listitem>
+  <listitem><para>right front</para></listitem>
+  <listitem><para>center rear</para></listitem>
+  <listitem><para>center front</para></listitem>
 </orderedlist>
 
 <orderedlist spacing="compact">
 <title>surround 5.0</title>
-  <listitem override="0"><simpara>left front</simpara></listitem>
-  <listitem><simpara>right front</simpara></listitem>
-  <listitem><simpara>left rear</simpara></listitem>
-  <listitem><simpara>right rear</simpara></listitem>
-  <listitem><simpara>center front</simpara></listitem>
+  <listitem override="0"><para>left front</para></listitem>
+  <listitem><para>right front</para></listitem>
+  <listitem><para>left rear</para></listitem>
+  <listitem><para>right rear</para></listitem>
+  <listitem><para>center front</para></listitem>
 </orderedlist>
 
 <orderedlist spacing="compact">
 <title>surround 5.1</title>
-  <listitem override="0"><simpara>left front</simpara></listitem>
-  <listitem><simpara>right front</simpara></listitem>
-  <listitem><simpara>left rear</simpara></listitem>
-  <listitem><simpara>right rear</simpara></listitem>
-  <listitem><simpara>center front</simpara></listitem>
-  <listitem><simpara>subwoofer</simpara></listitem>
+  <listitem override="0"><para>left front</para></listitem>
+  <listitem><para>right front</para></listitem>
+  <listitem><para>left rear</para></listitem>
+  <listitem><para>right rear</para></listitem>
+  <listitem><para>center front</para></listitem>
+  <listitem><para>subwoofer</para></listitem>
 </orderedlist>
 </para>
 
@@ -1103,31 +1103,31 @@
 <listitem><para>
   Six input channels and five output channels means six sets of five suboptions.
   <itemizedlist spacing="compact">
-  <listitem><simpara>
+  <listitem><para>
     The left front channel only replicates onto itself:
     "1:0:0:0:0"
-  </simpara></listitem>
-  <listitem><simpara>
+  </para></listitem>
+  <listitem><para>
     Same for the right front channel:
     "0:1:0:0:0"
-  </simpara></listitem>
-  <listitem><simpara>
+  </para></listitem>
+  <listitem><para>
     Same for the left rear channel:
     "0:0:1:0:0"
-  </simpara></listitem>
-  <listitem><simpara>
+  </para></listitem>
+  <listitem><para>
     And also the same for the right rear channel:
     "0:0:0:1:0"
-  </simpara></listitem>
-  <listitem><simpara>
+  </para></listitem>
+  <listitem><para>
     Center front, too:
     "0:0:0:0:1"
-  </simpara></listitem>
-  <listitem><simpara>
+  </para></listitem>
+  <listitem><para>
     And now we have to decide what to do with the subwoofer,
     e.g. half into front right and front left:
     "0.5:0.5:0:0:0"
-  </simpara></listitem>
+  </para></listitem>
   </itemizedlist>
 </para></listitem>
 </orderedlist>

Modified: trunk/DOCS/xml/en/video.xml
==============================================================================
--- trunk/DOCS/xml/en/video.xml	(original)
+++ trunk/DOCS/xml/en/video.xml	Sat Dec 23 16:58:02 2006
@@ -571,36 +571,36 @@
 </formalpara>
 
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   With XFree 4.0.3 and <filename>nv.o</filename> there is a bug resulting
   in strange colors.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   ATI driver requires to switch mode back more than once after finishing
   using of DGA.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Some drivers simply fail to switch back to normal resolution (use
   <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad +</keycap></keycombo>
   and
   <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad -</keycap></keycombo>
   to switch back manually).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Some drivers simply display strange colors.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Some drivers lie about the amount of memory they map into the process's
   address space, thus vo_dga won't use double buffering (SIS?).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Some drivers seem to fail to report even a single valid mode. In this
   case the DGA driver will crash telling you about a nonsense mode of
   100000x100000 or something like that.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   OSD only works with double buffering enabled (else it flickers).
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 </sect2>
@@ -670,12 +670,12 @@
 </formalpara>
 
 <itemizedlist>
-<listitem><simpara>
+<listitem><para>
   EGA card with EGA monitor: 320x200x4bpp, 640x200x4bpp, 640x350x4bpp
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   EGA card with CGA monitor: 320x200x4bpp, 640x200x4bpp
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -741,30 +741,30 @@
 <variablelist>
 <varlistentry>
   <term><option>-fb</option></term>
-  <listitem><simpara>
+  <listitem><para>
     specify the framebuffer device to use (default: <filename>/dev/fb0</filename>)
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-fbmode</option></term>
-  <listitem><simpara>
+  <listitem><para>
     mode name to use (according to <filename>/etc/fb.modes</filename>)
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-fbmodeconfig</option></term>
-  <listitem><simpara>
+  <listitem><para>
     config file of modes (default: <filename>/etc/fb.modes</filename>)
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-monitor-hfreq</option></term>
   <term><option>-monitor-vfreq</option></term>
   <term><option>-monitor-dotclock</option></term>
-  <listitem><simpara>
+  <listitem><para>
     <emphasis role="bold">important</emphasis> values, see
     <filename>example.conf</filename>
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -1017,27 +1017,27 @@
 important:</title>
 <varlistentry>
   <term><option>-aadriver</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Set recommended aa driver (X11, curses, Linux).
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-aaextended</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Use all 256 characters.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-aaeight</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Use eight bit ASCII.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>-aahelp</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Prints out all aalib options.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -1093,20 +1093,20 @@
 <itemizedlist>
 <title>The differences with <systemitem class="library">AAlib</systemitem> are
   the following:</title>
-<listitem><simpara>
+<listitem><para>
    16 available colors for character output (256 color pairs)
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
    color image dithering
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <itemizedlist>
 <title>But <systemitem class="library">libcaca</systemitem> also has the
   following limitations:</title>
-<listitem><simpara>
+<listitem><para>
    no support for brightness, contrast, gamma
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -1137,21 +1137,21 @@
   certain environment variables:</title>
 <varlistentry>
   <term><option>CACA_DRIVER</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Set recommended caca driver. e.g. ncurses, slang, x11.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>CACA_GEOMETRY (X11 only)</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Specifies the number of rows and columns. e.g. 128x50.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 <varlistentry>
   <term><option>CACA_FONT (X11 only)</option></term>
-  <listitem><simpara>
+  <listitem><para>
     Specifies the font to use. e.g. fixed, nexus.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -1202,50 +1202,50 @@
 
 <itemizedlist spacing="compact">
 <title>ADVANTAGES</title>
-<listitem><simpara>
+<listitem><para>
   You have chances to watch movies <emphasis role="bold">if Linux even doesn't
   know</emphasis> your video hardware.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   You don't need to have installed any graphics' related things on your
   Linux (like X11 (AKA XFree86), fbdev and so on). This driver can be run
   from <emphasis role="bold">text-mode</emphasis>.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   You have chances to get <emphasis role="bold">working TV-out</emphasis>.
   (It's known at least for ATI's cards).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   This driver calls <function>int 10h</function> handler thus it's not
   an emulator - it calls <emphasis role="bold">real</emphasis> things of
   <emphasis>real</emphasis> BIOS in <emphasis>real-mode</emphasis>
   (actually in vm86 mode).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   You can use VIDIX with it, thus getting accelerated video display
   <emphasis role="bold">and</emphasis> TV output at the same time!
   (Recommended for ATI cards.)
-  </simpara></listitem>
-<listitem><simpara>
+  </para></listitem>
+<listitem><para>
   If you have VESA VBE 3.0+, and you had specified
   <option>monitor-hfreq, monitor-vfreq, monitor-dotclock</option> somewhere
   (config file, or command line) you will get the highest possible refresh rate.
   (Using General Timing Formula). To enable this feature you have to specify
   <emphasis role="bold">all</emphasis> your monitor options.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <itemizedlist spacing="compact">
 <title>DISADVANTAGES</title>
-<listitem><simpara>
+<listitem><para>
    It works only on <emphasis role="bold">x86 systems</emphasis>.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   It can be used only by <systemitem class="username">root</systemitem>.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Currently it's available only for <emphasis role="bold">Linux</emphasis>.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <important><para>
@@ -1257,19 +1257,19 @@
 <title>COMMAND LINE OPTIONS AVAILABLE FOR VESA</title>
 <varlistentry>
   <term><option>-vo vesa:<replaceable>opts</replaceable></option></term>
-  <listitem><simpara>
+  <listitem><para>
     currently recognized: <literal>dga</literal> to force dga mode and
     <literal>nodga</literal> to disable dga mode. In dga mode you can enable
     double buffering via the <option>-double</option> option. Note: you may omit
     these parameters to enable <emphasis role="bold">autodetection</emphasis> of
     dga mode.
-  </simpara></listitem>
+  </para></listitem>
 </varlistentry>
 </variablelist>
 
 <itemizedlist spacing="compact">
 <title>KNOWN PROBLEMS AND WORKAROUNDS</title>
-<listitem><simpara>
+<listitem><para>
   If you have installed <emphasis role="bold">NLS</emphasis> font on your
   Linux box and run VESA driver from text-mode then after terminating
   <application>MPlayer</application> you will have
@@ -1278,26 +1278,26 @@
   utility from the Mandrake/Mandriva distribution for example.
   (<emphasis role="bold">Hint</emphasis>: The same utility is used for
   localization of fbdev).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Some <emphasis role="bold">Linux graphics drivers</emphasis> don't update
   active <emphasis role="bold">BIOS mode</emphasis> in DOS memory.
   So if you have such problem - always use VESA driver only from
   <emphasis role="bold">text-mode</emphasis>. Otherwise text-mode (#03) will
   be activated anyway and you will need restart your computer.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   Often after terminating VESA driver you get
   <emphasis role="bold">black</emphasis> screen. To return your screen to
   original state - simply switch to other console (by pressing
   <keycombo><keycap>Alt</keycap><keycap>F&lt;x&gt;</keycap></keycombo>)
   then switch to your previous console by the same way.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   To get <emphasis role="bold">working TV-out</emphasis> you need have plugged
   TV-connector in before booting your PC since video BIOS initializes
   itself only once during POST procedure.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 </sect2>
 
@@ -1328,18 +1328,18 @@
 modelines</link>, and insert them into your <filename>XF86Config</filename>.
 
 <itemizedlist spacing="compact">
-<listitem><simpara>
+<listitem><para>
   If you have XFree86 4.x.x: use the <option>-vm</option> option. It will
   change to a resolution your movie fits in. If it doesn't:
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   With XFree86 3.x.x: you have to cycle through available resolutions
   with the
   <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad +</keycap></keycombo>
   and
   <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad -</keycap></keycombo>
   keys.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 </para>
 
@@ -1379,7 +1379,7 @@
 
 <itemizedlist spacing="compact">
 <title>USAGE</title>
-<listitem><simpara>
+<listitem><para>
   You can use standalone video output driver: <option>-vo xvidix</option>.
   This driver was developed as X11's front end to VIDIX technology. It
   requires X server and can work only under X server. Note that, as it directly
@@ -1389,9 +1389,9 @@
   in the device section. You should set this to the amount of memory installed
   on your card minus 4MB. If you have less than 8MB of video ram, you can use
   the option "XaaNoPixmapCache" in the screen section instead.
-</simpara></listitem>
+</para></listitem>
 <listitem>
-  <simpara>
+  <para>
   There is a console VIDIX driver: <option>-vo cvidix</option>.
   This requires a working and initialized framebuffer for most cards (or else
   you'll just mess up the screen), and you'll have a similar effect as with
@@ -1399,24 +1399,24 @@
   are able to output truly graphical video on a real text console. See the
   <link linkend="vidix-nvidia">nvidia_vid</link> section for more information.
   To get rid of text on the borders and the blinking cursor, try something like
-  </simpara>
+  </para>
 
   <screen>setterm -cursor off > /dev/tty9</screen>
 
-  <simpara>
+  <para>
   (assuming <systemitem>tty9</systemitem> is unused so far) and then
   switch to <systemitem>tty9</systemitem>.
   On the other hand, <option>-colorkey 0</option> should give you a video
   running in the "background", though this depends on the colorkey
   functionality to work right.
-  </simpara>
+  </para>
 </listitem>
-<listitem><simpara>
+<listitem><para>
   You can use VIDIX subdevice which was applied to several video output
   drivers, such as: <option>-vo vesa:vidix</option>
   (<emphasis role="bold">Linux only</emphasis>) and
   <option>-vo fbdev:vidix</option>.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -1426,15 +1426,15 @@
 
 <itemizedlist spacing="compact">
 <title>REQUIREMENTS</title>
-<listitem><simpara>
+<listitem><para>
   Video card should be in graphics mode (except nVidia cards with the
   <option>-vo cvidix</option> output driver).
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <application>MPlayer</application>'s video output driver should know
   active video mode and be able to tell to VIDIX subdevice some video
   characteristics of server.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <formalpara><title>USAGE METHODS</title>
@@ -2397,25 +2397,25 @@
 
 <itemizedlist>
 <title>ATI CARDS TV-OUT STATUS ON LINUX</title>
-<listitem><simpara>
+<listitem><para>
   <emphasis role="bold">ATI Mach64</emphasis>:
   supported by <ulink url="http://gatos.sf.net">GATOS</ulink>.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">ASIC Radeon VIVO</emphasis>:
   supported by <ulink url="http://gatos.sf.net">GATOS</ulink>.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">Radeon</emphasis> and <emphasis role="bold">Rage128</emphasis>:
   supported by <application>MPlayer</application>!
   Check <link linkend="vesa">VESA driver</link> and
   <link linkend="vidix">VIDIX</link> sections.
-</simpara></listitem>
-<listitem><simpara>
+</para></listitem>
+<listitem><para>
   <emphasis role="bold">Rage Mobility P/M, Radeon, Rage 128, Mobility M3/M4</emphasis>:
   supported by
   <ulink url="http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/">atitvout</ulink>.
-</simpara></listitem>
+</para></listitem>
 </itemizedlist>
 
 <para>
@@ -2504,28 +2504,28 @@
   Tested on a Tecra 8000, 2.6.15 kernel with vesafb, ALSA v1.0.10.
 </para></listitem>
 <listitem>
-  <simpara>
+  <para>
   <emphasis role="bold">Chrontel 70xx encoder chip</emphasis>:
   Found in IBM Thinkpad 390E and possibly other Thinkpads or notebooks.
-  </simpara><simpara>
+  </para><para>
   You must use <option>-vo vesa:neotv_pal</option> for PAL or
   <option>-vo vesa:neotv_ntsc</option> for NTSC.
   It will provide TV output function in the following 16 bpp and 8 bpp modes:
-  </simpara>
+  </para>
   <itemizedlist>
-    <listitem><simpara>NTSC 320x240, 640x480 and maybe 800x600 too.</simpara></listitem>
-    <listitem><simpara>PAL  320x240, 400x300, 640x480, 800x600.</simpara></listitem>
+    <listitem><para>NTSC 320x240, 640x480 and maybe 800x600 too.</para></listitem>
+    <listitem><para>PAL  320x240, 400x300, 640x480, 800x600.</para></listitem>
   </itemizedlist>
-  <simpara>Mode 512x384 is not supported in BIOS. You must scale the image
+  <para>Mode 512x384 is not supported in BIOS. You must scale the image
   to a different resolution to activate TV out. If you can see an image on the
   screen in 640x480 or in 800x600 but not in 320x240 or other smaller
   resolution you need to replace two tables in <filename>vbelib.c</filename>.
   See the vbeSetTV function for details. Please contact the author in this case.
-  </simpara>
-  <simpara>
+  </para>
+  <para>
   Known issues: VESA-only, no other controls such as brightness, contrast,
   blacklevel, flickfilter are implemented.
-  </simpara>
+  </para>
 </listitem>
 </itemizedlist>
 </para>

