[gimp-help-2] Minor changes to XML source files



commit ef9ca1b98cca1d010ce65046321e67fd8cfcd3e3
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Aug 20 12:00:00 2009 +0200

    Minor changes to XML source files
    
    Now all XML files are checked for <sect*info> tags.

 src/filters/alpha-to-logo/3d-outline.xml     |  125 +++++-----
 src/filters/alpha-to-logo/alien-glow.xml     |   69 +++---
 src/filters/alpha-to-logo/alien-neon.xml     |   75 ++----
 src/filters/alpha-to-logo/basic1.xml         |   75 +++---
 src/filters/alpha-to-logo/basic2.xml         |   75 +++---
 src/filters/alpha-to-logo/blended.xml        |   84 +++-----
 src/filters/alpha-to-logo/bovination.xml     |   82 +++----
 src/filters/alpha-to-logo/chalk.xml          |   68 +++---
 src/filters/alpha-to-logo/chip-away.xml      |  115 +++++-----
 src/filters/alpha-to-logo/comic.xml          |   76 ++----
 src/filters/alpha-to-logo/coolmetal.xml      |   85 +++----
 src/filters/alpha-to-logo/glossy.xml         |  112 ++++------
 src/filters/alpha-to-logo/glowing.xml        |   99 ++++-----
 src/filters/alpha-to-logo/gradient-bevel.xml |   72 ++----
 src/filters/alpha-to-logo/neon.xml           |   97 ++++-----
 src/filters/alpha-to-logo/starburst.xml      |   81 +++----
 src/filters/alpha-to-logo/starscape.xml      |   64 ++---
 src/filters/alpha-to-logo/textured.xml       |   80 +++----
 src/filters/animation.xml                    |   18 +-
 src/filters/animation/playback.xml           |   56 ++---
 src/filters/artistic/cartoon.xml             |   58 ++---
 src/filters/artistic/cubism.xml              |   88 +++----
 src/filters/artistic/predator.xml            |  111 ++++-----
 src/filters/blur/blur.xml                    |   45 ++--
 src/filters/blur/gauss.xml                   |   64 ++---
 src/filters/blur/mblur.xml                   |   68 +++---
 src/filters/blur/pixelise.xml                |   58 ++---
 src/filters/combine/depthmerge.xml           |  105 ++++----
 src/filters/combine/film.xml                 |   64 ++---
 src/filters/combine/introduction.xml         |   18 +-
 src/filters/decor/add-bevel.xml              |   79 +++----
 src/filters/decor/addborder.xml              |   77 +++----
 src/filters/decor/coffee.xml                 |   60 ++---
 src/filters/decor/fuzzyborder.xml            |  107 ++++-----
 src/filters/decor/introduction.xml           |   19 +-
 src/filters/decor/old-photo.xml              |   83 +++----
 src/filters/decor/round-corners.xml          |   87 +++----
 src/filters/decor/slide.xml                  |   57 ++---
 src/filters/light_effects/apply_lens.xml     |   80 +++----
 src/filters/light_effects/drop-shadow.xml    |   90 +++----
 src/filters/light_effects/flarefx.xml        |   43 ++--
 src/filters/light_effects/glasstile.xml      |   72 +++---
 src/filters/light_effects/introduction.xml   |   23 +--
 src/filters/light_effects/nova.xml           |   62 ++---
 src/filters/light_effects/sparkle.xml        |   60 ++---
 src/filters/light_effects/xach-effect.xml    |   75 +++---
 src/filters/map/bumpmap.xml                  |  107 +++------
 src/filters/map/fractal-trace.xml            |   63 ++---
 src/filters/map/illusion.xml                 |   72 +++---
 src/filters/map/papertile.xml                |  116 ++++-----
 src/filters/noise/hurl.xml                   |   53 ++---
 src/filters/noise/introduction.xml           |   25 +--
 src/filters/noise/noisify.xml                |   60 ++---
 src/filters/noise/pick.xml                   |   52 ++---
 src/filters/noise/spread.xml                 |   56 ++---
 src/filters/render/checkerboard.xml          |   59 ++---
 src/filters/render/gfig.xml                  |  107 +++++----
 src/filters/render/introduction.xml          |   26 +--
 src/filters/web.xml                          |   22 +--
 src/filters/web/imagemap.xml                 |  113 ++++-----
 src/filters/web/slice.xml                    |  119 +++------
 src/toolbox/intro.xml                        |    3 +-
 src/toolbox/tool-ellipse-select.xml          |   85 +++----
 src/tutorial/quickies.xml                    |  335 ++++++++++++-------------
 src/tutorial/straight-lines.xml              |  187 ++++++--------
 65 files changed, 2144 insertions(+), 2877 deletions(-)
---
diff --git a/src/filters/alpha-to-logo/3d-outline.xml b/src/filters/alpha-to-logo/3d-outline.xml
index 1c7ffe6..d0b60ba 100644
--- a/src/filters/alpha-to-logo/3d-outline.xml
+++ b/src/filters/alpha-to-logo/3d-outline.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-07-15 KoSt: Added 'no'
   2008-04-24 alex falappa: added 'it' translation
   2008-04-16 ude: initial release ('en','de')
 -->
 <sect2 id="script-fu-3d-outline-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-04-16</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>3D Outline</phrase>
-  </title>
+  <title>3D Outline</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>3D Outline</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>3D Outline</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>3D Outline</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-3d-outline.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-3d-outline.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>3D Outline</quote> filter</para>
@@ -46,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/3d-outline-script-fu.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/3d-outline-script-fu.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>3D Outline</quote> logo</para>
@@ -55,9 +43,13 @@
     </figure>
     <para>
       This filter is derived from the <quote>3D Outline</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>3D Outline</guimenuitem></menuchoice>
-      in the image window), which creates a logo (see above) with outlined text and
-      a drop shadow.
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>3D Outline</guimenuitem>
+      </menuchoice> in the image window),
+      which creates a logo (see above) with outlined text and a drop shadow.
     </para>
     <para>
       The filter outlines the non-transparent areas of the active layer
@@ -76,12 +68,11 @@
       too.
     </para>
     <figure>
-      <title>
-        <phrase>Example based on multicolored layer mask</phrase>
-      </title>
+      <title>Example based on multicolored layer mask</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/3d-outline-alpha.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/3d-outline-alpha.png"/>
         </imageobject>
         <caption>
           <para>With an layer mask (alpha) like this ...</para>
@@ -89,7 +80,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/3d-outline-example.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/3d-outline-example.jpg"/>
         </imageobject>
         <caption>
           <para>... you will get this.</para>
@@ -102,30 +94,31 @@
       </para>
     </warning>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>3D Outline</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>3D Outline</guimenuitem>
+      </menuchoice>.
     </para>
     <para>
       The filter only works if the active layer has an alpha channel.
       Otherwise, the menu entry is insensitive and grayed out.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>3D Outline</quote> options</phrase>
-      </title>
+      <title><quote>3D Outline</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-3d-outline.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-3d-outline.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -152,12 +145,11 @@
             pattern:
           </para>
           <figure>
-            <title>
-              <phrase>Outline blur radius example</phrase>
-            </title>
+            <title>Outline blur radius example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-5.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-5.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 5</para>
@@ -165,7 +157,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-20.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-20.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 20</para>
@@ -173,7 +166,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-40.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-40.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 40</para>
@@ -190,12 +184,11 @@
             the drop shadow.  A high value will smear the shadow:
           </para>
           <figure>
-            <title>
-              <phrase>Shadow blur radius example</phrase>
-            </title>
+            <title>Shadow blur radius example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-5.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-5.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 10</para>
@@ -203,7 +196,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-shadow20.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-shadow20.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 20</para>
@@ -211,7 +205,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-shadow40.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-shadow40.jpg"/>
               </imageobject>
               <caption>
                 <para>Radius: 40</para>
@@ -227,8 +222,10 @@
             The <link linkend="plug-in-bump-map">Bump Map</link> used to
             create a 3D effect is the active layer (alpha layer) with the
             <link linkend="plug-in-edge">edge detect</link> filter applied.
-            Before it is used to emboss the pattern layer, another <link linkend="plug-in-gauss">Gaussian blur</link> will be applied with
-            the specified radius. So a high value will reduce the 3D effect.
+            Before it is used to emboss the pattern layer, another
+            <link linkend="plug-in-gauss">Gaussian blur</link> will be applied
+            with the specified radius. So a high value will reduce the 3D
+            effect.
           </para>
         </listitem>
       </varlistentry>
@@ -237,10 +234,11 @@
         <listitem>
           <para>
             If checked (this is the default) the bump map plug-in will be
-            applied with its default options. Otherwise, the <link linkend="plug-in-bump-map">Bump Map</link> dialog window will
-            popup while the filter is running, and you can choose different
-            options. Note that, when you close the window pressing the
-            <keycap>Cancel</keycap> button, no bump map at all will be
+            applied with its default options. Otherwise, the
+            <link linkend="plug-in-bump-map">Bump Map</link> dialog window
+            will popup while the filter is running, and you can choose
+            different options. Note that, when you close the window pressing
+            the <keycap>Cancel</keycap> button, no bump map at all will be
             applied.
           </para>
         </listitem>
@@ -255,12 +253,11 @@
             moving the shadow will clear its original place:
           </para>
           <figure>
-            <title>
-              <phrase>Shadow offset example</phrase>
-            </title>
+            <title>Shadow offset example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/3d-outline-moved.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/3d-outline-moved.jpg"/>
               </imageobject>
               <caption>
                 <para>X offset: 50; Y offset: 20</para>
diff --git a/src/filters/alpha-to-logo/alien-glow.xml b/src/filters/alpha-to-logo/alien-glow.xml
index 72ca2c4..b353ea9 100644
--- a/src/filters/alpha-to-logo/alien-glow.xml
+++ b/src/filters/alpha-to-logo/alien-glow.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-26 alex falappa: translated into 'it'
   2007-11-13 KoSt: added 'no'
   2007-11-11 ude: created 'en','de'
 -->
 <sect2 id="script-fu-alien-glow-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-11</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Alien Glow</phrase>
-  </title>
+  <title>Alien Glow</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Alien Glow</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Alien Glow</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Alien Glow</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-alien-glow.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-alien-glow.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Alien Glow</quote> applied</para>
@@ -55,13 +42,18 @@
     </warning>
     <para>
       The filter is derived from the <quote>Alien Glow</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Alien
-      Glow</guimenuitem></menuchoice> in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Alien Glow</guimenuitem>
+      </menuchoice> in the image window),
       which creates the following text effect:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/alien-glow-script-fu.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/alien-glow-script-fu.jpg"/>
       </imageobject>
       <caption>
         <para>The <quote>Alien Glow</quote> Script-Fu script.</para>
@@ -103,34 +95,35 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Activate the filter</phrase>
     </title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Alien Glow</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Alien Glow</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Alien Glow</quote> options</phrase>
-      </title>
+      <title><quote>Alien Glow</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-alien-glow.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-alien-glow.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Glow size (pixels * 4)</phrase>
-        </term>
+        <term>Glow size (pixels * 4)</term>
         <listitem>
           <para>
             This is actually the font size option of the
@@ -144,9 +137,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Glow color</phrase>
-        </term>
+        <term>Glow color</term>
         <listitem>
           <para>
             This is the color of the <quote>eerie</quote> glowing. Of course
diff --git a/src/filters/alpha-to-logo/alien-neon.xml b/src/filters/alpha-to-logo/alien-neon.xml
index 73a10e9..2aae37b 100644
--- a/src/filters/alpha-to-logo/alien-neon.xml
+++ b/src/filters/alpha-to-logo/alien-neon.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Alien Neon" filter-->
+<!--FIXME: "Alien Neon" filter not documented-->
 <sect2 id="script-fu-alien-neon-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Alien Neon</phrase>
-  </title>
+  <title>Alien Neon</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Alien Neon</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Alien Neon</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Alien Neon</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/alien-neon.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/alien-neon.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Alien Neon</quote> applied</para>
@@ -57,28 +44,28 @@
     </title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Alien Neon</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Alien Neon</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Alien Neon</quote> options</phrase>
-      </title>
+      <title><quote>Alien Neon</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/alien-neon-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/alien-neon-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Glow color</phrase>
-        </term>
+        <term>Glow color</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +73,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             TODO
@@ -96,9 +81,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Width of bands</phrase>
-        </term>
+        <term>Width of bands</term>
         <listitem>
           <para>
             TODO
@@ -106,9 +89,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Width of gaps</phrase>
-        </term>
+        <term>Width of gaps</term>
         <listitem>
           <para>
             TODO
@@ -116,9 +97,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Number of bands</phrase>
-        </term>
+        <term>Number of bands</term>
         <listitem>
           <para>
             TODO
@@ -126,9 +105,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Fade away</phrase>
-        </term>
+        <term>Fade away</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/alpha-to-logo/basic1.xml b/src/filters/alpha-to-logo/basic1.xml
index abc4499..a6ca4ab 100644
--- a/src/filters/alpha-to-logo/basic1.xml
+++ b/src/filters/alpha-to-logo/basic1.xml
@@ -1,44 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-17 kost: added 'no'
   2007-12-15 ciampix: updated it
   2007-11-30 ude: created ('en','de')
 -->
 <sect2 id="script-fu-basic1-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-30</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Basic I</phrase>
-  </title>
+  <title>Basic I</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
-    <tertiary>Basic I/II</tertiary>
+    <tertiary>Basic I</tertiary>
   </indexterm>
   <indexterm>
-    <primary>Basic I/II</primary>
+    <primary>Basic I</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Basic I</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Basic I</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-basic1.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-basic1.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Basic I</quote> applied</para>
@@ -56,14 +43,19 @@
     </warning>
     <para>
       The filter is derived from the <quote>Basic I</quote> logo script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Basic
-      I</guimenuitem></menuchoice> in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Basic I</guimenuitem>
+      </menuchoice> in the image window),
       which draws a specified text over a background with a gradient effect
       and a drop shadow:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/basic1-script-fu.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/basic1-script-fu.jpg"/>
       </imageobject>
       <caption>
         <para>The <quote>Basic I</quote> logo script.</para>
@@ -71,14 +63,16 @@
     </mediaobject>
     <itemizedlist>
       <para>
-        You can reproduce the gradient effect manually by using the <link linkend="gimp-tool-blend">Blend tool</link> with the following
+        You can reproduce the gradient effect manually by using the
+        <link linkend="gimp-tool-blend">Blend tool</link> with the following
         options:
       </para>
       <listitem>
         <para><guilabel>Mode</guilabel>: Multiply,</para>
       </listitem>
       <listitem>
-        <para><guilabel>Gradient</guilabel>: FG to BG (RGB), where FG is white and
+        <para>
+          <guilabel>Gradient</guilabel>: FG to BG (RGB), where FG is white and
           BG is black,
         </para>
       </listitem>
@@ -93,26 +87,27 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Basic I</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Basic I</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Basic I</quote> options</phrase>
-      </title>
+      <title><quote>Basic I</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-basic1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-basic1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/alpha-to-logo/basic2.xml b/src/filters/alpha-to-logo/basic2.xml
index 8f4e6b0..64ec29e 100644
--- a/src/filters/alpha-to-logo/basic2.xml
+++ b/src/filters/alpha-to-logo/basic2.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-31 MikaS: added 'fr'
   2007-12-17 kost: added 'no'
@@ -7,39 +8,25 @@
   2007-11-30 ude: created ('en','de')
 -->
 <sect2 id="script-fu-basic2-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-30</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Basic II</phrase>
-  </title>
+  <title>Basic II</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
-    <tertiary>Basic I/II</tertiary>
+    <tertiary>Basic II</tertiary>
   </indexterm>
   <indexterm>
-    <primary>Basic I/II</primary>
+    <primary>Basic II</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Basic II</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Basic II</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-basic2.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-basic2.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Basic II</quote> applied</para>
@@ -57,14 +44,19 @@
     </warning>
     <para>
       The filter is derived from the <quote>Basic II</quote> logo script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Basic
-      II</guimenuitem></menuchoice> in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Basic II</guimenuitem>
+      </menuchoice> in the image window),
       which draws a specified text over a background with a drop shadow and a
       highlight:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/basic2-script-fu.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/basic2-script-fu.jpg"/>
       </imageobject>
       <caption>
         <para>The <quote>Basic II</quote> logo script.</para>
@@ -72,14 +64,16 @@
     </mediaobject>
     <itemizedlist>
       <para>
-        You can reproduce the gradient effect manually using the <link linkend="gimp-tool-blend">Blend tool</link> with the following
+        You can reproduce the gradient effect manually using the
+        <link linkend="gimp-tool-blend">Blend tool</link> with the following
         options:
       </para>
       <listitem>
         <para><guilabel>Mode</guilabel>: Multiply,</para>
       </listitem>
       <listitem>
-        <para><guilabel>Gradient</guilabel>: FG to BG (RGB), where FG is white and
+        <para>
+          <guilabel>Gradient</guilabel>: FG to BG (RGB), where FG is white and
           BG is black,
         </para>
       </listitem>
@@ -94,26 +88,27 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Basic II</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Basic II</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Basic II</quote> options</phrase>
-      </title>
+      <title><quote>Basic II</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-basic2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-basic2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/alpha-to-logo/blended.xml b/src/filters/alpha-to-logo/blended.xml
index 87ff918..fa11537 100644
--- a/src/filters/alpha-to-logo/blended.xml
+++ b/src/filters/alpha-to-logo/blended.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Blended" filter-->
+<!--FIXME: "Blended" filter not documented-->
 <sect2 id="script-fu-blended-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Blended</phrase>
-  </title>
+  <title>Blended</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Blended</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Blended</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Blended</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/blended.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/blended.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Blended</quote> applied</para>
@@ -51,34 +38,33 @@
       </para>
     </caution>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Blended</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Blended</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Blended</quote> options</phrase>
-      </title>
+      <title><quote>Blended</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/blended-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/blended-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Offset (pixels)</phrase>
-        </term>
+        <term>Offset (pixels)</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +72,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Backgroundcolor</phrase>
-        </term>
+        <term>Backgroundcolor</term>
         <listitem>
           <para>
             TODO
@@ -96,9 +80,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Blend mode</phrase>
-        </term>
+        <term>Blend mode</term>
         <listitem>
           <para>
             TODO
@@ -106,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Start blend</phrase>
-        </term>
+        <term>Start blend</term>
         <listitem>
           <para>
             TODO
@@ -116,9 +96,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>End blend</phrase>
-        </term>
+        <term>End blend</term>
         <listitem>
           <para>
             TODO
@@ -126,9 +104,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Gradient</phrase>
-        </term>
+        <term>Gradient</term>
         <listitem>
           <para>
             TODO
@@ -136,9 +112,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Gradient reverse</phrase>
-        </term>
+        <term>Gradient reverse</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/alpha-to-logo/bovination.xml b/src/filters/alpha-to-logo/bovination.xml
index 5a5325c..a505af9 100644
--- a/src/filters/alpha-to-logo/bovination.xml
+++ b/src/filters/alpha-to-logo/bovination.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-26 alex falappa: translated into 'it'
   2007-11-07 KoSt: added 'no'
   2007-11-04 ude: created ('en','de')
 -->
 <sect2 id="script-fu-bovinated-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-04</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Bovination</phrase>
-  </title>
+  <title>Bovination</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Bovination</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Bovination</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Bovination</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-bovination-applied.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-bovination-applied.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Bovination</quote> applied</para>
@@ -60,7 +47,8 @@
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/bovination-noise.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/bovination-noise.jpg"/>
       </imageobject>
     </mediaobject>
     <para>
@@ -69,46 +57,52 @@
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/bovination-contrast.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/bovination-contrast.png"/>
       </imageobject>
     </mediaobject>
     <para>
-      Besides, the filter adds a <link linkend="plug-in-gauss">Blur</link>
-      layer as a light gray shadow and uses this layer as a <link linkend="plug-in-bump-map">Bump Map</link>. Finally a (by default)
+      Besides, the filter adds a
+      <link linkend="plug-in-gauss">Blur</link>
+      layer as a light gray shadow and uses this layer as a
+      <link linkend="plug-in-bump-map">Bump Map</link>. Finally a (by default)
       white <quote>Background</quote> layer is added below.
     </para>
     <para>
       So the filter will end up with these layers:<footnote><para>
         If the active layer is not the top layer, it might happen that the
