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

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

6 files changed, 263 insertions, 263 deletions

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 2dd7543370..f392e5317e 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -19,57 +19,57 @@ The most important ones above all:
 </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 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>.
 
 <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 @@ the old DirectShow method below.
 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>
 
diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml
index a9125e3898..4f6efcd471 100644
--- a/DOCS/xml/en/containers.xml
+++ b/DOCS/xml/en/containers.xml
@@ -46,33 +46,33 @@ MPEG files come in different guises:
 </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 @@ the raw DV stream for which support is under development.
 <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 @@ There are two kinds of AVI files:
   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 @@ There are two kinds of AVI files:
 <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>
 
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index f26af204b0..8d8b97572a 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -109,65 +109,65 @@ audio.
 
 <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 -->
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 16b5642802..f71855034b 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -320,40 +320,40 @@ extension and have it in the same directory as the video file.
 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>
diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml
index ed5d339694..4337bb74d7 100644
--- a/DOCS/xml/en/usage.xml
+++ b/DOCS/xml/en/usage.xml
@@ -192,22 +192,22 @@ you have to pass the option <option>-sub
 <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 @@ source matches. Channels are numbered starting with 0.
 
 <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 @@ subwoofer channel yourself you need to downmix manually with
 <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>
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index dc3d6e1072..c88a3ca1c5 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -571,36 +571,36 @@ with every chipset driver for XFree out there.
 </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 @@ sets:
 </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 @@ The FBdev output takes some additional parameters above the others:
 <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 @@ You can use some keys in the AA Window to change rendering options:
 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 @@ will be built.
 <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 @@ You can use some keys in the caca window to change rendering options:
   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 @@ at least.)
 
 <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 Gener