-        filter messes up the layers. Then you will have to <link linkend="gimp-layer-dialog">raise the active layer</link>.
+        filter messes up the layers. Then you will have to
+        <link linkend="gimp-layer-dialog">raise the active layer</link>.
       </para></footnote>
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/bovination-layers.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/bovination-layers.png"/>
       </imageobject>
     </mediaobject>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Bovination</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Bovination</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Bovination</quote> options</phrase>
-      </title>
+      <title><quote>Bovination</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-bovination.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-bovination.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -125,12 +119,11 @@
             resulting in few spots.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Spots density</quote> examples</phrase>
-            </title>
+            <title><quote>Spots density</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/bovination-x.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/bovination-x.png"/>
               </imageobject>
               <caption>
                 <para>Maximum X density, minimum Y density</para>
@@ -138,7 +131,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/bovination-y.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/bovination-y.png"/>
               </imageobject>
               <caption>
                 <para>Maximum Y density, minimum X density</para>
diff --git a/src/filters/alpha-to-logo/chalk.xml b/src/filters/alpha-to-logo/chalk.xml
index 3e4eb47..dcaf64f 100644
--- a/src/filters/alpha-to-logo/chalk.xml
+++ b/src/filters/alpha-to-logo/chalk.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-22 alex falappa: added 'it'
   2007-10-15 KoSt: Added 'no'
   2007-10-11 ude: created 'en', 'de'
 -->
 <sect2 id="script-fu-chalk-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-11</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Chalk</phrase>
-  </title>
+  <title>Chalk</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Chalk</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Chalk</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Chalk</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-taj-chalk.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-taj-chalk.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Chalk</quote> applied</para>
@@ -58,13 +46,18 @@
     </para>
     <para>
       It is derived from the <quote>Chalk</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Chalk</guimenuitem></menuchoice>
-      in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Chalk</guimenuitem>
+      </menuchoice> in the image window),
       which creates a logo from a text of your choice, for instance:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/chalk-script-fu.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/chalk-script-fu.png"/>
       </imageobject>
       <caption>
         <para>The <quote>Chalk</quote> Script-Fu script.</para>
@@ -110,26 +103,27 @@
       layer filled with any color. That's all.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Chalk</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Chalk</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Chalk</quote> option</phrase>
-      </title>
+      <title><quote>Chalk</quote> option</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-chalk.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-chalk.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/alpha-to-logo/chip-away.xml b/src/filters/alpha-to-logo/chip-away.xml
index 369e168..3ccda30 100644
--- a/src/filters/alpha-to-logo/chip-away.xml
+++ b/src/filters/alpha-to-logo/chip-away.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-02-06 alex falappa: added 'it'
   2007-12-29 ude: created en, de
 -->
 <sect2 id="script-fu-chip-away-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-29</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Chip Away</phrase>
-  </title>
+  <title>Chip Away</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -25,19 +16,15 @@
   <indexterm>
     <primary>Chip Away</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Chip Away</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Chip Away</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-chip-away.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-chip-away.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Chip Away</quote> applied</para>
@@ -57,42 +44,51 @@
     </warning>
     <para>
       The filter is derived from the <quote>Chip Away</quote> Script-Fu script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Chip
-      Away</guimenuitem></menuchoice> in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Chip Away</guimenuitem>
+      </menuchoice> in the image window),
       which creates a text effect like that:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/chip-away-script-fu.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/chip-away-script-fu.jpg"/>
       </imageobject>
     </mediaobject>
     <para>
-      To achieve a chipping effect, the filter creates a <link linkend="gimp-channel-selection-replace">selection from the alpha
-      channel</link> in a new layer, fills the selection with white, <link linkend="plug-in-spread">spreads</link> the pixels, and applies a <link linkend="plug-in-gauss">Gaussian blur</link> to the layer.  Then it uses
-      this layer as a <link linkend="plug-in-bump-map">Bump map</link>,
-      creating a 3D effect.
+      To achieve a chipping effect, the filter creates a
+      <link linkend="gimp-channel-selection-replace">selection from the alpha
+      channel</link> in a new layer, fills the selection with white,
+      <link linkend="plug-in-spread">spreads</link> the pixels, and applies a
+      <link linkend="plug-in-gauss">Gaussian blur</link> to the layer. Then
+      it uses this layer as a <link linkend="plug-in-bump-map">Bump
+      map</link>, creating a 3D effect.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Chip Away</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Chip Away</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Chip Away</quote> options</phrase>
-      </title>
+      <title><quote>Chip Away</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-chip-away.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-chip-away.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -108,12 +104,11 @@
             bump map. Valid range is 0-200.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Chip amount</quote> examples</phrase>
-            </title>
+            <title><quote>Chip amount</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-0.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-0.jpg"/>
               </imageobject>
               <caption>
                 <para>0</para>
@@ -121,7 +116,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-30.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-30.jpg"/>
               </imageobject>
               <caption>
                 <para>30</para>
@@ -129,7 +125,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-60.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-60.jpg"/>
               </imageobject>
               <caption>
                 <para>60</para>
@@ -137,7 +134,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-90.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-90.jpg"/>
               </imageobject>
               <caption>
                 <para>90</para>
@@ -165,13 +163,11 @@
             makes the image looking carved.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Chip Away</quote> inverted example
-              </phrase>
-            </title>
+            <title><quote>Chip Away</quote> inverted example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-invert.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-invert.jpg"/>
               </imageobject>
               <caption>
                 <para>Inverted, (without drop shadow)</para>
@@ -238,14 +234,11 @@
             <quote>Slate</quote>:
           </para>
           <figure>
-            <title>
-              <phrase>
-                Suggested <quote>Chip Away</quote> patterns
-              </phrase>
-            </title>
+            <title>Suggested <quote>Chip Away</quote> patterns</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-mud.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-mud.jpg"/>
               </imageobject>
               <caption>
                 <para>Dried mud</para>
@@ -253,7 +246,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-3d.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-3d.jpg"/>
               </imageobject>
               <caption>
                 <para>3D Green</para>
@@ -261,7 +255,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/chip-away-slate.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/chip-away-slate.jpg"/>
               </imageobject>
               <caption>
                 <para>Slate</para>
diff --git a/src/filters/alpha-to-logo/comic.xml b/src/filters/alpha-to-logo/comic.xml
index 1d8392e..ff6ee8b 100644
--- a/src/filters/alpha-to-logo/comic.xml
+++ b/src/filters/alpha-to-logo/comic.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Comic Book" filter-->
+<!--FIXME: "Comic Book" filter not documented-->
 <sect2 id="script-fu-comic-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Comic Book</phrase>
-  </title>
+  <title>Comic Book</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Comic Book</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Comic Book</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Comic Book</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/comic.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/comic.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Comic Book</quote> applied</para>
@@ -51,34 +38,33 @@
       </para>
     </caution>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Comic Book</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Comic Book</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Comic Book</quote> options</phrase>
-      </title>
+      <title><quote>Comic Book</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/comic-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/comic-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Gradient</phrase>
-        </term>
+        <term>Gradient</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +72,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Gradient reverse</phrase>
-        </term>
+        <term>Gradient reverse</term>
         <listitem>
           <para>
             TODO
@@ -96,9 +80,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Outline size</phrase>
-        </term>
+        <term>Outline size</term>
         <listitem>
           <para>
             TODO
@@ -106,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Outline color</phrase>
-        </term>
+        <term>Outline color</term>
         <listitem>
           <para>
             TODO
@@ -116,9 +96,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/alpha-to-logo/coolmetal.xml b/src/filters/alpha-to-logo/coolmetal.xml
index 1b120d8..d7757c0 100644
--- a/src/filters/alpha-to-logo/coolmetal.xml
+++ b/src/filters/alpha-to-logo/coolmetal.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-02-08 alex falappa: added 'it'
   2008-01-18 ude: created en,de
 -->
 <sect2 id="script-fu-cool-metal-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-18</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Cool Metal</phrase>
-  </title>
+  <title>Cool Metal</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -25,19 +16,15 @@
   <indexterm>
     <primary>Cool Metal</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Cool Metal</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Cool Metal</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/coolmetal.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/coolmetal.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Cool Metal</quote> filter</para>
@@ -45,7 +32,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/coolmetal-script-fu.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/coolmetal-script-fu.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Cool Metal</quote> logo</para>
@@ -58,30 +46,36 @@
     </para>
     <para>
       The filter is derived from the <quote>Cool Metal</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Cool Metal</guimenuitem></menuchoice>
-      in the image window), which creates a logo from a text as shown above.
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Cool Metal</guimenuitem>
+      </menuchoice> in the image window),
+      which creates a logo from a text as shown above.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Cool Metal</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Cool Metal</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Cool Metal</quote> options</phrase>
-      </title>
+      <title><quote>Cool Metal</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-coolmetal.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-coolmetal.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -129,10 +123,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Filter details</phrase>
-    </title>
+    <title>Filter details</title>
     <para>
       At least some of the filter effects should be described briefly: how the
       filter creates the reflection and this nice shadow, or rather, how you
@@ -140,9 +133,7 @@
       which tool to use...
     </para>
     <orderedlist>
-      <title>
-        <phrase>Making the reflection</phrase>
-      </title>
+      <title>Making the reflection</title>
       <para>
         Assuming that the alpha has been filled with a gradient, then:
       </para>
@@ -171,15 +162,15 @@
       <listitem>
         <para>
           Now <link linkend="gimp-layer-mask-add">add a layer mask</link>,
-          fill the layer mask with a <link linkend="gimp-tool-blend">gradient</link> (for instance white or
-          gray to black), and, of course, <link linkend="gimp-layer-mask-apply">apply the layer mask</link>.
+          fill the layer mask with a
+          <link linkend="gimp-tool-blend">gradient</link> (for instance white
+          or gray to black), and, of course,
+          <link linkend="gimp-layer-mask-apply">apply the layer mask</link>.
         </para>
       </listitem>
     </orderedlist>
     <orderedlist>
-      <title>
-        <phrase>Making the shadow</phrase>
-      </title>
+      <title>Making the shadow</title>
       <para>
         Fill the alpha with black, for instance via
         <link linkend="gimp-layer-duplicate">Duplicate Layer</link>
diff --git a/src/filters/alpha-to-logo/glossy.xml b/src/filters/alpha-to-logo/glossy.xml
index 3c03a38..1ef11d7 100644
--- a/src/filters/alpha-to-logo/glossy.xml
+++ b/src/filters/alpha-to-logo/glossy.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-03-17 alex falappa: added 'it'
   2008-02-17 ude: created 'en','de'
 -->
-<!--TODO es lt pl ru sv: translate new content, review 'en'-->
 <sect2 id="script-fu-glossy-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-02-25</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Glossy</phrase>
-  </title>
+  <title>Glossy</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +16,15 @@
   <indexterm>
     <primary>Glossy</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Glossy</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Glossy</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-glossy.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-glossy.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Glossy</quote> filter</para>
@@ -46,7 +32,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/glossy-script-fu.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/glossy-script-fu.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Glossy</quote> logo</para>
@@ -70,9 +57,14 @@
     </note>
     <para>
       The filter is derived from the <quote>Glossy</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Glossy</guimenuitem></menuchoice>
-      in the image window), which creates a logo (see above) with a glossy
-      outlook when used with the default options, thus the name.
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Glossy</guimenuitem>
+      </menuchoice> in the image window),
+      which creates a logo (see above) with a glossy outlook when used with
+      the default options, thus the name.
     </para>
     <para>
       This filter only works if the active layer has an alpha channel.
@@ -84,34 +76,33 @@
       </para>
     </warning>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Glossy</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Glossy</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Glossy</quote> options</phrase>
-      </title>
+      <title><quote>Glossy</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-glossy.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-glossy.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Blend gradient (text)</phrase>
-        </term>
+        <term>Blend gradient (text)</term>
         <listitem>
           <para>
             By default, the filter will fill the alpha with a
@@ -129,9 +120,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Pattern (text)</phrase>
-        </term>
+        <term>Pattern (text)</term>
         <listitem>
           <para>
             When <guilabel>Use pattern for text instead of gradient</guilabel>
@@ -144,9 +133,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Outline size</phrase>
-        </term>
+        <term>Outline size</term>
         <listitem>
           <para>
             This is the size of a kind of border, realised with a layer
@@ -155,11 +142,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>
-            Blend gradient (outline); Pattern (outline)
-          </phrase>
-        </term>
+        <term>Blend gradient (outline); Pattern (outline)</term>
         <listitem>
           <para>
             Just like the <quote>text</quote> options for the active layer,
@@ -170,9 +153,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Use pattern overlay</phrase>
-        </term>
+        <term>Use pattern overlay</term>
         <listitem>
           <para>
             When checked, the original, not enlarged alpha of the outline
@@ -190,9 +171,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Default bumpmap settings</phrase>
-        </term>
+        <term>Default bumpmap settings</term>
         <listitem>
           <para>
             This option does nothing, the filter will always apply a
@@ -201,20 +180,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             The color of the background layer added by the filter. When you
-            click on the color button, a <link linkend="gimp-color-dialog">color select dialog</link> pops up.
+            click on the color button, a
+            <link linkend="gimp-color-dialog">color select dialog</link> pops
+            up.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Shadow</phrase>
-        </term>
+        <term>Shadow</term>
         <listitem>
           <para>
             Optionally the filter creates a layer containing a
@@ -228,10 +205,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Filter details</phrase>
-    </title>
+    <title>Filter details</title>
     <para>
       The numerous options may give the impression that this is a very
       complicate filter, but actually it is fairly simple. The interesting
diff --git a/src/filters/alpha-to-logo/glowing.xml b/src/filters/alpha-to-logo/glowing.xml
index bc05483..dcd9570 100644
--- a/src/filters/alpha-to-logo/glowing.xml
+++ b/src/filters/alpha-to-logo/glowing.xml
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-20 alex falappa: added 'it'
   2008-06-15 kost: added 'no'
   2008-05-05 ude: initial release (en,de)
 -->
-<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="script-fu-glowing-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-05-05</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Glowing Hot</phrase>
-  </title>
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude";
+       id="script-fu-glowing-logo-alpha">
+  <title>Glowing Hot</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +18,15 @@
   <indexterm>
     <primary>Glowing Hot</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Glowing Hot</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Glowing Hot</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-glowing.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-glowing.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Glowing Hot</quote> filter</para>
@@ -46,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/glowing-script-fu.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/glowing-script-fu.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Glowing Hot</quote> logo</para>
@@ -59,8 +48,13 @@
     </para>
     <para>
       The filter is derived from the <quote>Glowing Hot</quote> script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Glowing Hot</guimenuitem></menuchoice>
-      in the image window), which creates a glowing text logo (see above).
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Glowing Hot</guimenuitem>
+      </menuchoice> in the image window),
+      which creates a glowing text logo (see above).
     </para>
     <para>
       The filter simulates a red-hot, a yellow-hot, and a white-hot area -
@@ -69,38 +63,37 @@
     </para>
     <xi:include href="about-resizing-image.xml"/>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Glowing Hot</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Glowing Hot</guimenuitem>
+      </menuchoice>.
     </para>
     <para>
       The filter only works if the active layer has an alpha channel.
       Otherwise, the menu entry is insensitive and grayed out.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Glowing Hot</quote> options</phrase>
-      </title>
+      <title><quote>Glowing Hot</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-glowing.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-glowing.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Effect size (pixels * 3)</phrase>
-        </term>
+        <term>Effect size (pixels * 3)</term>
         <listitem>
           <para>
             This is actually the font size option of the <quote>Glowing
@@ -110,12 +103,11 @@
             feathered colors make the hot metal effect.
           </para>
           <figure>
-            <title>
-              <phrase>Effect size examples</phrase>
-            </title>
+            <title>Effect size examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/glowing-effect-50.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/glowing-effect-50.jpg"/>
               </imageobject>
               <caption>
                 <para>Effect size 50</para>
@@ -123,7 +115,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/glowing-effect-350.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/examples/glowing-effect-350.jpg"/>
               </imageobject>
               <caption>
                 <para>Effect size 350</para>
@@ -133,9 +126,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             This is the color used to fill the <quote>Background</quote>
@@ -146,10 +137,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Filter details</phrase>
-    </title>
+    <title>Filter details</title>
     <para>
       To create the glowing effect (red-hot, yellow-hot, and white-hot area),
       the alpha is feathered and then filled with the respective color, from
@@ -163,12 +153,11 @@
       actually uses).
     </para>
     <figure>
-      <title>
-        <phrase>Effect size</phrase>
-      </title>
+      <title>Effect size</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/glowing-effectsize.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/glowing-effectsize.png"/>
         </imageobject>
         <caption>
           <para>
diff --git a/src/filters/alpha-to-logo/gradient-bevel.xml b/src/filters/alpha-to-logo/gradient-bevel.xml
index c162a8b..c430a0c 100644
--- a/src/filters/alpha-to-logo/gradient-bevel.xml
+++ b/src/filters/alpha-to-logo/gradient-bevel.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Gradient Bevel" filter-->
+<!--FIXME: "Gradient Bevel" filter not documented-->
 <sect2 id="script-fu-gradient-bevel-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Gradient Bevel</phrase>
-  </title>
+  <title>Gradient Bevel</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Gradient Bevel</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Gradient Bevel</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Gradient Bevel</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/gradient-bevel.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/gradient-bevel.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Gradient Bevel</quote> applied</para>
@@ -51,34 +38,33 @@
       </para>
     </caution>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Gradient Bevel</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Gradient Bevel</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Gradient Bevel</quote> options</phrase>
-      </title>
+      <title><quote>Gradient Bevel</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/gradient-bevel-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/gradient-bevel-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Border size (pixels)</phrase>
-        </term>
+        <term>Border size (pixels)</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +72,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Bevel height (sharpness)</phrase>
-        </term>
+        <term>Bevel height (sharpness)</term>
         <listitem>
           <para>
             TODO
@@ -96,9 +80,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Bevel width</phrase>
-        </term>
+        <term>Bevel width</term>
         <listitem>
           <para>
             TODO
@@ -106,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/alpha-to-logo/neon.xml b/src/filters/alpha-to-logo/neon.xml
index b3bec2a..70be48a 100644
--- a/src/filters/alpha-to-logo/neon.xml
+++ b/src/filters/alpha-to-logo/neon.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-12 KoSt: added 'no'
   2007-11-05 alex falappa: translated to 'it'
   2007-10-30 ude: created ('en','de')
 -->
 <sect2 id="script-fu-neon-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-30</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Neon</phrase>
-  </title>
+  <title>Neon</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Neon</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Neon</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Neon</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-neon-applied.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-neon-applied.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Neon</quote> applied</para>
@@ -51,25 +38,29 @@
     </para>
     <para>
       It is derived from the <quote>Neon</quote> Script-Fu script
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Neon</guimenuitem></menuchoice>
-      in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Neon</guimenuitem>
+      </menuchoice> in the image window),
       which creates a text effect that simulates neon lighting:
     </para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/neon-script-fu.jpg" format="JPG"/>
+        <imagedata format="JPG"
+          fileref="images/filters/examples/neon-script-fu.jpg"/>
       </imageobject>
     </mediaobject>
     <para>
       The filter uses two layers to achieve the neon effect:
     </para>
     <figure>
-      <title>
-        <phrase>The Neon effect</phrase>
-      </title>
+      <title>The Neon effect</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/neon-tubes.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/neon-tubes.png"/>
         </imageobject>
         <caption>
           <para>The <quote>Neon Tubes</quote> layer</para>
@@ -77,7 +68,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/neon-glow.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/neon-glow.png"/>
         </imageobject>
         <caption>
           <para>The <quote>Neon Glow</quote> layer</para>
@@ -107,38 +99,38 @@
     <para>Overview of the Neon filter layers:</para>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/neon-4layers.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/neon-4layers.png"/>
       </imageobject>
     </mediaobject>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Neon</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Neon</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Neon</quote> options</phrase>
-      </title>
+      <title><quote>Neon</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-neon.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-neon.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Effect size (pixels * 5)</phrase>
-        </term>
+        <term>Effect size (pixels * 5)</term>
         <listitem>
           <para>
             This is actually the font size option of the Neon Script-Fu
@@ -151,9 +143,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             This is the color used to fill the <quote>Background</quote>
@@ -164,9 +154,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Glow color</phrase>
-        </term>
+        <term>Glow color</term>
         <listitem>
           <para>
             This is the color of the glowing neon tubes. The default is a
@@ -176,9 +164,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Create shadow</phrase>
-        </term>
+        <term>Create shadow</term>
         <listitem>
           <para>
             Optionally, the filter can create a drop shadow, which will have
@@ -189,7 +175,8 @@
           </para>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/filters/examples/neon-shadow.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/filters/examples/neon-shadow.png"/>
             </imageobject>
             <caption>
               <para><quote>Neon</quote> with shadow</para>
diff --git a/src/filters/alpha-to-logo/starburst.xml b/src/filters/alpha-to-logo/starburst.xml
index a45400d..7633a19 100644
--- a/src/filters/alpha-to-logo/starburst.xml
+++ b/src/filters/alpha-to-logo/starburst.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-26 alex falappa: added 'it'
   2007-10-16 KoSt: added 'no'
   2007-10-15 ude: created 'en','de'
 -->
 <sect2 id="script-fu-starburst-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-15</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Starburst</phrase>
-  </title>
+  <title>Starburst</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Starburst</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Starburst</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Starburst</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/logo-starburst-applied.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/logo-starburst-applied.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Starburst</quote> applied</para>
@@ -51,8 +38,12 @@
     </para>
     <para>
       It is derived from the <quote>Starburst</quote> script-fu
-      (<menuchoice><guimenu>File</guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu><guimenuitem>Starburst</guimenuitem></menuchoice>
-      in the image window),
+      (<menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+        <guimenuitem>Starburst</guimenuitem>
+      </menuchoice> in the image window),
       which creates a logo from a text.
     </para>
     <para>
@@ -60,12 +51,11 @@
       motif:
     </para>
     <figure>
-      <title>
-        <phrase>Starburst script and filter</phrase>
-      </title>
+      <title>Starburst script and filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/starburst-script-fu.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/starburst-script-fu.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Starburst</quote> Script-Fu script</para>
@@ -73,7 +63,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/starburst-filter.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/starburst-filter.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Starburst</quote> filter</para>
@@ -87,7 +78,8 @@
       </para>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/starburst-layers.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/starburst-layers.png"/>
         </imageobject>
         <caption>
           <para>
@@ -104,7 +96,8 @@
       <listitem>
         <para>
           The active layer was named layer #2 in the example above. It has
-          been filled with the <quote>Crack</quote> <link linkend="gimp-concepts-patterns">pattern</link>, so the content of
+          been filled with the <quote>Crack</quote>
+          <link linkend="gimp-concepts-patterns">pattern</link>, so the content of
           this layer doesn't matter. Only the active layer's alpha channel
           does.
         </para>
@@ -129,26 +122,27 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Starburst</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Starburst</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Starburst</quote> options</phrase>
-      </title>
+      <title><quote>Starburst</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-logo-starburst.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-logo-starburst.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -168,7 +162,8 @@
         <term>Burst color</term>
         <listitem>
           <para>
-            This color will be passed to the <link linkend="plug-in-nova">Supernova</link> filter as the color of
+            This color will be passed to the
+            <link linkend="plug-in-nova">Supernova</link> filter as the color of
             the bursting star; it defaults to green. A click on the color
             swatch button brings up the color selector, where you can choose
             another color.
diff --git a/src/filters/alpha-to-logo/starscape.xml b/src/filters/alpha-to-logo/starscape.xml
index 2db3291..c9b7194 100644
--- a/src/filters/alpha-to-logo/starscape.xml
+++ b/src/filters/alpha-to-logo/starscape.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Starscape" filter-->
+<!--FIXME: "Starscape" filter not documented-->
 <sect2 id="script-fu-starscape-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Starscape</phrase>
-  </title>
+  <title>Starscape</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Starscape</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Starscape</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Starscape</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/starscape.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/starscape.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Starscape</quote> applied</para>
@@ -51,34 +38,33 @@
       </para>
     </caution>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Starscape</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Starscape</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Starscape</quote> options</phrase>
-      </title>
+      <title><quote>Starscape</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/starscape-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/starscape-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Effect size (pixels * 4)</phrase>
-        </term>
+        <term>Effect size (pixels * 4)</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +72,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Glow color</phrase>
-        </term>
+        <term>Glow color</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/alpha-to-logo/textured.xml b/src/filters/alpha-to-logo/textured.xml
index fcac180..8b9975c 100644
--- a/src/filters/alpha-to-logo/textured.xml
+++ b/src/filters/alpha-to-logo/textured.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
-<!--FIXME all: missing doc for "Textured" filter-->
+<!--FIXME: "Textured" filter not documented-->
 <sect2 id="script-fu-textured-logo-alpha">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-08-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Textured</phrase>
-  </title>
+  <title>Textured</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Textured</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Textured</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Textured</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/textured.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/textured.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Textured</quote> applied</para>
@@ -51,34 +38,33 @@
       </para>
     </caution>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Textured</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Textured</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Textured</quote> options</phrase>
-      </title>
+      <title><quote>Textured</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/textured-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/textured-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Border size (pixels)</phrase>
-        </term>
+        <term>Border size (pixels)</term>
         <listitem>
           <para>
             TODO
@@ -86,9 +72,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Pattern</phrase>
-        </term>
+        <term>Pattern</term>
         <listitem>
           <para>
             TODO
@@ -96,9 +80,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Mosaic tile type</phrase>
-        </term>
+        <term>Mosaic tile type</term>
         <listitem>
           <para>
             TODO
@@ -106,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             TODO
@@ -116,9 +96,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Starting blend</phrase>
-        </term>
+        <term>Starting blend</term>
         <listitem>
           <para>
             TODO
@@ -126,9 +104,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Ending blend</phrase>
-        </term>
+        <term>Ending blend</term>
         <listitem>
           <para>
             TODO
diff --git a/src/filters/animation.xml b/src/filters/animation.xml
index b31b6d1..cf02363 100644
--- a/src/filters/animation.xml
+++ b/src/filters/animation.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-05-27 KoSt: added 'no'
@@ -7,23 +8,14 @@
   2006-12-27 created by j.h
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-animation">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-27</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>Animation Filters</phrase>
-  </title>
+  <title>Animation Filters</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Animation</secondary>
     <tertiary>Introduction</tertiary>
   </indexterm>
+
   <para>
     These are animation helpers, which let you view and optimize your
     animations (by reducing their size). We gathered
diff --git a/src/filters/animation/playback.xml b/src/filters/animation/playback.xml
index 52d39b5..4f11e80 100644
--- a/src/filters/animation/playback.xml
+++ b/src/filters/animation/playback.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-05-25 KoSt: added 'no'
@@ -8,18 +9,8 @@
   2006-12-27 created by j.h
 -->
 <sect2 id="plug-in-playback">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-27</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Playback</phrase>
-  </title>
+  <title>Playback</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Animation</secondary>
@@ -32,39 +23,39 @@
   <indexterm>
     <primary>Playback</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <para>
       This plug-in lets you play an animation from a multi-layers image (that
       could be saved in the GIF, MNG or even XCF format), to test it.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Animation</guisubmenu><guimenuitem>Playback</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Animation</guisubmenu>
+        <guimenuitem>Playback</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Playback</quote> filter options</phrase>
-      </title>
+      <title><quote>Playback</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/playback-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/playback-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
-    <para>This dialog has :</para>
+    <para>This dialog has:</para>
     <variablelist>
       <varlistentry>
         <term>Preview</term>
@@ -83,7 +74,8 @@
             <varlistentry>
               <term>Play/Stop</term>
               <listitem>
-                <para><guibutton>Play/Stop</guibutton>
+                <para>
+                  <guibutton>Play/Stop</guibutton>
                   to play or stop the animation.
                 </para>
               </listitem>
@@ -91,7 +83,8 @@
             <varlistentry>
               <term>Rewind</term>
               <listitem>
-                <para><guibutton>Rewind</guibutton>
+                <para>
+                  <guibutton>Rewind</guibutton>
                   to re-launch the animation from start.
                 </para>
               </listitem>
@@ -99,7 +92,8 @@
             <varlistentry>
               <term>Step</term>
               <listitem>
-                <para><guibutton>Step</guibutton> to play the animation step by
+                <para>
+                  <guibutton>Step</guibutton> to play the animation step by
                   step.
                 </para>
               </listitem>
diff --git a/src/filters/artistic/cartoon.xml b/src/filters/artistic/cartoon.xml
index b1151b4..a80b36d 100644
--- a/src/filters/artistic/cartoon.xml
+++ b/src/filters/artistic/cartoon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-04-29 KoSt: added 'no'
@@ -7,18 +8,8 @@
   2005-09-15 de added by axel.wernicke
 -->
 <sect2 id="plug-in-cartoon">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-19</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Cartoon</phrase>
-  </title>
+  <title>Cartoon</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Cartoon</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Cartoon</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Cartoon</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/artistic-taj-cartoon.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/artistic-taj-cartoon.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Cartoon</quote> applied</para>
@@ -61,27 +49,27 @@
       areas that are already distinctly darker than their neighborhood.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Cartoon</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Cartoon</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Cartoon</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Cartoon</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-cartoon.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-cartoon.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/artistic/cubism.xml b/src/filters/artistic/cubism.xml
index 7543d6b..e736608 100644
--- a/src/filters/artistic/cubism.xml
+++ b/src/filters/artistic/cubism.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-05-09 ude: removed filters-artistic-cubism.png
@@ -8,18 +9,8 @@
   2005-09-15 de added by axel.wernicke
 -->
 <sect2 id="plug-in-cubism">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-19</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Cubism</phrase>
-  </title>
+  <title>Cubism</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -28,19 +19,15 @@
   <indexterm>
     <primary>Cubism</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Cubism</quote>
-        </phrase>
-      </title>
+      <title>Example for the <quote>Cubism</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/artistic-taj-cubism.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/artistic-taj-cubism.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Cubism</quote> applied</para>
@@ -67,27 +55,27 @@
       </para>
     </tip>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Cubism</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Cubism</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Cubism</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Cubism</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-cubism.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-cubism.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -132,7 +120,7 @@
       <varlistentry>
         <term>Use Background color</term>
         <listitem>
-          <para><!--changed 061019-->
+          <para>
             This filter creates its tiles from all the colors of the image
             and paint them with a color scale which depends on the Tile
             Saturation. With a low Tile Saturation, this color scale lets the
@@ -143,14 +131,13 @@
           </para>
           <figure>
             <title>
-              <phrase>
-                Example illustrating the action of the
-                <quote>Use BackGround color</quote> option
-              </phrase>
+              Example illustrating the action of the <quote>Use BackGround
+              color</quote> option
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/cubism-1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/cubism-1.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -161,12 +148,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>The option is not checked</phrase>
-            </title>
+            <title>The option is not checked</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/cubism-2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/cubism-2.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -178,12 +164,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>The option is checked</phrase>
-            </title>
+            <title>The option is checked</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/cubism-3.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/cubism-3.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -202,8 +187,9 @@
         If you are using this to generate background images for web pages and
         the like, work with a small range of colors painted randomly on a
         small square. Then apply the Cubism filter with the desired settings.
-        As a last step, try Filters/Map/Make Seamless to adjust the image so
-        it will tile seamlessly in your background.
+        As a last step, try
+        <link linkend="plug-in-make-seamless">Make Seamless</link>
+        to adjust the image so it will tile seamlessly in your background.
       </para>
     </tip>
   </sect3>
diff --git a/src/filters/artistic/predator.xml b/src/filters/artistic/predator.xml
index f8d7f88..6307378 100644
--- a/src/filters/artistic/predator.xml
+++ b/src/filters/artistic/predator.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-02-10 alex falappa: added 'it'
   2008-01-03 ude: added content (en,de)
   2007-12-02 lexa: created initial version
 -->
-<!--TODO es lt pl ru: translate new content (and review en)-->
 <sect2 id="script-fu-predator">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-03</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Predator</phrase>
-  </title>
+  <title>Predator</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -27,19 +17,15 @@
   <indexterm>
     <primary>Predator</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Predator</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Predator</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/artistic-taj-predator.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/artistic-taj-predator.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Predator</quote> applied</para>
@@ -68,26 +55,27 @@
        RGB images.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Predator</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Predator</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Predator</quote> options</phrase>
-      </title>
+      <title><quote>Predator</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-predator.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-predator.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -102,12 +90,11 @@
             filter. A high value will result in detecting more edges.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Edge amount</quote> examples</phrase>
-            </title>
+            <title><quote>Edge amount</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-edge4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-edge4.png"/>
               </imageobject>
               <caption>
                 <para>4</para>
@@ -115,7 +102,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-edge8.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-edge8.png"/>
               </imageobject>
               <caption>
                 <para>8</para>
@@ -123,7 +111,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-edge16.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-edge16.png"/>
               </imageobject>
               <caption>
                 <para>16</para>
@@ -148,7 +137,8 @@
       <varlistentry>
         <term>Pixel amount</term>
         <listitem>
-          <para><quote>Pixel amount</quote> is the size of the color blocks the
+          <para>
+            <quote>Pixel amount</quote> is the size of the color blocks the
             image will be simplified to if <guilabel>Pixelize</guilabel> is
             checked. Actually you are decreasing the resolution with this
             option. In the examples below, you can see directly how increasing
@@ -156,12 +146,11 @@
             <quote>macro pixels</quote>:
           </para>
           <figure>
-            <title>
-              <phrase><quote>Pixelize</quote> examples</phrase>
-            </title>
+            <title><quote>Pixelize</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-pixelize0.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-pixelize0.png"/>
               </imageobject>
               <caption>
                 <para>Disabled</para>
@@ -169,7 +158,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-pixelize4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-pixelize4.png"/>
               </imageobject>
               <caption>
                 <para>4</para>
@@ -177,7 +167,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-pixelize8.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-pixelize8.png"/>
               </imageobject>
               <caption>
                 <para>8</para>
@@ -185,7 +176,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/predator-pixelize16.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/predator-pixelize16.png"/>
               </imageobject>
               <caption>
                 <para>16</para>
@@ -216,22 +208,20 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Filter algorithm</phrase>
-    </title>
+    <title>Filter algorithm</title>
     <para>
       Since this filter delegates the essential parts to two or three other
       filters the algorithm is very simple:
     </para>
     <procedure>
       <figure>
-        <title>
-          <phrase>Making the <quote>predator</quote> effect</phrase>
-        </title>
+        <title>Making the <quote>predator</quote> effect</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/examples/predator-step0.jpg" format="JPG"/>
+            <imagedata format="JPG"
+              fileref="images/filters/examples/predator-step0.jpg"/>
           </imageobject>
           <caption>
             <para>Original</para>
@@ -239,7 +229,8 @@
         </mediaobject>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/examples/predator-step1.jpg" format="JPG"/>
+            <imagedata format="JPG"
+              fileref="images/filters/examples/predator-step1.jpg"/>
           </imageobject>
           <caption>
             <para>Pixelize</para>
@@ -247,7 +238,8 @@
         </mediaobject>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/examples/predator-step2.jpg" format="JPG"/>
+            <imagedata format="JPG"
+              fileref="images/filters/examples/predator-step2.jpg"/>
           </imageobject>
           <caption>
             <para>Min RGB</para>
@@ -255,7 +247,8 @@
         </mediaobject>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/examples/predator-step3.jpg" format="JPG"/>
+            <imagedata format="JPG"
+              fileref="images/filters/examples/predator-step3.jpg"/>
           </imageobject>
           <caption>
             <para>Edge detection</para>
diff --git a/src/filters/blur/blur.xml b/src/filters/blur/blur.xml
index 7df5fcc..1bb466f 100644
--- a/src/filters/blur/blur.xml
+++ b/src/filters/blur/blur.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-01 prokoudine: improved Russian content
   2007-03-28 KoSt: added 'no'
@@ -10,18 +11,8 @@
   050819 de reviewed by axel.wernicke
 -->
 <sect2 id="plug-in-blur">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Blur</phrase>
-  </title>
+  <title>Blur</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
@@ -30,19 +21,15 @@
   <indexterm>
     <primary>Blur</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          The Blur filter applied to a photograph
-        </phrase>
-      </title>
+      <title>The Blur filter applied to a photograph</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original</para>
@@ -50,7 +37,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-blur.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-blur.jpg"/>
         </imageobject>
         <caption>
           <para>Blur applied</para>
@@ -71,13 +59,16 @@
       images, but very strong on small images.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through:
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Blur</guisubmenu><guimenuitem>Blur</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Blur</guisubmenu>
+        <guimenuitem>Blur</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
 </sect2>
diff --git a/src/filters/blur/gauss.xml b/src/filters/blur/gauss.xml
index c05e359..ebe1300 100644
--- a/src/filters/blur/gauss.xml
+++ b/src/filters/blur/gauss.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-01 prokoudine: added RU caption to the images
   2008-08-01 prokoudine: improved Russian content, added localized screenshot
@@ -11,18 +12,8 @@
   2005-09-30 de fixed figure issue by axel.wernicke
 -->
 <sect2 id="plug-in-gauss">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Gaussian Blur</phrase>
-  </title>
+  <title>Gaussian Blur</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
@@ -31,19 +22,15 @@
   <indexterm>
     <primary>Gaussian Blur</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Gaussian Blur</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Gaussian Blur</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original</para>
@@ -51,7 +38,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-gauss.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-gauss.jpg"/>
         </imageobject>
         <caption>
           <para>Blur applied</para>
@@ -69,27 +57,27 @@
       can be faster in some cases.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Blur</guisubmenu><guimenuitem>Gaussian Blur</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Blur</guisubmenu>
+        <guimenuitem>Gaussian Blur</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Gaussian</quote> filter parameters settings
-        </phrase>
-      </title>
+      <title><quote>Gaussian</quote> filter parameters settings</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-blur-gauss.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-blur-gauss.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -107,11 +95,13 @@
       <varlistentry>
         <term>Blur Method</term>
         <listitem>
-          <para><guilabel>IIR</guilabel>: IIR stands for <quote>Infinite Impulse
+          <para>
+            <guilabel>IIR</guilabel>: IIR stands for <quote>Infinite Impulse
             Response</quote>.This blur works best for large radius values and
             for images which are not computer generated.
           </para>
-          <para><guilabel>RLE</guilabel>: RLE stands for run-length
+          <para>
+            <guilabel>RLE</guilabel>: RLE stands for run-length
             encoding. RLE Gaussian Blur is best used on
             computer-generated images or those with large areas of
             constant intensity.
diff --git a/src/filters/blur/mblur.xml b/src/filters/blur/mblur.xml
index 978749f..b7fd4fc 100644
--- a/src/filters/blur/mblur.xml
+++ b/src/filters/blur/mblur.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-03 prokoudine: improved Russian content, added localized screenshot
   2007-03-29 KoSt: added 'no'
@@ -9,18 +10,8 @@
   051111 en;fr reviewed by julien hardelin
 -->
 <sect2 id="plug-in-mblur">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Motion Blur</phrase>
-  </title>
+  <title>Motion Blur</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
@@ -29,19 +20,15 @@
   <indexterm>
     <primary>Motion Blur</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Starting example for Motion Blur filter
-        </phrase>
-      </title>
+      <title>Starting example for Motion Blur filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -49,7 +36,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-mblur-linear.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-mblur-linear.jpg"/>
         </imageobject>
         <caption>
           <para>Linear blur</para>
@@ -57,12 +45,11 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Using example for Motion Blur filter</phrase>
-      </title>
+      <title>Using example for Motion Blur filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-mblur-radial.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-mblur-radial.jpg"/>
         </imageobject>
         <caption>
           <para>Radial blur</para>
@@ -70,7 +57,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-mblur-zoom.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-mblur-zoom.jpg"/>
         </imageobject>
         <caption>
           <para>Zoom blur</para>
@@ -83,27 +71,27 @@
       further adjusted, with Length, or Angle settings available.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Blur</guisubmenu><guimenuitem>Motion Blur</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Blur</guisubmenu>
+        <guimenuitem>Motion Blur</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Motion Blur</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Motion Blur</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-blur-mblur.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-blur-mblur.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/blur/pixelise.xml b/src/filters/blur/pixelise.xml
index 23a733f..c4a8f69 100644
--- a/src/filters/blur/pixelise.xml
+++ b/src/filters/blur/pixelise.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-03 prokoudine: improved Russian content, added localized screenshot
   2007-03-30 KoSt: added 'no'
@@ -10,18 +11,8 @@
   05/11/23 fixed missing lang tag by axel wernicke
 -->
 <sect2 id="plug-in-pixelize">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Pixelise</phrase>
-  </title>
+  <title>Pixelise</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
@@ -30,19 +21,15 @@
   <indexterm>
     <primary>Pixelise</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Pixelize</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Pixelize</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original</para>
@@ -50,7 +37,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/blur-taj-pixelise.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/blur-taj-pixelise.jpg"/>
         </imageobject>
         <caption>
           <para>Blur applied</para>
@@ -64,27 +52,27 @@
       effect</quote>: see <xref linkend="bibliography-online-bach"/>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Blur</guisubmenu><guimenuitem>Pixelise</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Blur</guisubmenu>
+        <guimenuitem>Pixelise</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Pixelize</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Pixelize</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/filters-blur-pixelize.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/filters-blur-pixelize.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/combine/depthmerge.xml b/src/filters/combine/depthmerge.xml
index 5ad6afb..e16cbce 100644
--- a/src/filters/combine/depthmerge.xml
+++ b/src/filters/combine/depthmerge.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-07-12 Added Spanish translation by AntI
   2007-05-27 KoSt: added 'no'
@@ -9,18 +10,8 @@
   2005/09/29 translated to german by axel.wernicke
 -->
 <sect2 id="plug-in-depth-merge">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-09</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Depth Merge</phrase>
-  </title>
+  <title>Depth Merge</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Combine</secondary>
@@ -29,22 +20,21 @@
   <indexterm>
     <primary>Depth Merge</primary>
   </indexterm>
+
   <para>
     Depth Merge is a Combine Filter which is useful to combine two different
     pictures or layers. You can decide which part of every image or layer will
     stay visible.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Filter example</phrase>
-      </title>
+      <title>Filter example</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original</para>
@@ -52,14 +42,15 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/combine-taj-depthmerge.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/combine-taj-depthmerge.jpg"/>
         </imageobject>
         <caption>
           <para>Filter applied</para>
         </caption>
       </mediaobject>
     </figure>
-    <para><!--TODO cs ru zh_CN-->
+    <para>
       Every image is associated with a map which works as a mask. Simply
       create this map as a grayscale gradient: when applied onto the image,
       dark areas of the mask will show the underlying image and bright areas
@@ -77,24 +68,27 @@
       </para>
     </note>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Accessing this Filter</phrase>
-    </title>
+    <title>Accessing this Filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Combine</guisubmenu><guimenuitem>Depth Merge</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Combine</guisubmenu>
+        <guimenuitem>Depth Merge</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title/>
+      <title><quote>Depth Merge</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/depthmerge-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/depthmerge-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -143,22 +137,20 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Using example</phrase>
-    </title>
+    <title>Using example</title>
     <para>
       Maps are grayscale gradients created with the
       <link linkend="gimp-tool-blend">Blend tool</link> and modified with the
       <link linkend="gimp-tool-curves">Curve tool</link>.
     </para>
     <figure>
-      <title>
-        <phrase>Source images and their maps</phrase>
-      </title>
+      <title>Source images and their maps</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-source-image1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-source-image1.png"/>
         </imageobject>
         <caption>
           <para>Source image 1</para>
@@ -166,7 +158,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-source-image2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-source-image2.png"/>
         </imageobject>
         <caption>
           <para>Source image 2</para>
@@ -174,7 +167,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-source-map1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-source-map1.png"/>
         </imageobject>
         <caption>
           <para>Map 1</para>
@@ -182,7 +176,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-source-map2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-source-map2.png"/>
         </imageobject>
         <caption>
           <para>Map 2</para>
@@ -196,15 +191,15 @@
       visible. In total, the green circle and the yellow square stay visible.
     </para>
     <figure>
-      <title>
-        <phrase>Results</phrase>
-      </title>
+      <title>Results</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-results-none.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-results-none.png"/>
         </imageobject>
         <caption>
-          <para><emphasis>No offset and no overlap</emphasis>.
+          <para>
+            <emphasis>No offset and no overlap</emphasis>.
             The limit between both images is sharp and is situated
             in the middle of the mask gradient.
           </para>
@@ -212,29 +207,35 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-results-offset.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-results-offset.png"/>
         </imageobject>
         <caption>
-          <para><emphasis>Offset</emphasis> = 0.980 : the limit, sharp,
+          <para>
+            <emphasis>Offset</emphasis> = 0.980 : the limit, sharp,
             is shifted so that the image2 area is increased.
           </para>
         </caption>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-results-overlap.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-results-overlap.png"/>
         </imageobject>
         <caption>
-          <para><emphasis>Overlap</emphasis>: the limit is blurred.
+          <para>
+            <emphasis>Overlap</emphasis>: the limit is blurred.
           </para>
         </caption>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/depthmerge-results-scale.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/depthmerge-results-scale.png"/>
         </imageobject>
         <caption>
-          <para><emphasis>Scale 1</emphasis>
+          <para>
+            <emphasis>Scale 1</emphasis>
             reduced to 0.056 : as with Offset, the limit is shifted. Image-1
             area is increased.
           </para>
diff --git a/src/filters/combine/film.xml b/src/filters/combine/film.xml
index 5ab2071..022d63e 100644
--- a/src/filters/combine/film.xml
+++ b/src/filters/combine/film.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-07-12 Added Spanish translation by AntI
   2007-05-27 KoSt: added 'no'
@@ -7,18 +8,8 @@
   2005/09/25 translated to german by axel.wernicke
 -->
 <sect2 id="plug-in-film">
- <!-- <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-11</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Film</phrase>
-  </title>
+  <title>Film</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Combine</secondary>
@@ -27,17 +18,15 @@
   <indexterm>
     <primary>Film</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Applying example for the Film filter</phrase>
-      </title>
+      <title>Applying example for the Film filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -45,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/combine-taj-film.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/combine-taj-film.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Film</quote> applied</para>
@@ -64,31 +54,31 @@
       </para>
     </note>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Accessing this Filter</phrase>
-    </title>
+    <title>Accessing this Filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Combine</guisubmenu><guimenuitem>Film</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Combine</guisubmenu>
+        <guimenuitem>Film</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <variablelist>
       <varlistentry>
         <term>Selection Options</term>
         <listitem>
           <figure>
-            <title>
-              <phrase><quote>Film</quote> filter options (Selection)
-              </phrase>
-            </title>
+            <title><quote>Film</quote> filter options (Selection)</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/film-options1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/film-options1.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -192,13 +182,11 @@
         <term>Advanced Options</term>
         <listitem>
           <figure>
-            <title>
-              <phrase><quote>Film</quote> filter options (Advanced)
-              </phrase>
-            </title>
+            <title><quote>Film</quote> filter options (Advanced)</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/film-options2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/film-options2.png"/>
               </imageobject>
             </mediaobject>
           </figure>
diff --git a/src/filters/combine/introduction.xml b/src/filters/combine/introduction.xml
index 6cff7c3..539dd70 100644
--- a/src/filters/combine/introduction.xml
+++ b/src/filters/combine/introduction.xml
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-07-12 Added Spanish translation by AntI
   2007-05-19 KoSt: added 'no'
   2005/09/29 german translation added by axel.wernicke
 -->
 <sect2 id="filters-combine-introduction">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-11</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Combine</secondary>
     <tertiary>Introduction</tertiary>
   </indexterm>
+
   <para>
     The combine filters associate two or more images into a single image.
   </para>
diff --git a/src/filters/decor/add-bevel.xml b/src/filters/decor/add-bevel.xml
index 2dbcbd8..8291512 100644
--- a/src/filters/decor/add-bevel.xml
+++ b/src/filters/decor/add-bevel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-01 KoSt: Added 'no'
   2007-09-02 AntI: Added 'es'
@@ -7,20 +8,9 @@
   2007-08-25 alex falappa: added it
   2007-08-16 ude: created en, de
 -->
-<!--TODO: ko: translation incomplete -->
 <sect2 id="script-fu-add-bevel">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-16</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Add Bevel</phrase>
-  </title>
+  <title>Add Bevel</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Add Bevel</secondary>
@@ -28,19 +18,15 @@
   <indexterm>
     <primary>Add Bevel</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Add Bevel</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Add Bevel</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-add-bevel20.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-add-bevel20.png"/>
         </imageobject>
         <caption>
           <para>
@@ -50,7 +36,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-add-bevel21.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-add-bevel21.png"/>
         </imageobject>
         <caption>
           <para><quote>Add Bevel</quote> applied</para>
@@ -58,18 +45,16 @@
       </mediaobject>
     </figure>
     <para>
-      This filter adds a slight bevel to an image using a <link linkend="plug-in-bump-map">bump map</link> (see below). If there is a
+      This filter adds a slight bevel to an image using a
+      <link linkend="plug-in-bump-map">bump map</link> (see below). If there is a
       selection, it is bevelled, otherwise the filter has no effect.
     </para>
     <figure>
-      <title>
-        <phrase>
-          Another <quote>Add Bevel</quote> example, with bumpmap
-        </phrase>
-      </title>
+      <title>Another <quote>Add Bevel</quote> example, with bumpmap</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-add-bevel10.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-add-bevel10.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -77,7 +62,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-add-bevel12.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-add-bevel12.png"/>
         </imageobject>
         <caption>
           <para>Bumpmap</para>
@@ -85,7 +71,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-add-bevel11.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-add-bevel11.png"/>
         </imageobject>
         <caption>
           <para>Filter applied</para>
@@ -93,26 +80,27 @@
       </mediaobject>
     </figure>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Add Bevel</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Add Bevel</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Add Bevel</quote> options</phrase>
-      </title>
+      <title><quote>Add Bevel</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-add-bevel.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-add-bevel.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -146,7 +134,8 @@
           </para>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/filters/examples/decor-add-bevel23.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/filters/examples/decor-add-bevel23.png"/>
             </imageobject>
           </mediaobject>
         </listitem>
diff --git a/src/filters/decor/addborder.xml b/src/filters/decor/addborder.xml
index cec01b8..c19c504 100644
--- a/src/filters/decor/addborder.xml
+++ b/src/filters/decor/addborder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-01 KoSt: Added 'no'
   2007-09-02 AntI: Added 'es'
@@ -7,20 +8,9 @@
   2007-08-22 j.h: translated to fr
   2007-08-19 ude: created en, de
 -->
-<!--TODO ko; : translation-->
 <sect2 id="script-fu-addborder">
-  <!--<sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-18</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Add Border</phrase>
-  </title>
+  <title>Add Border</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Add Border</secondary>
@@ -28,19 +18,15 @@
   <indexterm>
     <primary>Add Border</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Add Border</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Add Border</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPEG"/>
+          <imagedata format="JPEG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-addborder.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/decor-taj-addborder.jpg"/>
         </imageobject>
         <caption>
           <para>Added border</para>
@@ -65,26 +52,27 @@
       The image will be enlarged by the border size, it won't be painted over.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Add Border</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Add Border</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Add Border</quote> options</phrase>
-      </title>
+      <title><quote>Add Border</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-addborder.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-addborder.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -118,13 +106,12 @@
             color of the respective border side is computed for every color
             component red, green, and
             blue<footnote><para>
-              See <link linkend="gimp-concepts-image-types">image types</link> or
-              <xref linkend="glossary-rgb"/>.
+              See <link linkend="gimp-concepts-image-types">image types</link>
+              or <xref linkend="glossary-rgb"/>.
             </para></footnote>
             from the <quote>average</quote> <guilabel>Border color</guilabel>
-            as follows
-              (Resulting values less than 0 are set to 0, values greater than
-              255 are set to 255.):
+            as follows (Resulting values less than 0 are set to 0, values
+            greater than 255 are set to 255.):
           </para>
           <itemizedlist>
             <listitem>
@@ -141,15 +128,15 @@
             </listitem>
           </itemizedlist>
           <figure>
-            <title>
-              <phrase>Delta examples</phrase>
-            </title>
+            <title>Delta examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/addborder-delta.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/addborder-delta.png"/>
               </imageobject>
               <caption>
-                <para><quote>Add Border</quote> filter applied with
+                <para>
+                  <quote>Add Border</quote> filter applied with
                   <guilabel>Delta value</guilabel> 25, then with 75, 125, 175,
                   and 225.
                 </para>
diff --git a/src/filters/decor/coffee.xml b/src/filters/decor/coffee.xml
index 08c9dc9..7839a91 100644
--- a/src/filters/decor/coffee.xml
+++ b/src/filters/decor/coffee.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-01 KoSt: Added 'no'
   2007-09-03 alex falappa: added it
@@ -7,18 +8,8 @@
   2007-08-29 ude: created en, de
 -->
 <sect2 id="script-fu-coffee-stain">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-29</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Coffee Stain</phrase>
-  </title>
+  <title>Coffee Stain</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Coffee Stain</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Coffee Stain</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Coffee Stain</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-coffee.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/decor-taj-coffee.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Coffee Stain</quote> applied</para>
@@ -65,26 +53,27 @@
       additional stains using the filter again.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       The filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Coffee Stain</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Coffee Stain</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Coffee Stain</quote> options</phrase>
-      </title>
+      <title><quote>Coffee Stain</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-coffee.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-coffee.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -101,7 +90,8 @@
           <para>
             Since every stain is created in a layer of its own, all layers
             have to be merged to make the appearance of the image. If
-            this option is checked, the relevant <link linkend="gimp-concepts-layer-modes">layer mode</link> is set to
+            this option is checked, the relevant
+            <link linkend="gimp-concepts-layer-modes">layer mode</link> is set to
             <quote>Darken only</quote>, otherwise it is set to
             <quote>Normal</quote>.
           </para>
diff --git a/src/filters/decor/fuzzyborder.xml b/src/filters/decor/fuzzyborder.xml
index 1f6f1db..0756e0f 100644
--- a/src/filters/decor/fuzzyborder.xml
+++ b/src/filters/decor/fuzzyborder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-01 KoSt: added 'no'
   2007-09-02 ciampix: added it
@@ -7,18 +8,8 @@
   2007-08-28 ude: created en, de
 -->
 <sect2 id="script-fu-fuzzy-border">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-28</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fuzzy Border</phrase>
-  </title>
+  <title>Fuzzy Border</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Fuzzy Border</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Fuzzy Border</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Fuzzy Border</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-fuzzyborder.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/decor-taj-fuzzyborder.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Fuzzy Border</quote> applied</para>
@@ -60,26 +48,29 @@
       border. Optionally you may add a shadow to the image.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Fuzzy Border</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Fuzzy Border</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
       <title>
         <phrase><quote>Fuzzy Border</quote> options</phrase>
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-fuzzyborder.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-fuzzyborder.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -115,7 +106,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-blur.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-blur.png"/>
               </imageobject>
               <caption>
                 <para><quote>Blur</quote> checked</para>
@@ -123,7 +115,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-noblur.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-noblur.png"/>
               </imageobject>
               <caption>
                 <para><quote>Blur</quote> unchecked</para>
@@ -131,13 +124,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase><quote>Blur border</quote> zoomed (1600%)
-              </phrase>
-            </title>
+            <title><quote>Blur border</quote> zoomed (1600%)</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-blurx16.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-blurx16.png"/>
               </imageobject>
               <caption>
                 <para><quote>Blur</quote> checked</para>
@@ -145,7 +136,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-noblurx16.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-noblurx16.png"/>
               </imageobject>
               <caption>
                 <para><quote>Blur</quote> unchecked</para>
@@ -162,14 +154,11 @@
             to create the effect of a jagged and fuzzy border.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Granularity example (without blurring)
-              </phrase>
-            </title>
+            <title>Granularity example (without blurring)</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-gran1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-gran1.png"/>
               </imageobject>
               <caption>
                 <para>Granularity 1 (min)</para>
@@ -177,7 +166,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-gran4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-gran4.png"/>
               </imageobject>
               <caption>
                 <para>Granularity 4 (default)</para>
@@ -185,7 +175,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-gran16.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-gran16.png"/>
               </imageobject>
               <caption>
                 <para>Granularity 16 (max)</para>
@@ -201,34 +192,38 @@
             If checked, the filter will also create a shadow at the border.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Add shadow</quote> example</phrase>
-            </title>
+            <title><quote>Add shadow</quote> example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-shadow100.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-shadow100.png"/>
               </imageobject>
               <caption>
-                <para><quote>Add shadow</quote> checked, shadow weight 100%
+                <para>
+                  <quote>Add shadow</quote> checked, shadow weight 100%
                   (default shadow weight).
                 </para>
               </caption>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-shadow10.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-shadow10.png"/>
               </imageobject>
               <caption>
-                <para><quote>Add shadow</quote> with shadow weight 10%.
+                <para>
+                  <quote>Add shadow</quote> with shadow weight 10%.
                 </para>
               </caption>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/fuzzyborder-noshadow.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/fuzzyborder-noshadow.png"/>
               </imageobject>
               <caption>
-                <para><quote>Add shadow</quote> unchecked (default)
+                <para>
+                  <quote>Add shadow</quote> unchecked (default)
                 </para>
               </caption>
             </mediaobject>
diff --git a/src/filters/decor/introduction.xml b/src/filters/decor/introduction.xml
index 973ddeb..d8e828f 100644
--- a/src/filters/decor/introduction.xml
+++ b/src/filters/decor/introduction.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-02-04 kost: Added 'no'
   2007-09-02 AntI: Added 'es'
@@ -8,18 +9,8 @@
   2007-08-13 created
 -->
 <sect2 id="filters-decor-introduction">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-13</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -28,7 +19,7 @@
   <indexterm>
     <primary>Decor</primary>
   </indexterm>
-  <para><!--changed 2007-09-02 (and may change again)-->
+  <para>
     These filters are image-dependent Script-Fu scripts. They create
     decorative borders, and some of them add some nice special effects to the
     image.
diff --git a/src/filters/decor/old-photo.xml b/src/filters/decor/old-photo.xml
index ec6a920..bf0dc95 100644
--- a/src/filters/decor/old-photo.xml
+++ b/src/filters/decor/old-photo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-01 KoSt: Added 'no'
   2007-09-03 alex falappa: added it
@@ -7,18 +8,8 @@
   2007-08-31 ude: created en, de
 -->
 <sect2 id="script-fu-old-photo">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-31</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Old Photo</phrase>
-  </title>
+  <title>Old Photo</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Old Photo</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Old Photo</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Old Photo</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-old-photo.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/decor-taj-old-photo.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Old Photo</quote> applied</para>
@@ -60,26 +48,27 @@
       with spots.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       The filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Old Photo</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Old Photo</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Old Photo</quote> options</phrase>
-      </title>
+      <title><quote>Old Photo</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-old-photo.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-old-photo.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -92,14 +81,11 @@
             will be applied to the image, making it less clear.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Example for the <quote>Defocus</quote> option
-              </phrase>
-            </title>
+            <title>Example for the <quote>Defocus</quote> option</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/old-photo-defocus.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/old-photo-defocus.png"/>
               </imageobject>
               <caption>
                 <para>Defocus enabled</para>
@@ -107,7 +93,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/old-photo-focus.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/old-photo-focus.png"/>
               </imageobject>
               <caption>
                 <para>Defocus disabled</para>
@@ -120,8 +107,9 @@
         <term>Border size</term>
         <listitem>
           <para>
-            When you choose a border size &gt; 0, the <link linkend="script-fu-fuzzy-border">Fuzzy Border</link> filter will
-            be applied to the image, adding a white, jagged border.
+            When you choose a border size &gt; 0, the
+            <link linkend="script-fu-fuzzy-border">Fuzzy Border</link> filter
+            will be applied to the image, adding a white, jagged border.
           </para>
         </listitem>
       </varlistentry>
@@ -149,14 +137,11 @@
             When you check this option, the image will be marked with spots.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Example for the <quote>Mottle</quote> option
-              </phrase>
-            </title>
+            <title>Example for the <quote>Mottle</quote> option</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/old-photo-mottle.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/old-photo-mottle.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/filters/decor/round-corners.xml b/src/filters/decor/round-corners.xml
index 8268dfd..2f20872 100644
--- a/src/filters/decor/round-corners.xml
+++ b/src/filters/decor/round-corners.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-11 KoSt: added 'no'
   2007-09-04 AntI: Added 'es'
@@ -7,18 +8,8 @@
   2007-09-03 ude: created en, de
 -->
 <sect2 id="script-fu-round-corners">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-09-24</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Round Corners</phrase>
-  </title>
+  <title>Round Corners</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Round Corners</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Round Corners</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Round Corners</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-round-corners.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/decor-taj-round-corners.png"/>
         </imageobject>
         <caption>
           <para><quote>Round Corners</quote> applied</para>
@@ -65,26 +53,27 @@
       layer.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Round Corners</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Round Corners</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Round Corners</quote> options</phrase>
-      </title>
+      <title><quote>Round Corners</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-round-corners.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-round-corners.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -106,12 +95,11 @@
             possible, but look what happens...
           </para>
           <figure>
-            <title>
-              <phrase>Edge radius examples</phrase>
-            </title>
+            <title>Edge radius examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-rad15.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-rad15.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -121,7 +109,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-rad35.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-rad35.png"/>
               </imageobject>
               <caption>
                 <para>Edge radius: 35.</para>
@@ -129,7 +118,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-rad50.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-rad50.png"/>
               </imageobject>
               <caption>
                 <para>Edge radius: 50.</para>
@@ -137,7 +127,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-rad65.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-rad65.png"/>
               </imageobject>
               <caption>
                 <para>Edge radius: 65. Ouch!</para>
@@ -165,12 +156,11 @@
             it look closer to the image.
           </para>
           <figure>
-            <title>
-              <phrase>Shadow offset examples</phrase>
-            </title>
+            <title>Shadow offset examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-shadow1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-shadow1.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -180,7 +170,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/round-corners-shadow2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/round-corners-shadow2.png"/>
               </imageobject>
               <caption>
                 <para>Shadow X offset: 16, Y offset: 4.</para>
@@ -196,7 +187,7 @@
       <varlistentry>
         <term>Blur radius</term>
         <listitem>
-          <para><!--changed 2007-09-24-->
+          <para>
             When <guilabel>Add drop-shadow</guilabel> is checked, you may
             select a blur radius, which will be used by the
             <link linkend="script-fu-drop-shadow">Drop Shadow</link> filter.
@@ -208,7 +199,7 @@
       <varlistentry>
         <term>Add background</term>
         <listitem>
-          <para><!--changed 2007-09-24-->
+          <para>
             When you check this option (it is checked by default), the filter
             will add a background layer below the existing layer, filled with
             the current background color. The size of this new layer depends
diff --git a/src/filters/decor/slide.xml b/src/filters/decor/slide.xml
index 72c4b65..efa4434 100644
--- a/src/filters/decor/slide.xml
+++ b/src/filters/decor/slide.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-11 KoSt: added 'no'
   2007-09-29 alex falappa: added 'it'
@@ -7,18 +8,8 @@
   2007-09-10 ude: created en, de
 -->
 <sect2 id="script-fu-slide">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-09-10</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Slide</phrase>
-  </title>
+  <title>Slide</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Decor</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Slide</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Slide</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Slide</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/decor-taj-slide.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/decor-taj-slide.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Slide</quote> applied</para>
@@ -71,26 +59,27 @@
       layer. Otherwise the menu entry is insensitive and grayed out.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       The filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</guisubmenu><guimenuitem>Slide</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Decor</guisubmenu>
+        <guimenuitem>Slide</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Slide</quote> options</phrase>
-      </title>
+      <title><quote>Slide</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-decor-slide.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-decor-slide.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/light_effects/apply_lens.xml b/src/filters/light_effects/apply_lens.xml
index 9806ec4..b1282fe 100644
--- a/src/filters/light_effects/apply_lens.xml
+++ b/src/filters/light_effects/apply_lens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-06-09 ude: rearranged options ('en')
   2008-06-02 j.h: replaced "image" with "active layer"
@@ -9,22 +10,12 @@
   2007-04-17 KoSt: added 'no'
   2006-11-28 added "Make Surroundings Transparent" en;fr by j.h
   2005-12-07 replaced <simplesect> by <sect3> by lexa
-  050830 de replaced informalfigure by axel.wernicke
-  050902 de added by axel.wernicke
+  2005-08-30 de replaced informalfigure by axel.wernicke
+  2005-09-02 de added by axel.wernicke
 -->
 <sect2 id="plug-in-applylens">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-06-09</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Apply Lens</phrase>
-  </title>
+  <title>Apply Lens</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -33,19 +24,15 @@
   <indexterm>
     <primary>Apply Lens</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          The same image, before and after applying lens effect.
-        </phrase>
-      </title>
+      <title>The same image, before and after applying lens effect.</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -53,7 +40,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/glass-taj-apply-lens.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/glass-taj-apply-lens.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Apply lens</quote> applied</para>
@@ -65,27 +53,27 @@
       through a spherical lens.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Apply Lens</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Apply Lens</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Apply Lens</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Apply Lens</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/apply_lens-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/apply_lens-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -100,17 +88,13 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Keep original surroundings</phrase>
-        </term>
+        <term>Keep original surroundings</term>
         <listitem>
           <para>The lens seems to be put on the active layer.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Set surroundings to background color</phrase>
-        </term>
+        <term>Set surroundings to background color</term>
         <listitem>
           <para>
             The part of the active layer outside the lens will have the
@@ -119,20 +103,16 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Make surroundings transparent</phrase>
-        </term>
+        <term>Make surroundings transparent</term>
         <listitem>
-          <para><!--changed 2008-06-09-->
+          <para>
             The part of the active layer outside the lens will be transparent.
             This option exists only if the active layer has an alpha channel.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Lens refraction index</phrase>
-        </term>
+        <term>Lens refraction index</term>
         <listitem>
           <para>Lens will be more or less convergent (1-100).</para>
         </listitem>
diff --git a/src/filters/light_effects/drop-shadow.xml b/src/filters/light_effects/drop-shadow.xml
index fb889ef..3d7e9cd 100644
--- a/src/filters/light_effects/drop-shadow.xml
+++ b/src/filters/light_effects/drop-shadow.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-15 j.h: no change for v2.6
   2007-12-22 MikaS: added 'fr'
@@ -7,18 +8,8 @@
   2007-09-24 ude: created 'en','de'
 -->
 <sect2 id="script-fu-drop-shadow">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-09-27</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Drop Shadow</phrase>
-  </title>
+  <title>Drop Shadow</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -27,19 +18,15 @@
   <indexterm>
     <primary>Drop Shadow</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Drop Shadow</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Drop Shadow</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,10 +34,12 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-drop-shadow.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-drop-shadow.jpg"/>
         </imageobject>
         <caption>
-          <para><quote>Drop Shadow</quote> applied
+          <para>
+            <quote>Drop Shadow</quote> applied
             (white background layer added manually)
           </para>
         </caption>
@@ -71,26 +60,27 @@
       instead it has been added later to let you see the shadow.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Drop Shadow</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Drop Shadow</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Drop Shadow</quote> filter options</phrase>
-      </title>
+      <title><quote>Drop Shadow</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-light-drop-shadow.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-light-drop-shadow.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -98,7 +88,7 @@
       <varlistentry>
         <term>Offset X; Offset Y</term>
         <listitem>
-          <para><!-- changed 2007-10-05 -->
+          <para>
             The layer containing the drop shadow will be moved horizontally
             by X pixels, vertically by Y pixels. So, X and Y offset
             determine where the shadow will be placed in relation to the
@@ -121,11 +111,12 @@
         <term>Blur radius</term>
         <listitem>
           <para>
-            After creating the shadow, a <link linkend="plug-in-gauss">Gaussian blur</link> with the specified
-            radius is applied to the shadow layer, resulting in the realistic
-            appearance of the drop shadow. It may be necessary to enable
-            <guilabel>Allow resizing</guilabel>, since blurring extends the
-            shadow.
+            After creating the shadow, a
+            <link linkend="plug-in-gauss">Gaussian blur</link> with the
+            specified radius is applied to the shadow layer, resulting in the
+            realistic appearance of the drop shadow. It may be necessary to
+            enable <guilabel>Allow resizing</guilabel>, since blurring extends
+            the shadow.
           </para>
         </listitem>
       </varlistentry>
@@ -137,13 +128,11 @@
             select a color when the color selector pops up.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Drop Shadow</quote> color example
-              </phrase>
-            </title>
+            <title><quote>Drop Shadow</quote> color example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/drop-shadow-color.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/drop-shadow-color.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -154,9 +143,12 @@
         <listitem>
           <para>
             The shadow's opacity is just the opacity of the new layer
-            containing the shadow (see <xref linkend="gimp-layer-properties"/>). It defaults to 80%, but you may select any other value from 0
-            (full transparency) to 100 (full opacity) here. After applying the
-            filter to an image you can change the opacity in the <link linkend="gimp-layer-dialog">layers dialog</link>.
+            containing the shadow (see
+            <xref linkend="gimp-layer-properties"/>). It defaults to 80%, but
+            you may select any other value from 0 (full transparency) to 100
+            (full opacity) here. After applying the filter to an image you can
+            change the opacity in the <link linkend="gimp-layer-dialog">layers
+            dialog</link>.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/filters/light_effects/flarefx.xml b/src/filters/light_effects/flarefx.xml
index bc3c77b..db6d139 100644
--- a/src/filters/light_effects/flarefx.xml
+++ b/src/filters/light_effects/flarefx.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-15 j.h: no change for v2.6
   2007-12-20 MikaS: updated 'fr'
@@ -11,18 +12,8 @@
   2005-09-03 de added by axel.wernicke
 -->
 <sect2 id="plug-in-flarefx">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-01-01</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Lens Flare</phrase>
-  </title>
+  <title>Lens Flare</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -31,17 +22,15 @@
   <indexterm>
     <primary>Lens Flare</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Example for the Lens Flare filter</phrase>
-      </title>
+      <title>Example for the Lens Flare filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -49,7 +38,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-flarefx.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-flarefx.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Lens Flare</quote> applied</para>
@@ -63,13 +53,16 @@
       <link linkend="plug-in-gflare">Gradient Flare</link> filter offers.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Lens Flare</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Lens Flare</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
   <sect3>
diff --git a/src/filters/light_effects/glasstile.xml b/src/filters/light_effects/glasstile.xml
index 77bae55..6a5bed5 100644
--- a/src/filters/light_effects/glasstile.xml
+++ b/src/filters/light_effects/glasstile.xml
@@ -1,28 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-29 MikaS: updated 'fr'
   2007-12-25 ciampix: updated 'it'
   2007-08-24 AntI: added 'es'
   2007-04-17 KoSt: added 'no'
   2005-12-07 replaced <simplesect> by <sect3> by lexa
-  05-11-25 en;fr fixed image file name by axel.wernicke
-  05-08-30 de replaced informalfigure by axel.wernicke
-  05-09-03 de added by axel.wernicke
+  2005-11-25 en;fr fixed image file name by axel.wernicke
+  2005-08-30 de replaced informalfigure by axel.wernicke
+  2005-09-03 de added by axel.wernicke
 -->
 <sect2 id="plug-in-glasstile">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Glass Tile</phrase>
-  </title>
+  <title>Glass Tile</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -31,19 +22,17 @@
   <indexterm>
     <primary>Glass Tile</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
       <title>
-        <phrase>
-          The same image, before and after applying glass tile effect.
-        </phrase>
+        The same image, before and after applying glass tile effect.
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -51,7 +40,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/glass-taj-glass-tile.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/glass-taj-glass-tile.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Glass Tile</quote> applied</para>
@@ -63,27 +53,27 @@
       as through a glass brick wall.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
        You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Glass Tile</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Glass Tile</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Glass Tile</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Glass Tile</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-glass-tile.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-glass-tile.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -103,13 +93,15 @@
           <para>
             <itemizedlist>
               <listitem>
-                <para><guilabel>Tile width</guilabel>: Sets tile width (10-50
-                pixels).
+                <para>
+                  <guilabel>Tile width</guilabel>: Sets tile width (10-50
+                  pixels).
               </para>
               </listitem>
               <listitem>
-                <para><guilabel>Tile length</guilabel>: Sets tile length (10-50
-                pixels).
+                <para>
+                  <guilabel>Tile length</guilabel>: Sets tile length (10-50
+                  pixels).
               </para>
               </listitem>
             </itemizedlist>
diff --git a/src/filters/light_effects/introduction.xml b/src/filters/light_effects/introduction.xml
index 2d40e61..f33e1a1 100644
--- a/src/filters/light_effects/introduction.xml
+++ b/src/filters/light_effects/introduction.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-05 ude: merged with glass filters introduction ('en','de')
   2007-08-29 AntI: added 'es'
   2007-04-19 KoSt: added 'no'
-  050903 de added by axel.wernicke
+  2005-09-03 de added by axel.wernicke
 -->
 <sect2 id="filters-light-and-shadow-introduction">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-09-05</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -31,6 +22,7 @@
     <primary>Filters</primary>
     <secondary>Glass Effects</secondary>
   </indexterm>
+
   <para>
     Here you will find three groups of filters:
   </para>
@@ -48,7 +40,8 @@
       </para>
     </listitem>
     <listitem>
-      <para><emphasis>Glass Effects</emphasis> filters result in an image as if it
+      <para>
+        <emphasis>Glass Effects</emphasis> filters result in an image as if it
         were seen through a lens or glass tiles.
       </para>
     </listitem>
diff --git a/src/filters/light_effects/nova.xml b/src/filters/light_effects/nova.xml
index 56c7372..562af18 100644
--- a/src/filters/light_effects/nova.xml
+++ b/src/filters/light_effects/nova.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-29 MikaS: added 'fr'
   2007-08-29 AntI: added 'es'
@@ -10,18 +11,8 @@
   2005-09-04 de added by axel.wernicke
 -->
 <sect2 id="plug-in-nova">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-14</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Supernova</phrase>
-  </title>
+  <title>Supernova</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -30,17 +21,15 @@
   <indexterm>
     <primary>Supernova</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Applying example for the Supernova filter</phrase>
-      </title>
+      <title>Applying example for the Supernova filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +37,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-nova.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-nova.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Supernova</quote> applied</para>
@@ -61,27 +51,27 @@
       is the distance from star center.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Supernova</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Supernova</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Parameter Settings</phrase>
-    </title>
+    <title>Parameter Settings</title>
     <figure>
-      <title>
-        <phrase><quote>Supernova</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Supernova</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-light-nova.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-light-nova.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -100,7 +90,8 @@
         <listitem>
           <itemizedlist>
             <listitem>
-              <para><!-- changed 2007-12-24 --><guilabel>X</guilabel>, <guilabel>Y</guilabel>: You can use
+              <para>
+                <guilabel>X</guilabel>, <guilabel>Y</guilabel>: You can use
                 input boxes to set horizontal (X) and vertical (Y)
                 coordinates of SuperNova center. You can also click the
                 SuperNova center in the <emphasis>preview</emphasis> box.
@@ -113,7 +104,8 @@
               </tip>
             </listitem>
             <listitem>
-              <para><guilabel>Show Cursor</guilabel>: This option brings up a
+              <para>
+                <guilabel>Show Cursor</guilabel>: This option brings up a
                 reticle in preview, centered on the SuperNova.
               </para>
             </listitem>
diff --git a/src/filters/light_effects/sparkle.xml b/src/filters/light_effects/sparkle.xml
index 9ddd52f..44156be 100644
--- a/src/filters/light_effects/sparkle.xml
+++ b/src/filters/light_effects/sparkle.xml
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-01-03 MikaS: updated 'fr'
   2007-08-31 AntI: added 'es'
   2007-04-19 KoSt: added 'no'
   2005-12-07 replaced <simplesect> by <sect3> by lexa
-  050830 de replaced informalfigure by axel.wernicke
-  050904 de added by axel.wernicke
+  2005-08-30 de replaced informalfigure by axel.wernicke
+  2005-09-04 de added by axel.wernicke
 -->
 <sect2 id="plug-in-sparkle">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-01-03</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Sparkle</phrase>
-  </title>
+  <title>Sparkle</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -29,17 +20,15 @@
   <indexterm>
     <primary>Sparkle</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Applying example for the Sparkle filter</phrase>
-      </title>
+      <title>Applying example for the Sparkle filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +36,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-sparkle.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-sparkle.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Sparkle</quote> applied</para>
@@ -61,27 +51,27 @@
       where you want sparkles to be.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Sparkle</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Sparkle</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Parameter Settings</phrase>
-    </title>
+    <title>Parameter Settings</title>
     <figure>
-      <title>
-        <phrase><quote>Sparkle</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Sparkle</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/filters-light-sparkle.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/filters-light-sparkle.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/light_effects/xach-effect.xml b/src/filters/light_effects/xach-effect.xml
index 173f3ba..59a8e34 100644
--- a/src/filters/light_effects/xach-effect.xml
+++ b/src/filters/light_effects/xach-effect.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-07-20 kost: added 'no'
   2007-10-22 alex falappa: added 'it'
   2007-10-09 ude: created 'en','de'
 -->
 <sect2 id="script-fu-xach-effect">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-09</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Xach-Effect</phrase>
-  </title>
+  <title>Xach-Effect</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Light and Shadow</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Xach-Effect</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Xach-Effect</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Xach-Effect</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-xach-effect.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-xach-effect.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Xach-Effect</quote> applied</para>
@@ -59,7 +47,7 @@
     </para>
     <itemizedlist>
       <listitem>
-        <para><!-- 2007-10-22: slightly changed the explanation of the mask purpose -->
+        <para>
           Highlighting the selection: a new layer (<quote>Highlight</quote>)
           will be created above the active layer, filled with the highlight
           color. Then a <link linkend="gimp-layer-mask">layer mask</link> will
@@ -68,7 +56,8 @@
         </para>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/examples/xach-effect-layers.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/filters/examples/xach-effect-layers.png"/>
           </imageobject>
           <caption>
             <para>Highlight layer with layer mask</para>
@@ -94,30 +83,31 @@
       for highlight or shadow and change amount and directions of offsets.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       The filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</guisubmenu><guimenuitem>Xach-Effect</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Light and Shadow</guisubmenu>
+        <guimenuitem>Xach-Effect</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <para>
       There are two groups of options, each controlling the highlight or the
       shadow, and a checkbox for the selection behaviour.
     </para>
     <figure>
-      <title>
-        <phrase><quote>Xach-Effect</quote> options</phrase>
-      </title>
+      <title><quote>Xach-Effect</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-light-xach-effect.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-light-xach-effect.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -151,8 +141,9 @@
           <para>
             The selection will be covered by a partially transparent area
             filled with the highlight color. This option lets you set the
-            level of transparency. Since a <link linkend="gimp-layer-mask">layer mask</link> will be used, the
-            value ranges from 0 (full transparency) to 255 (full opacity).
+            level of transparency. Since a
+            <link linkend="gimp-layer-mask">layer mask</link> will be used,
+            the value ranges from 0 (full transparency) to 255 (full opacity).
           </para>
           <para>
             The highlight opacity defaults to 66, which is equivalent to 26%.
@@ -163,7 +154,8 @@
         <term>Drop shadow options</term>
         <listitem>
           <para>
-            These options work like the respective <link linkend="script-fu-drop-shadow">Drop Shadow</link> options
+            These options work like the respective
+            <link linkend="script-fu-drop-shadow">Drop Shadow</link> options
             (without resizing). Briefly:
           </para>
           <variablelist>
@@ -187,8 +179,9 @@
               <term>Drop shadow blur radius</term>
               <listitem>
                 <para>
-                  The radius used by the <link linkend="plug-in-gauss">Gaussian blur</link> filter, which
-                  will be applied to the shadow.
+                  The radius used by the
+                  <link linkend="plug-in-gauss">Gaussian blur</link> filter,
+                  which will be applied to the shadow.
                 </para>
               </listitem>
             </varlistentry>
diff --git a/src/filters/map/bumpmap.xml b/src/filters/map/bumpmap.xml
index 7d3ca2c..e180c77 100644
--- a/src/filters/map/bumpmap.xml
+++ b/src/filters/map/bumpmap.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-09 ude: moved "activate filter" paras to separate sect3
   2007-12-05 j.h: some more explanation after a message on a forum, en;fr
@@ -12,18 +13,8 @@
   2005-09-30 created by julien hardelin
 -->
 <sect2 id="plug-in-bump-map">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-09</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Bump Map</phrase>
-  </title>
+  <title>Bump Map</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -32,18 +23,15 @@
   <indexterm>
     <primary>Bump Map</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase><quote>bump-map</quote> example
-        </phrase>
-      </title>
+      <title><quote>bump-map</quote> example</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/example-map-bumpmap.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/example-map-bumpmap.png"/>
         </imageobject>
         <caption>
           <para>
@@ -65,27 +53,27 @@
       filter.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Bump Map</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Bump Map</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Bump Map</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Bump Map</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-bumpmap.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-bumpmap.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -100,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Bump Map</phrase>
-        </term>
+        <term>Bump Map</term>
         <listitem>
           <para>
             This drop-down list allows you to select the image that will be
@@ -113,9 +99,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Map Type</phrase>
-        </term>
+        <term>Map Type</term>
         <listitem>
           <para>
             This option allows you to define the method that will be used
@@ -123,17 +107,20 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Linear</guilabel>: bump height is a direct
+              <para>
+                <guilabel>Linear</guilabel>: bump height is a direct
                 function of luminosity.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Sinusoidal</guilabel>: bump height
+              <para>
+                <guilabel>Sinusoidal</guilabel>: bump height
                 is a sinusoidal function of luminosity.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Spheric</guilabel>: bump height is
+              <para>
+                <guilabel>Spheric</guilabel>: bump height is
                 a spheric function of luminosity.
               </para>
             </listitem>
@@ -141,9 +128,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Compensate for darkening</phrase>
-        </term>
+        <term>Compensate for darkening</term>
         <listitem>
           <para>
             Bump-mapping tends to darken image. You can compensate this
@@ -152,9 +137,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Invert bump-map</phrase>
-        </term>
+        <term>Invert bump-map</term>
         <listitem>
           <para>
             Bright pixels default to bumps and dark pixels to hollows. You can
@@ -163,9 +146,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Tile bump-map</phrase>
-        </term>
+        <term>Tile bump-map</term>
         <listitem>
           <para>
             If you check this option, there will be no relief break if
@@ -175,9 +156,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Azimut</phrase>
-        </term>
+        <term>Azimut</term>
         <listitem>
           <para>
             This is about lighting according to the points of the compass
@@ -187,9 +166,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Elevation</phrase>
-        </term>
+        <term>Elevation</term>
         <listitem>
           <para>
             That's height from horizon (0.50°), up to zenith (90°).
@@ -197,9 +174,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Depth</phrase>
-        </term>
+        <term>Depth</term>
         <listitem>
           <para>
             With this slider, you can vary bump height and hollow depth. The
@@ -209,9 +184,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>X/Y offsets</phrase>
-        </term>
+        <term>X/Y offsets</term>
         <listitem>
           <para>
             With this slider, you can adjust the map image position
@@ -221,9 +194,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Sea Level</phrase>
-        </term>
+        <term>Sea Level</term>
         <listitem>
           <para>
             If your image has transparent areas, they will be treated like
@@ -237,9 +208,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Ambient</phrase>
-        </term>
+        <term>Ambient</term>
         <listitem>
           <para>
             This slider controls the intensity of ambient light. With high
diff --git a/src/filters/map/fractal-trace.xml b/src/filters/map/fractal-trace.xml
index abd8454..a935ed4 100644
--- a/src/filters/map/fractal-trace.xml
+++ b/src/filters/map/fractal-trace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-09 ude: moved "activate filter" paras to separate sect3;
              use Norwegian example images for other languages too
@@ -8,18 +9,8 @@
   2005-10-22 created by julien hardelin
 -->
 <sect2 id="plug-in-fractal-trace">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-01-04</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fractal Trace</phrase>
-  </title>
+  <title>Fractal Trace</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -28,17 +19,15 @@
   <indexterm>
     <primary>Fractal trace</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Fractal Trace</phrase>
-      </title>
+      <title>Fractal Trace</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/kvitveis-orig.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/kvitveis-orig.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/kvitveis-fractal.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/kvitveis-fractal.png"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Fractal Trace</quote> applied</para>
@@ -58,40 +48,39 @@
       the image to the fractal.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Fractal trace</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Fractal trace</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Fractal trace</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Fractal trace</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-fractal-trace.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-fractal-trace.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
-      <title>
-        <phrase>Mandelbrot parameters</phrase>
-      </title>
+      <title>Mandelbrot parameters</title>
       <varlistentry>
         <term>X1, X2, Y1, Y2, Depth</term>
         <listitem>
           <para>
             These parameters are similar to X/YMIN, X/YMAX and ITER
-            parameters of the <link linkend="plug-in-fractalexplorer">Fractal Explorer</link>
+            parameters of the
+            <link linkend="plug-in-fractalexplorer">Fractal Explorer</link>
             filter. They allow you to vary fractal spreading and detail
             depth.
           </para>
diff --git a/src/filters/map/illusion.xml b/src/filters/map/illusion.xml
index 2977893..d19b631 100644
--- a/src/filters/map/illusion.xml
+++ b/src/filters/map/illusion.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-09 ude: moved "activate filter" paras to separate sect3;
              use Norwegian example images for other languages too
@@ -9,18 +10,8 @@
   2005-11-14: created by julien hardelin
 -->
 <sect2 id="plug-in-illusion">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-01-04</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Illusion</phrase>
-  </title>
+  <title>Illusion</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -29,17 +20,15 @@
   <indexterm>
     <primary>Illusion</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Illusion</phrase>
-      </title>
+      <title>Illusion</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/kvitveis-orig.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/kvitveis-orig.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,7 +36,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/kvitveis-illusion.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/kvitveis-illusion.png"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Fractal Trace</quote> applied</para>
@@ -60,34 +50,35 @@
       or less dimmed and split, and puts them around the center of the image.
     </para>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Activate the filter</phrase>
     </title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Illusion</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Illusion</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Illusion</quote> filter options</phrase>
-      </title>
+      <title><quote>Illusion</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-illusion.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-illusion.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Divisions</phrase>
-        </term>
+        <term>Divisions</term>
         <listitem>
           <para>
             That's the number of copies you want to apply to image. This
@@ -97,31 +88,32 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Modes</phrase>
-        </term>
+        <term>Modes</term>
         <listitem>
           <para>
             You have two arrangement modes for copies in image:
           </para>
           <figure>
             <title>
-              <phrase>From left to right: original image, mode 1,
-                mode 2, with Divisions=4</phrase>
+              From left to right: original image, mode 1, mode 2, with
+              Divisions=4
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-illusiona.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-illusiona.png"/>
               </imageobject>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-illusionb.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-illusionb.png"/>
               </imageobject>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-illusionc.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-illusionc.png"/>
               </imageobject>
             </mediaobject>
           </figure>
diff --git a/src/filters/map/papertile.xml b/src/filters/map/papertile.xml
index c71027e..77b4c14 100644
--- a/src/filters/map/papertile.xml
+++ b/src/filters/map/papertile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-05 AntI: added 'es'
   2007-05-07 KoSt: added 'no'
@@ -7,18 +8,8 @@
   2005-11-15: created by julien hardelin
 -->
 <sect2 id="plug-in-papertile">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-01-05</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Paper Tile</phrase>
-  </title>
+  <title>Paper Tile</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -27,18 +18,15 @@
   <indexterm>
     <primary>Paper Tile</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase><quote>Papertile</quote> filter example.
-        </phrase>
-      </title>
+      <title><quote>Papertile</quote> filter example.</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +34,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/map-taj-papertile.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/map-taj-papertile.jpg"/>
         </imageobject>
         <caption>
           <para>
@@ -61,37 +50,37 @@
       less, overlap or move apart. They can go out image borders a little.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Paper Tile</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Paper Tile</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Paper Tile</quote> filter options</phrase>
-      </title>
+      <title><quote>Paper Tile</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-papertile.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-papertile.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Division</phrase>
-        </term>
+        <term>Division</term>
         <listitem>
-          <para><guilabel>X</guilabel>, <guilabel>Y</guilabel> and <guilabel>
-              Size</guilabel> parameters are linked, because filter starts
+          <para>
+            <guilabel>X</guilabel>, <guilabel>Y</guilabel> and <guilabel>
+            Size</guilabel> parameters are linked, because filter starts
             cutting image before it displaces pieces; so, piece size and
             number of pieces in horizontal (X) and vertical (Y) directions
             must be convenient to image size.
@@ -99,20 +88,20 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Movement</phrase>
-        </term>
+        <term>Movement</term>
         <listitem>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Max%</guilabel>
+              <para>
+                <guilabel>Max%</guilabel>
                 is the maximum displacement percentage against the side size
                 of squares.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Wrap around</guilabel>
-                : As tiles move, some can go out image borders. If this option
+              <para>
+                <guilabel>Wrap around</guilabel>:
+                As tiles move, some can go out image borders. If this option
                 is checked, what goes out on one side goes in on the opposite
                 side.
               </para>
@@ -121,9 +110,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Fractional Pixels</phrase>
-        </term>
+        <term>Fractional Pixels</term>
         <listitem>
           <para>
             Because of image cutting, original pixels can persist. There are
@@ -131,18 +118,21 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Background</guilabel>: Remaining pixels will be
+              <para>
+                <guilabel>Background</guilabel>: Remaining pixels will be
                 replaced with the background type defined in the following
                 section.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Ignore</guilabel>: Background Type option is
+              <para>
+                <guilabel>Ignore</guilabel>: Background Type option is
                 not taken into account and remaining pixels are kept.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Force</guilabel>: Remaining pixels will be cut
+              <para>
+                <guilabel>Force</guilabel>: Remaining pixels will be cut
                 also.
               </para>
             </listitem>
@@ -150,9 +140,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background Type</phrase>
-        </term>
+        <term>Background Type</term>
         <listitem>
           <para>
             You can select the background type which will be used, if the
@@ -161,32 +149,38 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Transparent</guilabel>: Background will be
+              <para>
+                <guilabel>Transparent</guilabel>: Background will be
                 transparent.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Inverted image</guilabel>: Background colors
+              <para>
+                <guilabel>Inverted image</guilabel>: Background colors
                 will be inverted (255-value in every color channel).
               </para>
             </listitem>
             <listitem>
-              <para><!--TODO de es it : Add this?--><guilabel>Image</guilabel>: Background colors
+              <para>
+                <guilabel>Image</guilabel>: Background colors
                 will be unchanged. The original image is the background.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Foreground Color</guilabel>: Remaining pixels
+              <para>
+                <guilabel>Foreground Color</guilabel>: Remaining pixels
                 will be replaced by the Foreground color of Toolbox.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Background Color</guilabel>: Remaining pixels
+              <para>
+                <guilabel>Background Color</guilabel>: Remaining pixels
                 will be replaced by the Background color of Toolbox.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Select here</guilabel>: When this radio-button
+              <para>
+                <guilabel>Select here</guilabel>: When this radio-button
                 is checked, clicking in the color dwell will open a Color
                 Selector where you can select the color you want for
                 background.
@@ -196,9 +190,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Centering</phrase>
-        </term>
+        <term>Centering</term>
         <listitem>
           <para>
             If this option is checked, tiles will rather be gathered together
diff --git a/src/filters/noise/hurl.xml b/src/filters/noise/hurl.xml
index 8b0afcc..fe1c832 100644
--- a/src/filters/noise/hurl.xml
+++ b/src/filters/noise/hurl.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-06 prokoudine: improved Russian content, added localized screenshot
   2007-04-07 KoSt: added 'no'
@@ -8,18 +9,8 @@
   050826 de added by axel.wernicke
 -->
 <sect2 id="plug-in-randomize-hurl">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-15</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Hurl</phrase>
-  </title>
+  <title>Hurl</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Noise</secondary>
@@ -28,19 +19,15 @@
   <indexterm>
     <primary>Hurl</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Hurl</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Hurl</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/noise-taj-hurl.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/noise-taj-hurl.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Hurl</quote> applied</para>
@@ -57,7 +45,11 @@
     </figure>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Noise</guisubmenu><guimenuitem>Hurl</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Noise</guisubmenu>
+        <guimenuitem>Hurl</guimenuitem>
+      </menuchoice>.
     </para>
     <para>
       The Hurl filter changes each affected pixel to a random color, so it
@@ -69,18 +61,15 @@
       determined by the <guilabel>Randomization (%)</guilabel> option.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Hurl</quote> options
-        </phrase>
-      </title>
+      <title><quote>Hurl</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-noise-hurl.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-noise-hurl.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/noise/introduction.xml b/src/filters/noise/introduction.xml
index fa46310..e6d5dee 100644
--- a/src/filters/noise/introduction.xml
+++ b/src/filters/noise/introduction.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-     2008-08-06 prokoudine: improved Russian content, added localized screenshot
-     2007-04-07 KoSt: added 'no'
-     2005-08-26 de added by axel.wernicke
-     -->
+  2008-08-06 prokoudine: improved Russian content, added localized screenshot
+  2007-04-07 KoSt: added 'no'
+  2005-08-26 de added by axel.wernicke
+-->
 <sect2 id="filters-noise-introduction">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-15</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Noise</secondary>
diff --git a/src/filters/noise/noisify.xml b/src/filters/noise/noisify.xml
index 74cdb58..a4a7f6c 100644
--- a/src/filters/noise/noisify.xml
+++ b/src/filters/noise/noisify.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-06 prokoudine: improved Russian content, added localized screenshot
   2007-04-09 KoSt: added 'no'
@@ -7,20 +8,9 @@
   050930 de replaced informalfigure by axel.wernicke
   050826 de added by axel.wernicke
 -->
-<!-- TODO: cs es: Scatter RGB ==> RGB Noise in Gimp-2.4 -->
 <sect2 id="plug-in-rgb-noise">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-06</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>RGB Noise</phrase>
-  </title>
+  <title>RGB Noise</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Noise</secondary>
@@ -29,18 +19,15 @@
   <indexterm>
     <primary>RGB Noise</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Example of applying the <quote>RGB Noise</quote>
-        filter</phrase>
-      </title>
+      <title>Example of applying the <quote>RGB Noise</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/noise-taj-scatter-rgb.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/noise-taj-scatter-rgb.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>RGB Noise</quote> applied</para>
@@ -72,27 +60,27 @@
       This filter does not work with indexed images.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Noise</guisubmenu><guimenuitem>RGB Noise</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Noise</guisubmenu>
+        <guimenuitem>RGB Noise</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>RGB Noise</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>RGB Noise</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-noise-rgb.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-noise-rgb.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -109,7 +97,7 @@
       <varlistentry>
         <term>Correlated noise</term>
         <listitem>
-          <para><!-- changed 2007-08-06 -->
+          <para>
             Noise may be additive (uncorrelated) or multiplicative (correlated
             - also known as speckle noise). When checked, every channel value
             is multiplied by an normally distributed value. So the noise
diff --git a/src/filters/noise/pick.xml b/src/filters/noise/pick.xml
index efa0dc0..87ae126 100644
--- a/src/filters/noise/pick.xml
+++ b/src/filters/noise/pick.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-06 prokoudine: improved RU translation, added a localized screenshot
   2007-04-09 KoSt: added 'no'
@@ -8,18 +9,8 @@
   050826 de added by axel.wernicke
 -->
 <sect2 id="plug-in-randomize-pick">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Pick</phrase>
-  </title>
+  <title>Pick</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Noise</secondary>
@@ -28,10 +19,9 @@
   <indexterm>
     <primary>Pick</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
       <title>
         <phrase>
@@ -40,7 +30,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -48,7 +39,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/noise-taj-pick.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/noise-taj-pick.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Pick</quote> applied</para>
@@ -63,27 +55,27 @@
       <guilabel>Randomization (%)</guilabel> option.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Noise</guisubmenu><guimenuitem>Pick</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Noise</guisubmenu>
+        <guimenuitem>Pick</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Pick</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Pick</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-noise-pick.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-noise-pick.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/noise/spread.xml b/src/filters/noise/spread.xml
index 7aa4b57..9e4d3d4 100644
--- a/src/filters/noise/spread.xml
+++ b/src/filters/noise/spread.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-06 prokoudine: improved RU translation, added a localized screenshot
   2007-04-09 KoSt: added 'no'
@@ -8,18 +9,8 @@
   050826 de added by axel.wernicke
 -->
 <sect2 id="plug-in-spread">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-19</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Spread</phrase>
-  </title>
+  <title>Spread</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Noise</secondary>
@@ -28,17 +19,15 @@
   <indexterm>
     <primary>Spread</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Example of applying the Spread filter</phrase>
-      </title>
+      <title>Example of applying the Spread filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/noise-taj-spread.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/noise-taj-spread.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Spread</quote> applied</para>
@@ -59,27 +49,27 @@
       color transitions, not on plain color areas. No new color is introduced.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Noise</guisubmenu><guimenuitem>Spread</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Noise</guisubmenu>
+        <guimenuitem>Spread</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Spread</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Spread</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-noise-spread.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-noise-spread.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/render/checkerboard.xml b/src/filters/render/checkerboard.xml
index 5b8c8d8..5cf4a0b 100644
--- a/src/filters/render/checkerboard.xml
+++ b/src/filters/render/checkerboard.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-02 AntI: Added "es"
   2007-05-16 KoSt: added 'no'
@@ -8,18 +9,8 @@
   2005/10/14 en;fr by julien hardelin
 -->
 <sect2 id="plug-in-checkerboard">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-13</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Checkerboard</phrase>
-  </title>
+  <title>Checkerboard</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Render</secondary>
@@ -28,19 +19,15 @@
   <indexterm>
     <primary>Checkerboard</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the Checkerboard filter
-        </phrase>
-      </title>
+      <title>Example for the Checkerboard filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/render-checkerboard1.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/render-checkerboard1.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Checkerboard</quote> applied</para>
@@ -48,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/render-checkerboard2.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/render-checkerboard2.jpg"/>
         </imageobject>
         <caption>
           <para>Psychobilly <quote>Checkerboard</quote></para>
@@ -61,27 +49,28 @@
       colors of toolbox.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Starting filter</phrase>
-    </title>
+    <title>Starting filter</title>
     <para>
       You can find this filter in the image menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Render</guisubmenu><guisubmenu>Pattern</guisubmenu><guimenuitem>Checkerboard</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Render</guisubmenu>
+        <guisubmenu>Pattern</guisubmenu>
+        <guimenuitem>Checkerboard</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Checkerboard</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Checkerboard</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-render-checkerboard.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-render-checkerboard.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/render/gfig.xml b/src/filters/render/gfig.xml
index 17fc592..a891d9c 100644
--- a/src/filters/render/gfig.xml
+++ b/src/filters/render/gfig.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-15 AntI: Added "es"
   2007-05-18 KoSt: added 'no'
@@ -8,18 +9,8 @@
   2005/09/21 created by axel.wernicke
 -->
 <sect2 id="plug-in-gfig">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Gfig</phrase>
-  </title>
+  <title>Gfig</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Render</secondary>
@@ -28,17 +19,15 @@
   <indexterm>
     <primary>Gfig</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>The same image, before and after using Gfig</phrase>
-      </title>
+      <title>The same image, before and after using Gfig</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/render-taj-gfig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/render-taj-gfig.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Gfig</quote> applied</para>
@@ -63,27 +53,27 @@
       occurring in this layer.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Starting filter</phrase>
-    </title>
+    <title>Starting filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Render</guisubmenu><guimenuitem>Gfig</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Render</guisubmenu>
+        <guimenuitem>Gfig</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Gfig</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Gfig</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-render-gfig.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-render-gfig.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -109,25 +99,29 @@
                 </para>
                 <itemizedlist>
                   <listitem>
-                    <para><guilabel>Line</guilabel>: With this tool, you can
+                    <para>
+                      <guilabel>Line</guilabel>: With this tool, you can
                       draw lines. Click on Preview to mark start point, then
                       drag mouse pointer to the end point.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Circle</guilabel>: With this tool, you can
+                    <para>
+                      <guilabel>Circle</guilabel>: With this tool, you can
                       draw circles. Click on Preview to mark center, then
                       drag mouse pointer to the wanted radius.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Ellipse</guilabel>: With this tool, you can
+                    <para>
+                      <guilabel>Ellipse</guilabel>: With this tool, you can
                       draw ellipses. Click on Preview to mark center, then
                       drag mouse pointer to get the wanted size and form.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guibutton>Arc</guibutton>: With this tool, you can
+                    <para>
+                      <guibutton>Arc</guibutton>: With this tool, you can
                       draw circle arcs. Click on Preview to set start point.
                       Click again to set another arc point. Without
                       releasing mouse button, drag pointer; when you
@@ -136,7 +130,8 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guibutton>Regular polygon</guibutton>: With this
+                    <para>
+                      <guibutton>Regular polygon</guibutton>: With this
                       tool, you can create a regular polygon. Start with
                       setting side number in <guilabel>Tool Options
                       </guilabel> at the right of Preview. Then click on
@@ -146,7 +141,8 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Star</guilabel>: With this
+                    <para>
+                      <guilabel>Star</guilabel>: With this
                       tool, you can create a star. Start with
                       setting side number (spikes) in <guilabel>Tool Options
                       </guilabel> at the right of Preview. Then click on
@@ -156,7 +152,8 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Spiral</guilabel>: With this
+                    <para>
+                      <guilabel>Spiral</guilabel>: With this
                       tool, you can create a spiral. Start with
                       setting spire number (sides) and spire orientation in
                       <guilabel>Tool Options </guilabel> at the right of
@@ -166,7 +163,8 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Bezier's Curve</guilabel>: With this tool,
+                    <para>
+                      <guilabel>Bezier's Curve</guilabel>: With this tool,
                       you can create Bezier's curves. Click on Preview to
                       set start point and the other points: the curve will
                       be created between these points. To end point creation
@@ -186,32 +184,37 @@
                 </para>
                 <itemizedlist>
                   <listitem>
-                    <para><guilabel>Move (Object)</guilabel>: With this tool,
+                    <para>
+                      <guilabel>Move (Object)</guilabel>: With this tool,
                       you can move the active object. To enable an object,
                       click on a control point created at the same time as
                       the object.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Move (Point)</guilabel>: With this tool, you
+                    <para>
+                      <guilabel>Move (Point)</guilabel>: With this tool, you
                       can click-and-drag one of the control points created
                       at the same time as object. Each of these points moves
                       the object in a different way.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Copy</guilabel>: With this tool, you can
+                    <para>
+                      <guilabel>Copy</guilabel>: With this tool, you can
                       duplicate an object. Click on an object control point
                       and drag it to the wanted place.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Delete</guilabel>: Click on an object
+                    <para>
+                      <guilabel>Delete</guilabel>: Click on an object
                       control point to delete it.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Select</guilabel>: With this tool, you can
+                    <para>
+                      <guilabel>Select</guilabel>: With this tool, you can
                       select an object to active it. Simply click on one of
                       its control points.
                     </para>
@@ -229,13 +232,15 @@
                 </para>
                 <itemizedlist>
                   <listitem>
-                    <para><guilabel>Raise/Lower Selected Object</guilabel>:
+                    <para>
+                      <guilabel>Raise/Lower Selected Object</guilabel>:
                       With this tool, you can push the selected object one
                       level up or down.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Raise/Lower selected object to
+                    <para>
+                      <guilabel>Raise/Lower selected object to
                       top/bottom</guilabel>: self explanatory.
                     </para>
                   </listitem>
@@ -251,13 +256,15 @@
                 </para>
                 <itemizedlist>
                   <listitem>
-                    <para><guilabel>Back/Forward</guilabel>: These functions
+                    <para>
+                      <guilabel>Back/Forward</guilabel>: These functions
                       allow you to jump from one object to another. Only
                       this object is displayed.
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Show all objects</guilabel>: This function
+                    <para>
+                      <guilabel>Show all objects</guilabel>: This function
                       shows all objects again, after using both previous
                       functions.
                     </para>
diff --git a/src/filters/render/introduction.xml b/src/filters/render/introduction.xml
index 5230146..e6486a9 100644
--- a/src/filters/render/introduction.xml
+++ b/src/filters/render/introduction.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-02 AntI: Added "es"
   2007-05-18 KoSt: added 'no'
   050912 de added by axel.wernicke
 -->
 <sect2 id="filters-render-introduction">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-12-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Render</secondary>
@@ -27,11 +18,12 @@
     <primary>Patterns</primary>
     <secondary>Add a pattern to layer</secondary>
   </indexterm>
+
   <para>
-    Most GIMP filters work on a layer by transforming its content, but
-    the filters in the <quote>Render</quote> group are a bit different.
-    They create patterns from scratch, in most cases obliterating anything
-    that was previously in the layer.  Some create random or noisy
+    Most <acronym>GIMP</acronym> filters work on a layer by transforming its
+    content, but the filters in the <quote>Render</quote> group are a bit
+    different. They create patterns from scratch, in most cases obliterating
+    anything that was previously in the layer. Some create random or noisy
     patterns, others regular of fractal patterns, and one (Gfig) is a
     general-purpose (but rather limited) vector graphics tool.
   </para>
diff --git a/src/filters/web.xml b/src/filters/web.xml
index 3583e9b..bb45ebd 100644
--- a/src/filters/web.xml
+++ b/src/filters/web.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-23 ude: moved Semi-Flatten here from Colors filters
   2007-05-27 KoSt: added 'no'
@@ -7,27 +8,16 @@
   2006-12-27 created by j.h
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-web">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-04-05</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>Web Filters</phrase>
-  </title>
+  <title> Web Filters </title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Web</secondary>
     <tertiary>Introduction</tertiary>
   </indexterm>
+
   <sect2 id="filters-web-introduction">
-    <title>
-      <phrase>Introduction</phrase>
-    </title>
+    <title>Introduction</title>
     <para>
       This filters are mostly used on images mentioned for web sides. The
       filter <link linkend="plug-in-imagemap">ImageMap</link> is used to add
diff --git a/src/filters/web/imagemap.xml b/src/filters/web/imagemap.xml
index 022fde8..14de9e0 100644
--- a/src/filters/web/imagemap.xml
+++ b/src/filters/web/imagemap.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-10 ude: adapted 'no' guides text for 'en','de'
   2007-10-23 kost: added 'no'
@@ -11,18 +12,8 @@
   2006-12-27 created by j.h
 -->
 <sect2 id="plug-in-imagemap">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-03-18</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>ImageMap</phrase>
-  </title>
+  <title>ImageMap</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Web</secondary>
@@ -31,6 +22,7 @@
   <indexterm>
     <primary>ImageMap</primary>
   </indexterm>
+
   <para>
     In Web sensitive images are frequently used to get some effects when
     defined areas are enabled by the pointer. Obviously the most used effect
@@ -40,10 +32,9 @@
     standard function. In <acronym>GIMP</acronym> you can do this in a similar
     way.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <para>
       This plug-in lets you design graphically and friendly all areas you
       want to delimit over your displayed image. You get the relevant part
@@ -59,13 +50,16 @@
       link <xref linkend="bibliography-online-grokking-gimp-imagemap"/>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       From an image window, you can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Web</guisubmenu><guimenuitem>ImageMap</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Web</guisubmenu>
+        <guimenuitem>ImageMap</guimenuitem>
+      </menuchoice>
     </para>
     <para>
       The window is a small one, but you can magnify it.
@@ -101,27 +95,24 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Imagemap filter options</phrase>
-      </title>
+      <title>Imagemap filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/imagemap-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/imagemap-options.png"/>
         </imageobject>
         <caption>
           <para>Imagemap window</para>
         </caption>
       </mediaobject>
     </figure>
+
     <sect4>
-      <title>
-        <phrase>The Menu Bar</phrase>
-      </title>
+      <title>The Menu Bar</title>
       <para>
         The menu bar is similar to the image window menu bar, only a few menus
         or menu entries are different:
@@ -142,7 +133,10 @@
                   <tip>
                     <para>
                       With
-                      <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
+                      <menuchoice>
+                        <guimenu>View</guimenu>
+                        <guimenuitem>Source</guimenuitem>
+                      </menuchoice>
                       you can preview this text file content.
                     </para>
                   </tip>
@@ -172,12 +166,11 @@
                 <term>Edit area info</term>
                 <listitem>
                   <figure>
-                    <title>
-                      <phrase>Editing an imagemap area</phrase>
-                    </title>
+                    <title>Editing an imagemap area</title>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/filters/options-imagemap-area.png" format="PNG"/>
+                        <imagedata format="PNG"
+                          fileref="images/filters/options-imagemap-area.png"/>
                       </imageobject>
                     </mediaobject>
                   </figure>
@@ -185,9 +178,10 @@
                     In the settings dialog you can edit the area information
                     of a selected area. This dialog will pop up automatically
                     whenever you create a new area.
-                    <!--CHECK en, de, fr: If you are opening the HTML file from the pull 
-                    down menu only the file name is added. You have to add the path manually.
-                    In the tag JavaScript you may add functions for onMouseover, onMouseout etc.-->
+                    <!--CHECK: If you are opening the HTML file from the pull
+                      down menu only the file name is added. You have to add
+                      the path manually.  In the tag JavaScript you may add
+                      functions for onMouseover, onMouseout etc.-->
                   </para>
                 </listitem>
               </varlistentry>
@@ -269,12 +263,11 @@
                 <term>Edit Map Info</term>
                 <listitem>
                   <figure>
-                    <title>
-                      <phrase>Editing the imagemap data</phrase>
-                    </title>
+                    <title>Editing the imagemap data</title>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/filters/options-imagemap-info.png" format="PNG"/>
+                        <imagedata format="PNG"
+                          fileref="images/filters/options-imagemap-info.png"/>
                       </imageobject>
                     </mediaobject>
                   </figure>
@@ -304,12 +297,11 @@
                 <term>Grid; Grid settings</term>
                 <listitem>
                   <figure>
-                    <title>
-                      <phrase>Grid options</phrase>
-                    </title>
+                    <title>Grid options</title>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/filters/options-imagemap-grid.png" format="PNG"/>
+                        <imagedata format="PNG"
+                          fileref="images/filters/options-imagemap-grid.png"/>
                       </imageobject>
                     </mediaobject>
                   </figure>
@@ -335,12 +327,11 @@
                 <term>Create guides</term>
                 <listitem>
                   <figure>
-                    <title>
-                      <phrase>Guide options</phrase>
-                    </title>
+                    <title>Guide options</title>
                     <mediaobject>
                       <imageobject>
-                        <imagedata fileref="images/filters/options-imagemap-guides-options.png" format="PNG"/>
+                        <imagedata format="PNG"
+                          fileref="images/filters/options-imagemap-guides-options.png"/>
                       </imageobject>
                       <caption>
                         <para>The guide options</para>
@@ -366,10 +357,9 @@
         </varlistentry>
       </variablelist>
     </sect4>
+
     <sect4>
-      <title>
-        <phrase>The Tool Bar</phrase>
-      </title>
+      <title>The Tool Bar</title>
       <para>
         Most entries here are just shortcuts for some functions already
         described. Exceptions:
@@ -387,17 +377,15 @@
         </varlistentry>
       </variablelist>
     </sect4>
+
     <sect4>
-      <title>
-        <phrase>The Working Area</phrase>
-      </title>
+      <title>The Working Area</title>
       <figure>
-        <title>
-          <phrase>The Working Area</phrase>
-        </title>
+        <title>The Working Area</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/filters/options-imagemap-draw.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/filters/options-imagemap-draw.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -418,10 +406,9 @@
         </para>
       </caution>
     </sect4>
+
     <sect4>
-      <title>
-        <phrase>The selection area</phrase>
-      </title>
+      <title>The selection area</title>
       <para>
         On the right is a display area, as a property list of the created
         areas. A click on one item of the list selects automatically the
diff --git a/src/filters/web/slice.xml b/src/filters/web/slice.xml
index a2ae557..133ea0e 100644
--- a/src/filters/web/slice.xml
+++ b/src/filters/web/slice.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--CHECK all: I had this filter in earlier versions, but not in v2.4 and 2.6 for Windows. Is it removed? (KoSt) -->
 <!-- section history:
   2008-07-31 alex falappa: added 'it'
   2008-04-05 ude: created 'en','de'
 -->
 <sect2 id="python-fu-slice">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-04-05</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Slice</phrase>
-  </title>
+  <title>Slice</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Web</secondary>
@@ -26,19 +17,15 @@
   <indexterm>
     <primary>Slice</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Slice</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Slice</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_guides.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_guides.jpg"/>
         </imageobject>
         <caption>
           <para>Original image with guides</para>
@@ -46,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/web-taj-slice.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/web-taj-slice.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Slice</quote> applied</para>
@@ -67,11 +55,7 @@
       code produced by the filter may be not much more than this:
     </para>
     <example>
-      <title>
-        <phrase>
-          Simple <quote>Slice</quote> filter example output
-        </phrase>
-      </title>
+      <title>Simple <quote>Slice</quote> filter example output</title>
       <programlisting><!--
         <![CDATA[
 <table cellpadding="0" border="0" cellspacing="0">
@@ -124,26 +108,27 @@
       </para>
     </tip>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Web</guisubmenu><guimenuitem>Slice</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Web</guisubmenu>
+        <guimenuitem>Slice</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Slice</quote> options</phrase>
-      </title>
+      <title><quote>Slice</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-web-slice.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-web-slice.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -152,9 +137,7 @@
         Most options are self-explanatory, but nevertheless:
       </para>
       <varlistentry>
-        <term>
-          <phrase>Path for HTML export</phrase>
-        </term>
+        <term>Path for HTML export</term>
         <listitem>
           <para>
             Where the HTML file and the image files will be saved. By default
@@ -165,9 +148,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Filename for export</phrase>
-        </term>
+        <term>Filename for export</term>
         <listitem>
           <para>
             The name of the HTML file. You can change the filename using the
@@ -176,9 +157,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Image name prefix</phrase>
-        </term>
+        <term>Image name prefix</term>
         <listitem>
           <para>
             The name of an image file produced by this filter is
@@ -200,9 +179,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Image format</phrase>
-        </term>
+        <term>Image format</term>
         <listitem>
           <para>
             You can choose to create image files in the
@@ -214,11 +191,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>
-            Separate image folder; Folder for image export
-          </phrase>
-        </term>
+        <term>Separate image folder; Folder for image export</term>
         <listitem>
           <para>
             When <guilabel>Separate image folder</guilabel> is enabled, a
@@ -228,12 +201,11 @@
             it in the <guilabel>Folder for image export</guilabel> textbox.
           </para>
           <example>
-            <title>
-              <phrase>With separate image folder</phrase>
-            </title>
+            <title>With separate image folder</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/slice-folder.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/slice-folder.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -245,9 +217,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Space between table elements</phrase>
-        </term>
+        <term>Space between table elements</term>
         <listitem>
           <para>
             This value (0-15) will be passed as <quote>cellspacing</quote>
@@ -256,12 +226,11 @@
             width:
           </para>
           <example>
-            <title>
-              <phrase>Space between table elements</phrase>
-            </title>
+            <title>Space between table elements</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/slice-cellspacing.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/slice-cellspacing.png"/>
               </imageobject>
               <caption>
                 <para>Corresponding HTML code snippet</para>
@@ -276,9 +245,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Javascript for onmouseover and clicked</phrase>
-        </term>
+        <term>Javascript for onmouseover and clicked</term>
         <listitem>
           <para>
             When this option is enabled, the filter will also add some
@@ -288,9 +255,7 @@
             events like <quote>onmouseover</quote>:
           </para>
           <example>
-            <title>
-              <phrase>JavaScript code snippet</phrase>
-            </title>
+            <title>JavaScript code snippet</title>
             <programlisting><![CDATA[
 function exchange (image, images_array_name, event)
   {
@@ -318,9 +283,7 @@ function exchange (image, images_array_name, event)
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Skip animation for table caps</phrase>
-        </term>
+        <term>Skip animation for table caps</term>
         <listitem>
           <para>
             When disabled, the filter will add a
@@ -333,9 +296,7 @@ function exchange (image, images_array_name, event)
           </para>
           <example>
             <title>
-              <phrase>
-                Skipped animation for table caps (simplified HTML code)
-              </phrase>
+              Skipped animation for table caps (simplified HTML code)
             </title>
             <programlisting><![CDATA[
 <table cellpadding="0" border="0" cellspacing="0">
diff --git a/src/toolbox/intro.xml b/src/toolbox/intro.xml
index 9253647..bb68f2d 100644
--- a/src/toolbox/intro.xml
+++ b/src/toolbox/intro.xml
@@ -90,7 +90,8 @@
       <title>Tool Options dialog for the Rectangle Select tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-rectsel.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-rectsel.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-ellipse-select.xml b/src/toolbox/tool-ellipse-select.xml
index eb41053..677356e 100644
--- a/src/toolbox/tool-ellipse-select.xml
+++ b/src/toolbox/tool-ellipse-select.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-03-19 JPL  rewieved en & fr
   2007-02-12 PP rewieved en & fr and re-arranged according to
@@ -12,18 +13,8 @@
   2005-12-01 informalfigure replaced by figure by lexa
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-ellipse-select">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision: 2745 $</revnumber>
-        <date>2007-12-22</date>
-        <authorinitials>P.P</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Ellipse Selection</phrase>
-  </title>
+  <title>Ellipse Selection</title>
+
   <indexterm>
     <primary>Tools</primary>
     <secondary>Ellipse Selection</secondary>
@@ -35,13 +26,13 @@
   <indexterm>
     <primary>Ellipse Selection Tool</primary>
   </indexterm>
+
   <figure>
-    <title>
-      <phrase>Ellipse Select icon in the Toolbox</phrase>
-    </title>
+    <title>Ellipse Select icon in the Toolbox</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/toolbox-ellipsel.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/toolbox/toolbox-ellipsel.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -70,10 +61,9 @@
     </menuchoice>
     makes it easy.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the tool</phrase>
-    </title>
+    <title>Activating the tool</title>
     <para>
       You can access to the Ellipse Selection Tool in different ways:
     </para>
@@ -91,7 +81,13 @@
       <listitem>
         <para>
           By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-ellipse-select-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata fileref="images/toolbox/stock-tool-ellipse-select-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in the ToolBox,
         </para>
       </listitem>
@@ -102,16 +98,15 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Key modifiers</phrase>
-    </title>
+    <title>Key modifiers</title>
+
     <xi:include href="about-common-select-modifiers.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>
-          <keycap>Ctrl</keycap>
-        </term>
+        <term><keycap>Ctrl</keycap></term>
         <listitem>
           <para>
             Pressing the key after starting your selection, and holding it
@@ -125,9 +120,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <keycap>Shift</keycap>
-        </term>
+        <term><keycap>Shift</keycap></term>
         <listitem>
           <para>
             Pressing the Shift key after starting your selection, and holding
@@ -155,17 +148,15 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3 id="tool-ellipse-select-manip">
-    <title>
-      <phrase>Tool handling</phrase>
-    </title>
+    <title>Tool handling</title>
     <figure>
-      <title>
-        <phrase>Example of Ellipse Selection.</phrase>
-      </title>
+      <title>Example of Ellipse Selection. </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/ellipse-selection.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/ellipse-selection.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -185,17 +176,15 @@
       the rectangular chapter.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Tool Options for the Ellipse Select tool</phrase>
-      </title>
+      <title>Tool Options for the Ellipse Select tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-ellipsel.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-ellipsel.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -205,17 +194,13 @@
     <variablelist>
       <xi:include href="about-common-select-options.xml"/>
       <varlistentry>
-        <term>
-          Modes; Antialiasing; Feather edges
-        </term>
+        <term>Modes; Antialiasing; Feather edges</term>
         <listitem>
           <para>Common select options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          All other options
-        </term>
+        <term>All other options</term>
         <listitem>
           <para>
             All these options work exactly the same way, they were described
diff --git a/src/tutorial/quickies.xml b/src/tutorial/quickies.xml
index 0519b08..a4621ce 100644
--- a/src/tutorial/quickies.xml
+++ b/src/tutorial/quickies.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
   2008-03-23 Added Korean translation by Mr.Dust
   2007-06-22 Added Spanish translation by AntI
@@ -8,30 +9,20 @@
   2007-05-11 lexa: initial version
 -->
 <sect1 id="gimp-tutorial-quickies">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-06-16</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>GIMPLite Quickies</phrase>
-  </title>
+  <title>GIMPLite Quickies</title>
+
   <indexterm>
     <primary>Tutorial</primary>
   </indexterm>
+
   <para>
     This tutorial is based on text and images Copyright © 2004 Carol Spears.
     The original tutorial can be found in the Internet
     <xref linkend="bibliography-online-tutorial02"/>.
   </para>
+
   <sect2>
-    <title>
-      <phrase>Intention</phrase>
-    </title>
+    <title>Intention</title>
     <para>
       So, <acronym>GIMP</acronym> is installed on your computer, you need to
       make a quick 
@@ -59,10 +50,9 @@
        <guimenuitem>Open</guimenuitem></menuchoice> from the Image window).
     </para>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-scale">
-    <title>
-      <phrase>Change the Size of an Image (Scale)</phrase>
-    </title>
+    <title>Change the Size of an Image (Scale)</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -77,12 +67,11 @@
       <xref linkend="bibliography-online-apod03"/>.
     </para>
     <figure>
-      <title>
-        <phrase>Example Image for Scaling</phrase>
-      </title>
+      <title>Example Image for Scaling</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-scale-example.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-scale-example.jpg"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -101,31 +90,31 @@
       read the <xref linkend="gimp-tutorial-quickie-change-mode"/>.
     </para>
     <figure>
-      <title>
-        <phrase>GIMP Used for Image Scaling</phrase>
-      </title>
+      <title>GIMP Used for Image Scaling</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-scale-menu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-scale-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <para>
       Use
-      <menuchoice><guimenu>Image</guimenu>
-      <guimenuitem>Scale Image</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Image</guimenu>
+        <guimenuitem>Scale Image</guimenuitem>
+      </menuchoice>
       to open the Scale Image dialog. You can right click on the image to open
       the menu, or use the menu along the top of the Image window.
       Notice that the Scale Image menu item contains three dots,
       which is a hint that a dialog will be opened.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog for Image Scaling in Pixels</phrase>
-      </title>
+      <title>Dialog for Image Scaling in Pixels</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-scale-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-scale-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -137,12 +126,11 @@
       This is shown in the figure above.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog for Image Scaling in Inches</phrase>
-      </title>
+      <title>Dialog for Image Scaling in Inches</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-scale-dialog2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-scale-dialog2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -161,10 +149,9 @@
       the other dimension, see <xref linkend="gimp-tutorial-quickie-crop"/>.
     </para>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-jpeg">
-    <title>
-      <phrase>Make JPEGs Smaller</phrase>
-    </title>
+    <title>Make JPEGs Smaller</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -173,12 +160,11 @@
       <secondary>save</secondary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>Example Image for JPEG Saving</phrase>
-      </title>
+      <title>Example Image for JPEG Saving</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-example.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-jpeg-example.jpg"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -190,19 +176,18 @@
       the width and height for better use on the web (see
       <xref linkend="gimp-tutorial-quickie-scale"/>).
       Use 
-      <menuchoice><guimenu>File</guimenu>
-      <guimenuitem>Save As</guimenuitem></menuchoice> to open the
-      Save Image dialog.
+      <menuchoice>
+        <guimenu>File</guimenu>
+        <guimenuitem>Save As</guimenuitem>
+      </menuchoice>
+      to open the Save Image dialog.
     </para>
     <figure>
-      <title>
-        <phrase>Save Image Dialog</phrase>
-      </title>
+      <title>Save Image Dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-fileref="images/tutorials/quickie-save-image-dialog-file-type.png"
-format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-save-image-dialog-file-type.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -224,12 +209,11 @@ format="PNG"/>
       thing to do.
     </para>
     <figure>
-      <title>
-        <phrase>Save as JEPG dialog with poor quality.</phrase>
-      </title>
+      <title>Save as JEPG dialog with poor quality. </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -245,12 +229,11 @@ format="PNG"/>
       it is acceptable for the intended purpose.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog for Image Saving as JPEG</phrase>
-      </title>
+      <title>Dialog for Image Saving as JPEG</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-dialog2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-dialog2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -259,12 +242,11 @@ format="PNG"/>
       this quickie with a race.
     </para>
     <figure>
-      <title>
-        <phrase>Example for High JPEG Compression</phrase>
-      </title>
+      <title>Example for High JPEG Compression</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-006.jpg" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-006.jpg"/>
         </imageobject>
         <caption>
           <para>Quality: 6; Size: 1361 Bytes</para>
@@ -272,7 +254,8 @@ format="PNG"/>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-042.jpg" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-042.jpg"/>
         </imageobject>
         <caption>
           <para>Quality: 42; Size: 3549 Bytes</para>
@@ -280,12 +263,11 @@ format="PNG"/>
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Example for Moderate JPEG Compression</phrase>
-      </title>
+      <title>Example for Moderate JPEG Compression</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-085.jpg" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-085.jpg"/>
         </imageobject>
         <caption>
           <para>
@@ -295,7 +277,8 @@ format="PNG"/>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-jpeg-100.jpg" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-jpeg-100.jpg"/>
         </imageobject>
         <caption>
           <para>Quality: 100; Size: 20,971 Bytes</para>
@@ -303,10 +286,9 @@ format="PNG"/>
       </mediaobject>
     </figure>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-crop">
-    <title>
-      <phrase>Crop An Image</phrase>
-    </title>
+    <title>Crop An Image</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -315,12 +297,11 @@ format="PNG"/>
       <secondary>crop</secondary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>Example Image for Cropping</phrase>
-      </title>
+      <title>Example Image for Cropping</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-crop-example-source.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-crop-example-source.jpg"/>
         </imageobject>
         <caption>
           <para>Source image</para>
@@ -328,7 +309,8 @@ format="PNG"/>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-crop-example-result.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-crop-example-result.jpg"/>
         </imageobject>
         <caption>
           <para>Image after cropping</para>
@@ -340,26 +322,31 @@ format="PNG"/>
       to fill a frame, removing a portion of the background to emphasize the
       subject, etc. There are two methods to activate the crop tool. 
       Click the
-      <guiicon><inlinemediaobject><imageobject>
-        <imagedata fileref="images/toolbox/stock-tool-crop-22.png"/>
-      </imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/toolbox/stock-tool-crop-22.png"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
       button in the Toolbox, or use
-      <menuchoice><guimenu>Tools</guimenu>
-      <guisubmenu>Transform Tools</guisubmenu>
-      <guimenuitem>Crop</guimenuitem>
-      </menuchoice> in the image window. This will change
-      the cursor and allow you to click and drag a rectangular shape. The
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Transform Tools</guisubmenu>
+        <guimenuitem>Crop</guimenuitem>
+      </menuchoice>
+      in the image window. This will change the cursor and allow you to click
+      and drag a rectangular shape. The
       button in the toolbox is the nicest way to get to any of the tools. I
       have chosen one of the huge and beautiful APOD images
       <xref linkend="bibliography-online-apod05"/>.
     </para>
     <figure>
-      <title>
-        <phrase>Select a Region to Crop</phrase>
-      </title>
+      <title>Select a Region to Crop</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-crop-step1.png" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-crop-step1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -370,12 +357,11 @@ format="PNG"/>
       first swipe with the crop tool.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog for Cropping</phrase>
-      </title>
+      <title>Dialog for Cropping</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-crop-step2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-crop-step2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -401,10 +387,9 @@ format="PNG"/>
       to crop the image.
     </para>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-info">
-    <title>
-      <phrase>Find Info About Your Image</phrase>
-    </title>
+    <title>Find Info About Your Image</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -413,12 +398,11 @@ format="PNG"/>
       <secondary>information</secondary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>Finding Info</phrase>
-      </title>
+      <title>Finding Info</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-info-menu.png" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-info-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -434,12 +418,11 @@ format="PNG"/>
       information.
     </para>
     <figure>
-      <title>
-        <phrase>Image Properties Dialog</phrase>
-      </title>
+      <title>Image Properties Dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-info-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-info-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -454,12 +437,11 @@ format="PNG"/>
       exercises that might help you to meet your image needs.
     </para>
     <figure>
-      <title>
-        <phrase>Scale Problem</phrase>
-      </title>
+      <title>Scale Problem</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-info-problem.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-info-problem.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -473,12 +455,11 @@ format="PNG"/>
       <quote>appear</quote> as a 6x4 inch photo on many monitors.
     </para>
     <figure>
-      <title>
-        <phrase>Problem Solved by Cropping</phrase>
-      </title>
+      <title>Problem Solved by Cropping</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-info-crop.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-info-crop.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -512,20 +493,18 @@ format="PNG"/>
       Terrible business!
     </para>
     <figure>
-      <title>
-        <phrase>Actual printing result of example image</phrase>
-      </title>
+      <title>Actual printing result of example image</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-info-print-emul.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/tutorials/quickie-info-print-emul.jpg"/>
         </imageobject>
       </mediaobject>
     </figure>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-change-mode">
-    <title>
-      <phrase>Change the Mode</phrase>
-    </title>
+    <title>Change the Mode</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -544,16 +523,16 @@ format="PNG"/>
       open it and follow that menu and click the mode you want.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog for changing the mode</phrase>
-      </title>
+      <title>Dialog for changing the mode</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-mode-menu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-mode-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
-    <para><emphasis>RGB</emphasis>
+    <para>
+      <emphasis>RGB</emphasis>
       - This is the default mode, used for high quality rich color images.
       This is also the mode for most of your image work including
       scaling, cropping, and even flipping, as it gives the computer more
@@ -577,7 +556,8 @@ format="PNG"/>
       version and a huge version.
     </para>
 -->
-    <para><emphasis>Indexed</emphasis>
+    <para>
+      <emphasis>Indexed</emphasis>
       - This is the mode usually used when file size is of concern, or when
       you are working with images with few colors. It involves using a fixed
       number of colors, 256 or less, at each point to represent the color at
@@ -586,14 +566,11 @@ format="PNG"/>
       don't like the results, or use a custom palette or more colors.
     </para>
     <figure>
-      <title>
-        <phrase>
-          Dialog <quote>Change to Indexed Colors</quote>
-        </phrase>
-      </title>
+      <title>Dialog <quote>Change to Indexed Colors</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-mode-indexed.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-mode-indexed.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -609,22 +586,22 @@ format="PNG"/>
       layer to have the ability to be transparent. This can be done just as
       easily via
       <menuchoice>
-      <guimenu>Layer</guimenu>
-      <guimenuitem>Transparency</guimenuitem>
-      <guimenuitem>Add Alpha Channel</guimenuitem>
+        <guimenu>Layer</guimenu>
+        <guimenuitem>Transparency</guimenuitem>
+        <guimenuitem>Add Alpha Channel</guimenuitem>
       </menuchoice>.
     </para>
     <figure>
-      <title>
-        <phrase>Add Alpha Channel</phrase>
-      </title>
+      <title>Add Alpha Channel</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-mode-alpha.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-mode-alpha.png"/>
         </imageobject>
       </mediaobject>
     </figure>
-    <para><emphasis>Grayscale</emphasis>
+    <para>
+      <emphasis>Grayscale</emphasis>
       - In case you want to convert your brilliant color image to something
       that's black and white (with a lot of shades of grey), this is one of
       the easiest ways in which to do it. Some photos do look a lot fancier
@@ -638,10 +615,9 @@ format="PNG"/>
       properly export the image.
     </para>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-flip">
-    <title>
-      <phrase>Flip An Image</phrase>
-    </title>
+    <title>Flip An Image</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -653,18 +629,27 @@ format="PNG"/>
       When you need the person in the photo looking in the other direction, or
       you need the top of the image to be the bottom. Mirroring the image (sort
       of). Use
-      <menuchoice><guimenu>Tools</guimenu>
-      <guisubmenu>Transform Tools</guisubmenu>
-      <guimenuitem>Flip</guimenuitem></menuchoice>, or use the
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-flip-22.png"/></imageobject></inlinemediaobject></guiicon> button on the toolbox.
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Transform Tools</guisubmenu>
+        <guimenuitem>Flip</guimenuitem>
+      </menuchoice>,
+      or use the
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/toolbox/stock-tool-flip-22.png"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
+      button on the toolbox.
     </para>
     <figure>
-      <title>
-        <phrase>Dialog <quote>Flip an Image</quote></phrase>
-      </title>
+      <title>Dialog <quote>Flip an Image</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-flip-menu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-flip-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -683,13 +668,12 @@ format="PNG"/>
       All possible flips are displayed in this page.
     </para>
     <figure id="quickie-flip-images">
-      <title>
-        <phrase>Example Image to Flip</phrase>
-      </title>
+      <title>Example Image to Flip</title>
       <informalfigure>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/tutorials/quickie-flip-example-source.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/tutorials/quickie-flip-example-source.png"/>
           </imageobject>
           <caption>
             <para>Source image</para>
@@ -697,7 +681,8 @@ format="PNG"/>
         </mediaobject>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/tutorials/quickie-flip-example-horizontal.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/tutorials/quickie-flip-example-horizontal.png"/>
           </imageobject>
           <caption>
             <para>Horizontal flipped image</para>
@@ -707,7 +692,8 @@ format="PNG"/>
       <informalfigure>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/tutorials/quickie-flip-example-vertical.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/tutorials/quickie-flip-example-vertical.png"/>
           </imageobject>
           <caption>
             <para>Vertical flipped image</para>
@@ -715,7 +701,8 @@ format="PNG"/>
         </mediaobject>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/tutorials/quickie-flip-example-horizontal-and-vertical.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/tutorials/quickie-flip-example-horizontal-and-vertical.png"/>
           </imageobject>
           <caption>
             <para>Horizontal and vertical flipped image</para>
@@ -724,10 +711,9 @@ format="PNG"/>
       </informalfigure>
     </figure>
   </sect2>
+
   <sect2 id="gimp-tutorial-quickie-rotate">
-    <title>
-      <phrase>Rotate An Image</phrase>
-    </title>
+    <title>Rotate An Image</title>
     <indexterm>
       <primary>Tutorial</primary>
     </indexterm>
@@ -736,30 +722,30 @@ format="PNG"/>
       <secondary>Rotate</secondary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>Menu for <quote>Rotate An Image</quote></phrase>
-      </title>
+      <title>Menu for <quote>Rotate An Image</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-rotate-menu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-rotate-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <para>
       Let's say you turned your brand new digital camera to get a vertical shot,
       now some of your images are on their sides. Use
-      <menuchoice><guimenu>Image</guimenu>
-      <guisubmenu>Transform</guisubmenu>
-      <guimenuitem>Rotate 90° clockwise</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Image</guimenu>
+        <guisubmenu>Transform</guisubmenu>
+        <guimenuitem>Rotate 90° clockwise</guimenuitem>
+      </menuchoice>.
       Using an APOD image. I rotated it once to demonstrate 90 degrees CCW.
     </para>
     <figure>
-      <title>
-        <phrase>Example for <quote>Rotate An Image</quote></phrase>
-      </title>
+      <title>Example for <quote>Rotate An Image</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-rotate-example-source.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-rotate-example-source.png"/>
         </imageobject>
         <caption>
           <para>Source Image</para>
@@ -767,7 +753,8 @@ format="PNG"/>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/quickie-rotate-example-90-CCW.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/quickie-rotate-example-90-CCW.png"/>
         </imageobject>
         <caption>
           <para>Rotated image 90 degree CCW</para>
diff --git a/src/tutorial/straight-lines.xml b/src/tutorial/straight-lines.xml
index a4be09f..6f5af89 100644
--- a/src/tutorial/straight-lines.xml
+++ b/src/tutorial/straight-lines.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
   2008-04-01 Added 'no' by Mr.Dust
   2007-06-25 Added Spanish translation by AntI
@@ -8,40 +9,29 @@
   2007-05-11 lexa: initial version
 -->
 <sect1 id="gimp-tutorial-straight-lines">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>How to Draw Straight Lines</phrase>
-  </title>
+  <title>How to Draw Straight Lines</title>
+
   <indexterm>
     <primary>Tutorial</primary>
   </indexterm>
   <indexterm>
     <primary>Draw</primary>
   </indexterm>
+
   <para>
     This tutorial is based on Text and images Copyright © 2002 Seth Burgess.
     The original tutorial can be found in the Internet
     <xref linkend="bibliography-online-tutorial01"/>.
   </para>
+
   <sect2>
-    <title>
-      <phrase>Intention</phrase>
-    </title>
+    <title>Intention</title>
     <figure>
-      <title>
-        <phrase>Example of straight lines</phrase>
-      </title>
+      <title>Example of straight lines</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-intro.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-intro.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -56,23 +46,19 @@
     </para>
     <procedure>
       <step>
-        <title>
-          <phrase>Preparations</phrase>
-        </title>
+        <title>Preparations</title>
         <figure>
-          <title>
-            <phrase>
-              Introducing the <keycap>Shift</keycap>-key
-            </phrase>
-          </title>
+          <title>Introducing the <keycap>Shift</keycap>-key</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-1.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-1.png"/>
             </imageobject>
           </mediaobject>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-1b.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-1b.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -87,37 +73,33 @@
         </para>
       </step>
       <step>
-        <title>
-          <phrase>Creating a Blank Drawable</phrase>
-        </title>
+        <title>Creating a Blank Drawable</title>
         <figure>
-          <title>
-            <phrase>New image</phrase>
-          </title>
+          <title>New image</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-2.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-2.png"/>
             </imageobject>
           </mediaobject>
         </figure>
         <para>
           First, create a new image. Any size will do. Use
-          <menuchoice><guimenu>File</guimenu>
-          <guimenuitem>New</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>New</guimenuitem>
+          </menuchoice>
           to create a new image.
         </para>
       </step>
       <step>
-        <title>
-          <phrase>Choose a Tool</phrase>
-        </title>
+        <title>Choose a Tool</title>
         <figure>
-          <title>
-            <phrase>Paint tools in the toolbox</phrase>
-          </title>
+          <title>Paint tools in the toolbox</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-3.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-3.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -126,16 +108,13 @@
         </para>
       </step>
       <step>
-        <title>
-          <phrase>Create a Starting Point</phrase>
-        </title>
+        <title>Create a Starting Point</title>
         <figure>
-          <title>
-            <phrase>Starting point</phrase>
-          </title>
+          <title>Starting point</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-4.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-4.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -150,16 +129,13 @@
         </para>
       </step>
       <step>
-        <title>
-          <phrase>Drawing the Line</phrase>
-        </title>
+        <title>Drawing the Line</title>
         <figure>
-          <title>
-            <phrase>Drawing the line</phrase>
-          </title>
+          <title>Drawing the line</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-5.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-5.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -174,103 +150,102 @@
         </para>
       </step>
       <step>
-        <title>
-          <phrase>Final</phrase>
-        </title>
+        <title>Final</title>
         <figure>
-          <title>
-            <phrase>Final Image</phrase>
-          </title>
+          <title>Final Image</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/tutorials/straight-lines-6.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/tutorials/straight-lines-6.png"/>
             </imageobject>
           </mediaobject>
         </figure>
         <para>
-      This is a powerful feature. You can draw straight lines with any of the
-      draw tools. You can even draw more lines at the end of this one.
-      Our last step is to let go of the <keycap>Shift</keycap>
-      key. And there you have it. Some more examples are shown below.
-      Happy <acronym>GIMP</acronym>ing!
-    </para>
+          This is a powerful feature. You can draw straight lines with any of
+          the draw tools. You can even draw more lines at the end of this one.
+          Our last step is to let go of the <keycap>Shift</keycap> key. And
+          there you have it. Some more examples are shown below.  Happy
+          <acronym>GIMP</acronym>ing!
+        </para>
       </step>
     </procedure>
   </sect2>
+
   <sect2>
-    <title>
-      <phrase>Examples</phrase>
-    </title>
+    <title>Examples</title>
     <figure>
-      <title>
-        <phrase>Examples I</phrase>
-      </title>
+      <title>Examples I</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-example1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-example1.png"/>
         </imageobject>
         <caption>
           <para>
-              Check Use color from gradient.
-            </para>
+            Check Use color from gradient.
+          </para>
         </caption>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-example3.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-example3.png"/>
         </imageobject>
         <caption>
           <para>
             Select the Clone tool and set the source to
             <quote>Maple Leaves</quote> pattern.
-            </para>
+          </para>
         </caption>
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Examples II</phrase>
-      </title>
+      <title>Examples II</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-example2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-example2.png"/>
         </imageobject>
         <caption>
           <para>
-            Use <menuchoice><guimenu>Filters</guimenu>
-            <guimenuitem>Render</guimenuitem>
-            <guimenuitem>Pattern</guimenuitem>
-            <guimenuitem>Grid</guimenuitem>
+            Use
+            <menuchoice>
+              <guimenu>Filters</guimenu>
+              <guimenuitem>Render</guimenuitem>
+              <guimenuitem>Pattern</guimenuitem>
+              <guimenuitem>Grid</guimenuitem>
             </menuchoice>
-            to create a grid.
-            Use the Smudge Tool to draw a line with a slightly larger brush.
-            </para>
+            to create a grid.  Use the Smudge Tool to draw a line with a
+            slightly larger brush.
+          </para>
         </caption>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-example4.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-example4.png"/>
         </imageobject>
         <caption>
           <para>
-            Use <menuchoice><guimenu>Filters</guimenu>
-            <guimenuitem>Render</guimenuitem>
-            <guimenuitem>Couds</guimenuitem>
-            <guimenuitem>Plasma</guimenuitem>
+            Use
+            <menuchoice>
+              <guimenu>Filters</guimenu>
+              <guimenuitem>Render</guimenuitem>
+              <guimenuitem>Couds</guimenuitem>
+              <guimenuitem>Plasma</guimenuitem>
             </menuchoice>
             to create the cool plasma cloud. Use the Erase Tool with
             a square brush to draw a line.
-            </para>
+          </para>
         </caption>
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Example III</phrase>
-      </title>
+      <title>Example III</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tutorials/straight-lines-example5.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/tutorials/straight-lines-example5.png"/>
         </imageobject>
         <caption>
           <para>
@@ -280,7 +255,7 @@
             Set the type to Dodge and paint along the top and left side using
             an appropriately sized brush. Set the type to Burn and paint along
             the right and bottom.
-            </para>
+          </para>
         </caption>
       </mediaobject>
     </figure>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]