[gimp-help-2: 7/7] Minor changes to some menu files



commit 2e87965f42cd272ac269f2bb4b9d866fb556c80d
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Sat Aug 15 20:42:04 2009 +0200

    Minor changes to some menu files
    
    Remove sectinfos, fix indentation, add newlines, etc.

 src/menus/file/close.xml                |   24 ++----
 src/menus/file/open-recent.xml          |   22 +----
 src/menus/file/quit.xml                 |   28 ++----
 src/menus/file/revert.xml               |   22 +----
 src/menus/file/save-as-copy.xml         |   27 ++----
 src/menus/file/save-as-template.xml     |   27 ++----
 src/menus/file/save.xml                 |   27 ++----
 src/menus/filter-repeat.xml             |   31 +++----
 src/menus/filter-reset-all.xml          |   28 ++----
 src/menus/image/align-layers.xml        |  128 ++++++++++++--------------
 src/menus/image/autocrop.xml            |   35 +++-----
 src/menus/image/configure-grid.xml      |   49 +++-------
 src/menus/image/duplicate.xml           |   21 +---
 src/menus/image/flatten.xml             |   23 ++---
 src/menus/image/merge-layers.xml        |   68 ++++++--------
 src/menus/image/mode.xml                |   34 ++-----
 src/menus/image/properties.xml          |   68 +++++---------
 src/menus/image/transform-flip.xml      |   25 ++----
 src/menus/image/transform-rotate.xml    |   25 ++----
 src/menus/layer/alpha-add.xml           |   42 ++++-----
 src/menus/layer/alpha-remove.xml        |   24 ++----
 src/menus/layer/autocrop.xml            |   32 ++-----
 src/menus/layer/mask-disable.xml        |   23 ++---
 src/menus/layer/mask-edit.xml           |   23 ++---
 src/menus/layer/mask-show.xml           |   30 +++----
 src/menus/layer/mask.xml                |   33 ++-----
 src/menus/layer/resize.xml              |   34 ++-----
 src/menus/layer/stack.xml               |   31 ++-----
 src/menus/layer/transform.xml           |   36 ++-----
 src/menus/layer/transparency.xml        |   36 ++-----
 src/menus/select/all.xml                |   27 ++----
 src/menus/select/border.xml             |   67 ++++++--------
 src/menus/select/by_color.xml           |   28 ++----
 src/menus/select/dialog.xml             |  153 ++++++++++++++++--------------
 src/menus/select/feather.xml            |   39 +++-----
 src/menus/select/grow.xml               |   64 +++++--------
 src/menus/select/invert.xml             |   27 ++----
 src/menus/select/none.xml               |   34 +++----
 src/menus/select/rounded-rectangle.xml  |   43 ++++-----
 src/menus/select/sharpen.xml            |   28 ++----
 src/menus/select/shrink.xml             |   43 +++------
 src/menus/select/to-channel.xml         |   28 ++----
 src/menus/view/introduction.xml         |   19 +---
 src/menus/view/navigwindow.xml          |   34 +++----
 src/menus/view/new.xml                  |   23 ++---
 src/menus/view/show-grid.xml            |   23 ++---
 src/menus/view/show-guides.xml          |   27 ++----
 src/menus/view/show-layer-boundary.xml  |   23 ++---
 src/menus/view/show-menubar.xml         |   23 ++---
 src/menus/view/show-rulers.xml          |   27 ++----
 src/menus/view/show-sample-points.xml   |   22 +---
 src/menus/view/show-scrollbars.xml      |   23 ++---
 src/menus/view/show-selection.xml       |   23 ++---
 src/menus/view/show-statusbar.xml       |   23 ++---
 src/menus/view/shrink-wrap.xml          |   22 +---
 src/menus/view/snap-to-grid.xml         |   23 ++---
 src/menus/view/snap-to-guides.xml       |   23 ++---
 src/menus/windows-open-recent-docks.xml |   22 +----
 src/menus/windows-show-docks.xml        |   24 +----
 59 files changed, 731 insertions(+), 1310 deletions(-)
---
diff --git a/src/menus/file/close.xml b/src/menus/file/close.xml
index 8834cb8..3d85c2a 100644
--- a/src/menus/file/close.xml
+++ b/src/menus/file/close.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:
   2007-10-17 j.h: only added "active image" instead of"image" for v2.4
   2007-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-close">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Close</phrase>
-  </title>
+  <title>Close</title>
+
   <anchor id="gimp-file-close-confirm"/>
   <indexterm>
     <primary>Image</primary>
@@ -26,6 +16,7 @@
   <indexterm>
     <primary>Close</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Close</guimenuitem> command closes the active image. If
     the image is not in the main window, then the window is closed also. If
@@ -44,10 +35,9 @@
     slightest possibility that you will regret it, it can't hurt to save a
     copy as an <link linkend="glossary-xcf">XCF</link> file.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/file/open-recent.xml b/src/menus/file/open-recent.xml
index 97f510a..01bca30 100644
--- a/src/menus/file/open-recent.xml
+++ b/src/menus/file/open-recent.xml
@@ -1,24 +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:
   2007-10-18 j.h: no change for v2.4
   2005-09-07 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-file-open-recent">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Open Recent</title>
 
-  <title>
-    <phrase>Open Recent</phrase>
-  </title>
   <indexterm>
     <primary>Image</primary>
     <secondary>Open</secondary>
@@ -35,10 +24,9 @@
     <link linkend="gimp-document-dialog">Document History dialog</link> at the
     bottom of the Open Recent submenu, if you cannot find your image.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/file/quit.xml b/src/menus/file/quit.xml
index 0ffe28f..b8da000 100644
--- a/src/menus/file/quit.xml
+++ b/src/menus/file/quit.xml
@@ -1,27 +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:
   2007-10-23 j.h: no change for v2.4
 -->
 <sect2 id="gimp-file-quit">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Quit</title>
 
-  <title>
-    <phrase>Quit</phrase>
-  </title>
   <anchor id="gimp-file-quit-confirm"/>
   <indexterm>
     <primary>Quit GIMP</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Quit</guimenuitem> command causes
     <acronym>GIMP</acronym> to close all images and exit. If there
@@ -34,15 +24,17 @@
     large part of the RAM on your system, it may take a little
     while for everything to shut down.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access to this command from the image menubar through
-          <menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>Quit</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/file/revert.xml b/src/menus/file/revert.xml
index 73be92d..93c933c 100644
--- a/src/menus/file/revert.xml
+++ b/src/menus/file/revert.xml
@@ -1,24 +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:
   2007-10-23 j.h: no change for v2.4
   2007-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-revert">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Revert</title>
 
-  <title>
-    <phrase>Revert</phrase>
-  </title>
   <indexterm>
     <primary>Image</primary>
     <secondary>Reload the image</secondary>
@@ -45,10 +34,9 @@
       revert the image.
     </para>
   </warning>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/file/save-as-copy.xml b/src/menus/file/save-as-copy.xml
index 0c2669d..1ed467b 100644
--- a/src/menus/file/save-as-copy.xml
+++ b/src/menus/file/save-as-copy.xml
@@ -1,24 +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:
   2007-10-23 j.h: no change for v2.4
   2007-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-save-a-copy">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Save a Copy</title>
 
-  <title>
-    <phrase>Save a Copy</phrase>
-  </title>
   <indexterm>
     <primary>Image</primary>
     <secondary>Save image</secondary>
@@ -43,15 +32,17 @@
     its current state, but continue to work with the original file without
     interruption.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access to this command from the image menubar through
-          <menuchoice><guimenu>File</guimenu><guimenuitem>Save a Copy</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>Save a Copy</guimenuitem>
+          </menuchoice>.
           There is no default keyboard shortcut.
         </para>
       </listitem>
diff --git a/src/menus/file/save-as-template.xml b/src/menus/file/save-as-template.xml
index 8f8cee8..8ab6dd2 100644
--- a/src/menus/file/save-as-template.xml
+++ b/src/menus/file/save-as-template.xml
@@ -1,24 +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:
   2007-10-23 j.h: no change for v2.4
   2007-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-save-as-template">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Save as Template</title>
 
-  <title>
-    <phrase>Save as Template</phrase>
-  </title>
   <indexterm>
     <primary>Image</primary>
     <secondary>Save image</secondary>
@@ -44,15 +33,17 @@
     <link linkend="gimp-template-dialog">Templates</link> dialog
     to modify or delete templates.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access to this command from the image menubar through
-          <menuchoice><guimenu>File</guimenu><guimenuitem>Save as Template</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>Save as Template</guimenuitem>
+          </menuchoice>.
           There is no default keyboard shortcut.
         </para>
       </listitem>
diff --git a/src/menus/file/save.xml b/src/menus/file/save.xml
index c85f782..e53d6d3 100644
--- a/src/menus/file/save.xml
+++ b/src/menus/file/save.xml
@@ -1,23 +1,12 @@
 <?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-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-save">
-  <!--><sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+  <title>Save</title>
 
-  <title>
-    <phrase>Save</phrase>
-  </title>
   <anchor id="gimp-file-save-by-extension"/>
   <anchor id="gimp-file-save-overwrite"/>
   <indexterm>
@@ -53,15 +42,17 @@
     checked in the <link linkend="gimp-prefs-environment">Environment</link>
     page of the Preferences dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Dialog</phrase>
-    </title>
+    <title>Activate the Dialog</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command in the image menu bar through
-          <menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>Save</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/filter-repeat.xml b/src/menus/filter-repeat.xml
index 4630446..5301f20 100644
--- a/src/menus/filter-repeat.xml
+++ b/src/menus/filter-repeat.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:
   2007-06-20 Added Spanish translation by AntI
   2005/11/20 split off from menus-filter.xml; de created by axel.wernicke
 -->
 <sect2 id="gimp-filter-repeat">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-28</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Repeat Last</phrase>
-  </title>
+  <title>Repeat Last</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Common functions</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Repeat Last</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Repeat Last</guimenuitem> command performs the action
     of the most recently executed plug-in again, using the same settings as
@@ -38,17 +30,18 @@
       <guimenu>Filters</guimenu> menu or not.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Filters</guimenu><guimenuitem>
-              Repeat <replaceable>filter</replaceable>
-            </guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Filters</guimenu>
+            <guimenuitem>Repeat
+              <replaceable>filter</replaceable></guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/filter-reset-all.xml b/src/menus/filter-reset-all.xml
index 4ae59cd..e317118 100644
--- a/src/menus/filter-reset-all.xml
+++ b/src/menus/filter-reset-all.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:
   2007-06-20 Added Spanish translation by AntI
   2005/11/20 split off from menus-filter.xml; de created by axel.wernicke
 -->
 <sect2 id="gimp-filter-reset-all">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-28</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Reset All Filters</phrase>
-  </title>
+  <title>Reset All Filters</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Common functions</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Reset All</primary>
   </indexterm>
+
   <para>
     Normally, each time you run an interactive plug-in, its dialog is
     displayed with all of the settings initialized to the ones you used
@@ -37,15 +29,17 @@
     dramatic step, it asks you to confirm that you really want to do it.
     Be careful: you cannot undo this command.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Filters</guimenu><guimenuitem>Reset all Filters</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Filters</guimenu>
+            <guimenuitem>Reset all Filters</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/image/align-layers.xml b/src/menus/image/align-layers.xml
index 7958233..72ec0de 100644
--- a/src/menus/image/align-layers.xml
+++ b/src/menus/image/align-layers.xml
@@ -1,25 +1,16 @@
 <?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-30 j.h: updated en;fr for v2.4. Moved from layer menu to image
-     menu
-     2007-06-18 Added Spanish translation by AntI
-     2007-03-12 Kolbjørn: added no translation
-     2006-07-31 scb: revised 'en'
-     -->
+  2007-11-30 j.h: updated en;fr for v2.4. Moved from layer menu to image
+             menu
+  2007-06-18 Added Spanish translation by AntI
+  2007-03-12 Kolbjørn: added no translation
+  2006-07-31 scb: revised 'en'
+-->
 <sect2 id="plug-in-align-layers">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-02</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Align Visible Layers</phrase>
-  </title>
+  <title>Align Visible Layers</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Stack managing</secondary>
@@ -28,6 +19,7 @@
   <indexterm>
     <primary>Align visible layers</primary>
   </indexterm>
+
   <para>
     With the <guimenuitem>Align Visible Layers</guimenuitem> command,
     you can very precisely position the visible layers (those marked with
@@ -49,9 +41,7 @@
     </para>
   </note>
   <figure>
-    <title>
-      <phrase>Example image for layer alignment</phrase>
-    </title>
+    <title>Example image for layer alignment</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
@@ -72,10 +62,9 @@
       </caption>
     </mediaobject>
   </figure>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -90,19 +79,15 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        Description of the <quote>Layer Align</quote> dialog
-      </phrase>
-    </title>
+    <title>Description of the <quote>Layer Align</quote> dialog</title>
     <figure>
-      <title>
-        <phrase>The <quote>Layer Align</quote> dialog</phrase>
-      </title>
+      <title>The <quote>Layer Align</quote> dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/menus-layer-align.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/menus-layer-align.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -116,13 +101,15 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>None</guilabel>:
+              <para>
+                <guilabel>None</guilabel>:
                 There will be no change in the horizontal or the vertical
                 position, respectively.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Collect</guilabel>:
+              <para>
+                <guilabel>Collect</guilabel>:
                 The visible layers will be aligned on the canvas, in the
                 way that is determined by the <guilabel>Horizontal
                   base</guilabel> and <guilabel>Vertical base</guilabel>
@@ -136,23 +123,22 @@
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    Horizontal <quote>Collect</quote> alignment
-                    (on the edge of the canvas)
-                  </phrase>
+                  Horizontal <quote>Collect</quote> alignment (on the edge of
+                  the canvas)
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/align-demo.png"/>
                   </imageobject>
                   <caption>
-                    <para>Original image with the layer stack
-                    </para>
+                    <para>Original image with the layer stack</para>
                   </caption>
                 </mediaobject>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/alignHCLB-.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/alignHCLB-.png"/>
                   </imageobject>
                   <caption>
                     <para>
@@ -165,14 +151,13 @@
               </figure>
               <figure>
                 <title>
-                  <phrase>
-                    Horizontal <quote>Collect</quote> alignment
-                    (on the bottom layer)
-                  </phrase>
+                  Horizontal <quote>Collect</quote> alignment (on the bottom
+                  layer)
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/align-demo.png"/>
                   </imageobject>
                   <caption>
                     <para>Original image with the layer stack
@@ -181,7 +166,8 @@
                 </mediaobject>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/alignHCLB+.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/alignHCLB+.png"/>
                   </imageobject>
                   <caption>
                     <para>
@@ -194,7 +180,8 @@
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Fill (left to right)</guilabel>;
+              <para>
+                <guilabel>Fill (left to right)</guilabel>;
                 <guilabel>Fill (top to bottom)</guilabel>:
                 The visible layers will be aligned with the canvas
                 according to the edge you selected with
@@ -212,13 +199,12 @@
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    Horizontal <quote>Fill</quote> alignment (canvas)
-                  </phrase>
+                  Horizontal <quote>Fill</quote> alignment (canvas)
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/align-demo.png"/>
                   </imageobject>
                   <caption>
                     <para>Original image with the layer stack
@@ -227,7 +213,8 @@
                 </mediaobject>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/alignHFLB-.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/alignHFLB-.png"/>
                   </imageobject>
                   <caption>
                     <para>
@@ -244,22 +231,21 @@
               </figure>
               <figure>
                 <title>
-                  <phrase>
-                    Horizontal <quote>Fill</quote> alignment (bottom layer)
-                  </phrase>
+                  Horizontal <quote>Fill</quote> alignment (bottom layer)
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/align-demo.png"/>
                   </imageobject>
                   <caption>
-                    <para>Original image with the layer stack
-                    </para>
+                    <para>Original image with the layer stack</para>
                   </caption>
                 </mediaobject>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/alignHFLB+.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/alignHFLB+.png"/>
                   </imageobject>
                   <caption>
                     <para>
@@ -271,29 +257,29 @@
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Fill (right to left)</guilabel>;
+              <para>
+                <guilabel>Fill (right to left)</guilabel>;
                 <guilabel>Fill (bottom to top)</guilabel>:
                 These settings work similarly to the ones described above,
                 but the filling occurs in the opposite direction.
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    Vertical <quote>Fill</quote> alignment (bottom layer)
-                  </phrase>
+                  Vertical <quote>Fill</quote> alignment (bottom layer)
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/align-demo.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/align-demo.png"/>
                   </imageobject>
                   <caption>
-                    <para>Original image with the layer stack
-                    </para>
+                    <para>Original image with the layer stack</para>
                   </caption>
                 </mediaobject>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/menus/alignVFBB+.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/menus/alignVFBB+.png"/>
                   </imageobject>
                   <caption>
                     <para>
diff --git a/src/menus/image/autocrop.xml b/src/menus/image/autocrop.xml
index b084824..b877b6c 100644
--- a/src/menus/image/autocrop.xml
+++ b/src/menus/image/autocrop.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-07 j.h: added example 'en','fr'
   2007-09-25 AntI: Added 'es'
   2006-07-28 scb: revised 'en'
 -->
 <sect2 id="gimp-image-autocrop">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-07</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Autocrop Image</phrase>
-  </title>
+  <title>Autocrop Image</title>
+
   <indexterm>
     <primary>Image</primary>
     <secondary>Crop</secondary>
@@ -26,6 +17,7 @@
   <indexterm>
     <primary>Autocrop</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Autocrop Image</guimenuitem> command removes the
     borders from an image. It searches the active layer for the largest
@@ -41,10 +33,9 @@
       the same limits as limits in the active layer.
     </para>
   </caution>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -57,14 +48,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Example</phrase>
-    </title>
+    <title>Example</title>
     <figure>
-      <title>
-        <phrase><quote>Autocrop</quote> example</phrase>
-      </title>
+      <title><quote>Autocrop</quote> example</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/autocrop-1.png" format="PNG"/>
@@ -82,7 +70,8 @@
           <imagedata fileref="images/menus/autocrop-2.png" format="PNG"/>
         </imageobject>
         <caption>
-          <para><quote>Autocrop</quote> has cropped the green square and made a
+          <para>
+            <quote>Autocrop</quote> has cropped the green square and made a
             layer from it. The other layers have been cropped to the same
             size as the green one. Only a small part of the red square has
             been kept.
diff --git a/src/menus/image/configure-grid.xml b/src/menus/image/configure-grid.xml
index ea33318..ee5f40a 100644
--- a/src/menus/image/configure-grid.xml
+++ b/src/menus/image/configure-grid.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-16 j.h: revised 'en;fr' for v2.4
   2007-09-26 AntI: Added 'es'
@@ -7,23 +8,14 @@
   2006-07-29 scb: revised 'en'
 -->
 <sect2 id="gimp-image-configure-grid">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Configure Grid</phrase>
-  </title>
+  <title>Configure Grid</title>
+
   <anchor id="gimp-configure-grid-dialog"/>
   <indexterm>
     <primary>Grid</primary>
     <secondary>configure</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Configure Grid</guimenuitem> command lets you set
     the properties of the grid which you can display over your image
@@ -33,10 +25,9 @@
     from the origin of the image, independently for the horizontal and
     vertical grid lines. You can choose one of five different grid styles.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -49,28 +40,22 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Configure Grid</quote> dialog
-      </phrase>
+      Description of the <quote>Configure Grid</quote> dialog
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Configure grid</quote> dialog
-        </phrase>
-      </title>
+      <title>The <quote>Configure grid</quote> dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/image-configure-grid.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/image-configure-grid.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
-      <title>
-        <phrase>Appearance</phrase>
-      </title>
+      <title>Appearance</title>
       <para>
         In the <guimenu>Configure Image Grid</guimenu> dialog, you can set
         the properties of the grid which is shown when you turn on the image
@@ -139,9 +124,7 @@
       </varlistentry>
     </variablelist>
     <variablelist>
-      <title>
-        <phrase>Spacing</phrase>
-      </title>
+      <title>Spacing</title>
       <varlistentry>
         <term>Width and Height</term>
         <listitem>
@@ -153,9 +136,7 @@
       </varlistentry>
     </variablelist>
     <variablelist>
-      <title>
-        <phrase>Offset</phrase>
-      </title>
+      <title>Offset</title>
       <varlistentry>
         <term>Width and Height</term>
         <listitem>
diff --git a/src/menus/image/duplicate.xml b/src/menus/image/duplicate.xml
index 9d66459..005fc81 100644
--- a/src/menus/image/duplicate.xml
+++ b/src/menus/image/duplicate.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:
   2009-01-17 j.h: reviewed for v2.6. Note added
   2007-11-24 j.h: no change for v2.4
@@ -8,18 +9,8 @@
   2005/10/30 rewiewed, de added by axel.wernicke
 -->
 <sect2 id="gimp-image-duplicate">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-01</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Duplicate</phrase>
-  </title>
+  <title>Duplicate</title>
+
   <indexterm>
     <primary>Duplicate image</primary>
   </indexterm>
@@ -43,9 +34,7 @@
   </note>
 
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/image/flatten.xml b/src/menus/image/flatten.xml
index 1e1f011..b639731 100644
--- a/src/menus/image/flatten.xml
+++ b/src/menus/image/flatten.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-25 j.h: no change for v2.4
   2007-09-25 AntI: Added 'es'
@@ -7,18 +8,8 @@
   2005/10/30 rewiewed, de added by axel.wernicke
 -->
 <sect2 id="gimp-image-flatten">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-07</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Flatten Image</phrase>
-  </title>
+  <title>Flatten Image</title>
+
   <indexterm>
     <primary>Layers</primary>
     <secondary>Merge all layers</secondary>
@@ -26,6 +17,7 @@
   <indexterm>
     <primary>Flatten</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Flatten Image</guimenuitem> command merges all of the
     layers of the image into a single layer with no alpha channel. After
@@ -41,10 +33,9 @@
     a format which does not support levels or transparency (an alpha
     channel).
  </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/image/merge-layers.xml b/src/menus/image/merge-layers.xml
index 8f74e6d..1eb1735 100644
--- a/src/menus/image/merge-layers.xml
+++ b/src/menus/image/merge-layers.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-11-27 j.h: updated to v2.4. "Discard invisible layers" option added
   2007-09-27 AntI: Added 'es'
   2007-03-13 alex falappa: added it translation
-     2005/10/30 rewiewed, de added by axel.wernicke
+  2005/10/30 rewiewed, de added by axel.wernicke
 -->
 <sect2 id="gimp-image-merge-layers">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-07</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Merge Visible Layers</phrase>
-  </title>
+  <title>Merge Visible Layers</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Stack managing</secondary>
@@ -27,6 +18,7 @@
   <indexterm>
     <primary>Merge Visible Layers</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Merge Visible Layers</guimenuitem> command merges
     the layers which are visible into a single layer. Visible layers are
@@ -41,10 +33,9 @@
       stack and original visible layers persist.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -63,22 +54,18 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Merge Visible Layers</quote> Dialog
-      </phrase>
+      Description of the <quote>Merge Visible Layers</quote> Dialog
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Merge Visible Layers</quote> Dialog
-        </phrase>
-      </title>
+      <title>The <quote>Merge Visible Layers</quote> Dialog</title>
       <mediaobject>
         <imageobject>
           <!--was: images/dialogs/dialogs-image-merge-visible.png-->
-          <imagedata fileref="images/menus/image-merge-visible.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/image-merge-visible.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -92,7 +79,8 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><emphasis>Expanded as necessary</emphasis>:
+              <para>
+                <emphasis>Expanded as necessary</emphasis>:
                 The final layer is large enough to contain all of the
                 merged layers. Please note that a layer in
                 <acronym>GIMP</acronym> can be larger than the
@@ -100,7 +88,8 @@
               </para>
             </listitem>
             <listitem>
-              <para><emphasis>Clipped to image</emphasis>:
+              <para>
+                <emphasis>Clipped to image</emphasis>:
                 The final layer is the same size as the image. Remember
                 that layers in <acronym>GIMP</acronym> can be
                 larger than the image itself. Any layers in the image that
@@ -108,7 +97,8 @@
               </para>
             </listitem>
             <listitem>
-              <para><emphasis>Clipped to bottom layer</emphasis>:
+              <para>
+                <emphasis>Clipped to bottom layer</emphasis>:
                 The final layer is the same size as the bottom layer. If
                 the bottom layer is smaller than some of the visible layers,
                 the final layer is clipped and trimmed to the size and
@@ -126,13 +116,11 @@
             the layer stack.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Merge visible layers</quote> example
-              </phrase>
-            </title>
+            <title><quote>Merge visible layers</quote> example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/image-merge-visible-ex1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/image-merge-visible-ex1.png"/>
               </imageobject>
               <caption>
                 <para>Three layers; two are visible</para>
@@ -140,20 +128,22 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/image-merge-visible-ex2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/image-merge-visible-ex2.png"/>
               </imageobject>
               <caption>
-                <para><quote>Discard invisible layers</quote> unchecked
+                <para>
+                  <quote>Discard invisible layers</quote> unchecked
                 </para>
               </caption>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/image-merge-visible-ex3.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/image-merge-visible-ex3.png"/>
               </imageobject>
               <caption>
-                <para><quote>Discard invisible layers</quote> checked
-                </para>
+                <para><quote>Discard invisible layers</quote> checked</para>
               </caption>
             </mediaobject>
           </figure>
diff --git a/src/menus/image/mode.xml b/src/menus/image/mode.xml
index 3994969..250fa1e 100644
--- a/src/menus/image/mode.xml
+++ b/src/menus/image/mode.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-04-01 KoSt: added 'no' translation
   2007-03-13 alex falappa: fixed links in it translation
   2005-10-29 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-image-mode">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-07</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Mode</phrase>
-  </title>
+  <title>Mode</title>
+
   <indexterm>
     <primary>Modes (Colors)</primary>
     <secondary>Submenu</secondary>
@@ -27,11 +18,10 @@
     <secondary>Color modes</secondary>
     <tertiary>Menu</tertiary>
   </indexterm>
+
   <figure>
     <title>
-      <phrase>
-        The <quote>Mode</quote> submenu of the <quote>Image</quote> menu
-      </phrase>
+      The <quote>Mode</quote> submenu of the <quote>Image</quote> menu
     </title>
     <mediaobject>
       <imageobject>
@@ -43,10 +33,9 @@
     The <guimenuitem>Mode</guimenuitem> submenu contains commands which
     let you change the color mode of the image. There are three modes.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Submenu</phrase>
-    </title>
+    <title>Activating the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -59,12 +48,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        The Contents of the <quote>Mode</quote> Submenu
-      </phrase>
-    </title>
+    <title>The Contents of the <quote>Mode</quote> Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/image/properties.xml b/src/menus/image/properties.xml
index a495a5d..e9a2efb 100644
--- a/src/menus/image/properties.xml
+++ b/src/menus/image/properties.xml
@@ -1,35 +1,25 @@
 <?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-04-13 alex falappa: addet 'it' translation
   2008-01-02 kost: added 'no'
   2007-12-25 lexA: initial version for en and de
 -->
-<!--TODO es: add missing translation-->
 <sect2 id="gimp-image-properties">
-  <!--<sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-25</date>
-        <authorinitials>lexA</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Image Properties</phrase>
-  </title>
+  <title>Image Properties</title>
+
   <indexterm>
     <primary>Image Properties</primary>
   </indexterm>
+
   <para>
     The <quote>Image Properties</quote> command opens a window that shows
     lots of different information for the image.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -48,22 +38,19 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <para>The properties window is divided into three tabs.</para>
+
     <sect4>
-      <title>
-        <phrase><quote>Properties</quote> tab</phrase>
-      </title>
+      <title><quote>Properties</quote> tab</title>
       <figure>
-        <title>
-          <phrase><quote>Properties</quote> tab</phrase>
-        </title>
+        <title><quote>Properties</quote> tab</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/menus/image-properties.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/menus/image-properties.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -141,7 +128,8 @@
           <listitem>
             <para>
               Number of actions you have performed on the image, that you
-              can undo. You can see them in the <link linkend="gimp-undo-dialog">Undo History</link> dialog.
+              can undo. You can see them in the
+              <link linkend="gimp-undo-dialog">Undo History</link> dialog.
             </para>
           </listitem>
         </varlistentry>
@@ -164,17 +152,15 @@
         </varlistentry>
       </variablelist>
     </sect4>
+
     <sect4>
-      <title>
-        <phrase><quote>Color profile</quote> tab</phrase>
-      </title>
+      <title><quote>Color profile</quote> tab</title>
       <figure>
-        <title>
-          <phrase><quote>Color profile</quote> tab</phrase>
-        </title>
+        <title><quote>Color profile</quote> tab</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/menus/image-properties-profile.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/menus/image-properties-profile.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -183,17 +169,15 @@
         into GIMP with. Default is the built-in <quote>sRGB</quote> profile.
       </para>
     </sect4>
+
     <sect4>
-      <title>
-        <phrase><quote>Comments</quote> tab</phrase>
-      </title>
+      <title><quote>Comments</quote> tab</title>
       <figure>
-        <title>
-          <phrase><quote>Comments</quote> tab</phrase>
-        </title>
+        <title><quote>Comments</quote> tab</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/menus/image-properties-comment.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/menus/image-properties-comment.png"/>
           </imageobject>
         </mediaobject>
       </figure>
diff --git a/src/menus/image/transform-flip.xml b/src/menus/image/transform-flip.xml
index c6b7d73..00309e5 100644
--- a/src/menus/image/transform-flip.xml
+++ b/src/menus/image/transform-flip.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-11-29 j.h: no change for v2.4
   2007-09-28 AntI: Added 'es'
   2007-03-16 alex falappa: added it translation
-     2005/10/24 split intro off by axel.wernicke
+  2005/10/24 split intro off by axel.wernicke
 -->
 <sect2 id="gimp-image-flip-horizontal">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-07</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Flip Horizontally; Flip Vertically</phrase>
-  </title>
+  <title>Flip Horizontally; Flip Vertically</title>
+
   <anchor id="gimp-image-flip-vertical"/>
   <indexterm>
     <primary>Flip</primary>
   </indexterm>
+
   <para>
     You can flip the image, or turn it over like a
     card, by using the <guimenuitem>Flip Horizontally</guimenuitem> or
@@ -37,10 +29,9 @@
     menu or the
     <link linkend="gimp-tool-flip">Flip Tool</link>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Commands</phrase>
-    </title>
+    <title>Activate the Commands</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/image/transform-rotate.xml b/src/menus/image/transform-rotate.xml
index cea3eda..1d77ad3 100644
--- a/src/menus/image/transform-rotate.xml
+++ b/src/menus/image/transform-rotate.xml
@@ -1,29 +1,21 @@
 <?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-29 j.h: no change for v2.4
   2007-09-28 AntI: Added 'es'
   2007-03-22 alex falappa: added it translation
-     2005/10/24 split intro off by axel.wernicke
+  2005/10/24 split intro off by axel.wernicke
 -->
 <sect2 id="gimp-image-rotate-90">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Rotation</phrase>
-  </title>
+  <title>Rotation</title>
+
   <anchor id="gimp-image-rotate-180"/>
   <anchor id="gimp-image-rotate-270"/>
   <indexterm>
     <primary>Rotation</primary>
   </indexterm>
+
   <para>
     You can rotate the image 90° clockwise or counter-clockwise, or rotate
     it 180°, by using the rotation commands on the
@@ -36,10 +28,9 @@
     rotate a layer by using the
     <link linkend="gimp-layer-transform-menu">Layer Transform</link> menu.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Commands</phrase>
-    </title>
+    <title>Activate the Commands</title>
     <para>
       You can access these three commands from the image menubar through
     </para>
diff --git a/src/menus/layer/alpha-add.xml b/src/menus/layer/alpha-add.xml
index 7738a4b..ff13df1 100644
--- a/src/menus/layer/alpha-add.xml
+++ b/src/menus/layer/alpha-add.xml
@@ -1,27 +1,18 @@
 <?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:
-     2009-01-25 j.h: v2.6 reviewed
-     2007-11-30 j.h: updated v2.4
-     2007-06-13 Added Spanish translation by AntI
-     2007-03-09 KoSt: added 'no'
-     2007-03-02 explanation changed by j.h
-     2006-07-31 scb: revised 'en'
-     2005/11/16 split of from layer-transparency.xml by axel.wernicke
-     -->
+  2009-01-25 j.h: v2.6 reviewed
+  2007-11-30 j.h: updated v2.4
+  2007-06-13 Added Spanish translation by AntI
+  2007-03-09 KoSt: added 'no'
+  2007-03-02 explanation changed by j.h
+  2006-07-31 scb: revised 'en'
+  2005/11/16 split of from layer-transparency.xml by axel.wernicke
+-->
 <sect2 id="gimp-layer-alpha-add">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-02</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Add Alpha Channel</phrase>
-  </title>
+  <title>Add Alpha Channel</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Transparency managing</secondary>
@@ -30,16 +21,17 @@
   <indexterm>
     <primary>Add Alpha channel</primary>
   </indexterm>
-  <para><guimenuitem>Add Alpha Channel</guimenuitem>: An alpha channel is
+
+  <para>
+    <guimenuitem>Add Alpha Channel</guimenuitem>: An alpha channel is
     automatically added into the Channel Dialog as soon as you add a second
     layer to your image. It represents the transparency of the image. If your
     image has only one layer, this background layer has no Alpha channel. In
     this case, you can Add an Alpha channel with this command.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/layer/alpha-remove.xml b/src/menus/layer/alpha-remove.xml
index 1979443..6a70eef 100644
--- a/src/menus/layer/alpha-remove.xml
+++ b/src/menus/layer/alpha-remove.xml
@@ -1,6 +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";>
-<!--TODO es;ko;pl;ru New file-->
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-01-25 j.h: v2.6 reviewed
   2008-07-30 alex falappa: added 'it'
@@ -9,18 +9,8 @@
   2008-05-13 Created by j.h
 -->
 <sect2 id="gimp-layer-alpha-remove">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-05-13</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Remove Alpha Channel</phrase>
-  </title>
+  <title>Remove Alpha Channel</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Transparency managing</secondary>
@@ -29,6 +19,7 @@
   <indexterm>
     <primary>Remove Alpha channel</primary>
   </indexterm>
+
   <para>
     This command removes the Alpha channel of the active layer, keeping the
     Apha channels of the other layers.
@@ -42,10 +33,9 @@
     If the active layer is not the background layer, transparency is replaced
     with the background color of the Toolbox.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/layer/autocrop.xml b/src/menus/layer/autocrop.xml
index 012721b..3f8f72f 100644
--- a/src/menus/layer/autocrop.xml
+++ b/src/menus/layer/autocrop.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:
   2009-01-25 j.h: v2.6 reviewed
   2007-06-11 Added Spanish translation by AntI
@@ -9,18 +10,8 @@
   2006-08-27  rewritten en;fr. Added an example by j.h
 -->
 <sect2 id="plug-in-autocrop">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-09-04</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Autocrop Layer</phrase>
-  </title>
+  <title>Autocrop Layer</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Size managing</secondary>
@@ -30,6 +21,7 @@
     <primary>Crop</primary>
     <secondary>Autocrop layer</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Autocrop Layer</guimenuitem> command automatically
     crops the active layer, unlike the
@@ -47,10 +39,9 @@
     You can use this command to crop the layer to the dimensions of a subject
     that is lost in a solid background which is too large.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -63,14 +54,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Example</phrase>
-    </title>
+    <title>Example</title>
     <figure>
-      <title>
-        <phrase>Example</phrase>
-      </title>
+      <title>Example</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/crop-layer-1.png" format="PNG"/>
diff --git a/src/menus/layer/mask-disable.xml b/src/menus/layer/mask-disable.xml
index 184f50b..3c43dce 100644
--- a/src/menus/layer/mask-disable.xml
+++ b/src/menus/layer/mask-disable.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-06-10 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2006-01-19 created by j.h
 -->
 <sect2 id="gimp-layer-mask-disable">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-16</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Disable Layer Mask</phrase>
-  </title>
+  <title>Disable Layer Mask</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Mask managing</secondary>
@@ -31,6 +22,7 @@
   <indexterm>
     <primary>Disable Layer Mask</primary>
   </indexterm>
+
   <para>
     As soon as you create a layer mask, it acts on the image. The
     <guimenuitem>Disable Layer Mask</guimenuitem> command allows you to
@@ -38,10 +30,9 @@
     displayed next to it and the border of the layer mask's thumbnail in
     the Layers Dialog turns red.
   </para>
+
   <sect3 id="gimp-layer-mask-disable-activate">
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/layer/mask-edit.xml b/src/menus/layer/mask-edit.xml
index 4dace0b..b1bd755 100644
--- a/src/menus/layer/mask-edit.xml
+++ b/src/menus/layer/mask-edit.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-06-11 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2006-01-19 created by j.h
 -->
 <sect2 id="gimp-layer-mask-edit">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-16</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Edit Layer Mask</phrase>
-  </title>
+  <title>Edit Layer Mask</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Mask managing</secondary>
@@ -31,6 +22,7 @@
   <indexterm>
     <primary>Edit Layer Mask</primary>
   </indexterm>
+
   <para>
     When you click on the <guimenuitem>Edit Layer Mask</guimenuitem> item on
     the <guimenu>Layer Mask</guimenu> submenu, a check is displayed next to
@@ -40,10 +32,9 @@
     it is displayed with a white border. You can also activate the component
     you want more simply by clicking on it in the Layers Dialog.
   </para>
+
   <sect3 id="gimp-layer-mask-edit-activate">
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/layer/mask-show.xml b/src/menus/layer/mask-show.xml
index b1c9667..bc44e8c 100644
--- a/src/menus/layer/mask-show.xml
+++ b/src/menus/layer/mask-show.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-06-11 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2006-01-19 created by j.h
 -->
 <sect2 id="gimp-layer-mask-show">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-16</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Layer Mask</phrase>
-  </title>
+  <title>Show Layer Mask</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Mask managing</secondary>
@@ -31,6 +22,7 @@
   <indexterm>
     <primary>Show Layer Mask (command)</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Layer Mask</guimenuitem> command lets you see the
     layer mask better by turning the image invisible. When you click on the
@@ -38,10 +30,9 @@
     thumbnail in the Layers Dialog is shown with a green border. The layer
     itself is not modified; you can turn it visible again later.
   </para>
+
   <sect3 id="gimp-layer-mask-show-activate">
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -68,8 +59,11 @@
             <guimenu>Layer</guimenu>
             <guimenuitem>Mask</guimenuitem>
           </menuchoice>
-            submenu or by <keycap>Alt</keycap>-clicking (or
-          <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo>-clicking) again on the layer mask's thumbnail.
+          submenu or by <keycap>Alt</keycap>-clicking (or
+          <keycombo>
+            <keycap>Ctrl</keycap><keycap>Alt</keycap>
+          </keycombo>-clicking)
+            again on the layer mask's thumbnail.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/layer/mask.xml b/src/menus/layer/mask.xml
index 6b2567b..59b1031 100644
--- a/src/menus/layer/mask.xml
+++ b/src/menus/layer/mask.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-06-11 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2005/11/11 reviewed and split into one file per command by axel.wernicke
 -->
 <sect2 id="gimp-layer-mask-menu">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-18</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The <quote>Mask</quote> Submenu</phrase>
-  </title>
+  <title>The <quote>Mask</quote> Submenu</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Sub-menu</secondary>
@@ -25,9 +16,7 @@
   </indexterm>
   <figure>
     <title>
-      <phrase>
-        The <quote>Mask</quote> submenu of the <quote>Layer</quote> menu
-      </phrase>
+      The <quote>Mask</quote> submenu of the <quote>Layer</quote> menu
     </title>
     <mediaobject>
       <imageobject>
@@ -42,10 +31,9 @@
     <link linkend="gimp-layer-mask">Layer Masks</link>
     section for more information on layer masks and how to use them.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Submenu</phrase>
-    </title>
+    <title>Activating the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -58,12 +46,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        The Contents of the <quote>Mask</quote> Submenu
-      </phrase>
-    </title>
+    <title>The Contents of the <quote>Mask</quote> Submenu</title>
     <para>
       The <guimenu>Mask</guimenu> submenu contains the following commands:
     </para>
diff --git a/src/menus/layer/resize.xml b/src/menus/layer/resize.xml
index 5ae5ed0..2a4ebf6 100644
--- a/src/menus/layer/resize.xml
+++ b/src/menus/layer/resize.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-06-18 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2005/11/03 split of from menu-layer.xml by axel.wernicke
 -->
 <sect2 id="gimp-layer-resize">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-16</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Layer Boundary Size</phrase>
-  </title>
+  <title>Layer Boundary Size</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Size managing</secondary>
@@ -26,6 +17,7 @@
   <indexterm>
     <primary>Layer Boundary Size</primary>
   </indexterm>
+
   <para>
     In <acronym>GIMP</acronym>, a layer is not always the same size
     as the image it belongs to. It might be smaller or it might be larger,
@@ -35,10 +27,9 @@
     changes the dimensions of the layer, but it does not
     <link linkend="gimp-layer-scale">scale</link> its contents.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -51,18 +42,13 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Layer Boundary Size</quote> dialog
-      </phrase>
+      Description of the <quote>Layer Boundary Size</quote> dialog
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Layer Boundary Size</quote> Dialog
-        </phrase>
-      </title>
+      <title>The <quote>Layer Boundary Size</quote> Dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/layer-resize.png" format="PNG"/>
diff --git a/src/menus/layer/stack.xml b/src/menus/layer/stack.xml
index 225f2a5..f76bb9b 100644
--- a/src/menus/layer/stack.xml
+++ b/src/menus/layer/stack.xml
@@ -9,18 +9,8 @@
   2005/11/11 de added; reviewed by axel.wernicke
 -->
 <sect2 id="gimp-layer-stack-menu">
-  <!--sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-05</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info-->
-  <title>
-    <phrase><quote>Stack</quote> Submenu</phrase>
-  </title>
+  <title><quote>Stack</quote> Submenu</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Sub-menu</secondary>
@@ -29,10 +19,9 @@
   <indexterm>
     <primary>Stack</primary>
   </indexterm>
+
   <figure>
-    <title>
-      <phrase>The <quote>Stack</quote> submenu</phrase>
-    </title>
+    <title>The <quote>Stack</quote> submenu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/layer-stack.png" format="PNG"/>
@@ -46,10 +35,9 @@
     active layer in the layer stack. If your image has only one layer, these
     commands are grayed out.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Submenu</phrase>
-    </title>
+    <title>Activating the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -62,12 +50,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        The Contents of the <quote>Stack</quote> Submenu
-      </phrase>
-    </title>
+    <title>The Contents of the <quote>Stack</quote> Submenu</title>
     <para>
       The <guisubmenu>Stack</guisubmenu> submenu contains the following
       commands:
diff --git a/src/menus/layer/transform.xml b/src/menus/layer/transform.xml
index 8a9f782..cae8212 100644
--- a/src/menus/layer/transform.xml
+++ b/src/menus/layer/transform.xml
@@ -1,35 +1,23 @@
 <?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-13 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2005-11-16 reviewed and split into one file per command by axel.wernicke
 -->
 <sect2 id="gimp-layer-transform-menu">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>
-      The <quote>Transform</quote> Submenu
-    </phrase>
-  </title>
+  <title>The <quote>Transform</quote> Submenu</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Sub-menu</secondary>
     <tertiary>Transform</tertiary>
   </indexterm>
+
   <figure>
     <title>
-      <phrase>
-        The <quote>Transform</quote> Submenu of the <quote>Layer</quote> menu
-      </phrase>
+      The <quote>Transform</quote> Submenu of the <quote>Layer</quote> menu
     </title>
     <mediaobject>
       <imageobject>
@@ -42,10 +30,9 @@
     <guimenu>Layer</guimenu> menu contains commands which flip or rotate
     the active layer of the image.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Submenu</phrase>
-    </title>
+    <title>Activating the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -58,12 +45,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        The Contents of the <quote>Transform</quote> Submenu
-      </phrase>
-    </title>
+    <title>The Contents of the <quote>Transform</quote> Submenu</title>
     <para>
       The <guisubmenu>Transform</guisubmenu> submenu contains the following
       commands:
diff --git a/src/menus/layer/transparency.xml b/src/menus/layer/transparency.xml
index 4117d32..f2e6c7b 100644
--- a/src/menus/layer/transparency.xml
+++ b/src/menus/layer/transparency.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-13 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
@@ -7,32 +8,19 @@
   2005-11-16 reviewed and split into one file per command by axel.wernicke
 -->
 <sect2 id="gimp-layer-transparency-menu">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
-    <phrase>
-      The <quote>Transparency</quote> Submenu of the <quote>Layer</quote>
-      menu
-    </phrase>
+    The <quote>Transparency</quote> Submenu of the <quote>Layer</quote> menu
   </title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Sub-menu</secondary>
     <tertiary>Transparency</tertiary>
   </indexterm>
+
   <figure>
     <title>
-      <phrase>
-        The <quote>Transparency</quote> submenu of the
-        <quote>Layer</quote> menu
-      </phrase>
+      The <quote>Transparency</quote> submenu of the <quote>Layer</quote> menu
     </title>
     <mediaobject>
       <imageobject>
@@ -44,10 +32,9 @@
     The <guisubmenu>Transparency</guisubmenu> submenu contains commands
     which use or affect the alpha channel of the active layer.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Submenu</phrase>
-    </title>
+    <title>Activating the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -60,12 +47,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        The Contents of the <quote>Transparency</quote> Submenu
-      </phrase>
-    </title>
+    <title>The Contents of the <quote>Transparency</quote> Submenu</title>
     <para>
       The <guisubmenu>Transparency</guisubmenu> submenu contains the
       following commands:
diff --git a/src/menus/select/all.xml b/src/menus/select/all.xml
index c155f5e..64e2c35 100644
--- a/src/menus/select/all.xml
+++ b/src/menus/select/all.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanih translation by AntI
@@ -7,18 +8,8 @@
   2005/09/17 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-all">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-14</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Select All</phrase>
-  </title>
+  <title>Select All</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary> Select All</secondary>
@@ -27,15 +18,17 @@
     The <guimenuitem>Select All</guimenuitem> command creates a new
     selection which contains everything on the current layer.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>All</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>All</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/select/border.xml b/src/menus/select/border.xml
index 24cdd91..c651d50 100644
--- a/src/menus/select/border.xml
+++ b/src/menus/select/border.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-08-05 ude: added new options of GIMP 2.4.
@@ -8,18 +9,8 @@
   2005/09/16 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-border">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-08</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Border</phrase>
-  </title>
+  <title>Border</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Create a selection border</secondary>
@@ -28,14 +19,11 @@
     <primary>Border</primary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>
-        Example of creating a border from a selection
-      </phrase>
-    </title>
+    <title>Example of creating a border from a selection</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/examples/border-selection-01.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/examples/border-selection-01.png"/>
       </imageobject>
       <caption>
         <para>
@@ -45,7 +33,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/examples/border-selection-02.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/examples/border-selection-02.png"/>
       </imageobject>
       <caption>
         <para>
@@ -62,32 +51,30 @@
     or some other unit, in the dialog window. Half of the new border lies
     inside of the selected area and half outside of it.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Border</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Border</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        Description of the <quote>Border</quote> dialog window
-      </phrase>
-    </title>
+    <title>Description of the <quote>Border</quote> dialog window</title>
     <figure>
-      <title>
-        <phrase>The <quote>Border</quote> dialog window</phrase>
-      </title>
+      <title>The <quote>Border</quote> dialog window</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/dialogs/selection-border.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/dialogs/selection-border.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -124,29 +111,29 @@
           </para>
           <figure>
             <title>
-              <phrase>
               Select border with and without <quote>Lock to image
               edges</quote>
-            </phrase>
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/dialogs/examples/border-selection-lock1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/dialogs/examples/border-selection-lock1.png"/>
               </imageobject>
               <caption>
                 <para>
-                Select border without (middle) and with (right) locked
-                selection.
+                  Select border without (middle) and with (right) locked
+                  selection.
               </para>
               </caption>
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/dialogs/examples/border-selection-lock2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/dialogs/examples/border-selection-lock2.png"/>
               </imageobject>
               <caption>
                 <para>
-                Same selections filled with red.
+                  Same selections filled with red.
               </para>
               </caption>
             </mediaobject>
diff --git a/src/menus/select/by_color.xml b/src/menus/select/by_color.xml
index 37d2451..957b00c 100644
--- a/src/menus/select/by_color.xml
+++ b/src/menus/select/by_color.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -7,37 +8,30 @@
   2005/09/16 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-by_color">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-14</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>By Color</phrase>
-  </title>
+  <title>By Color</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>By Color select</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Select By Color</guimenuitem> command is an alternate
     way of accessing the <quote>Select By Color</quote> tool, one of the
     basic selection tools. You can find more information about using this
     tool in <link linkend="gimp-tool-by-color-select">Select By Color</link>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>By Color</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>By Color</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/select/dialog.xml b/src/menus/select/dialog.xml
index d5de5a0..65dce19 100644
--- a/src/menus/select/dialog.xml
+++ b/src/menus/select/dialog.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -9,18 +10,8 @@
   2005-06-02 created by julien hardelin
 -->
 <sect2 id="gimp-selection-dialog">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-14</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Selection Editor</phrase>
-  </title>
+  <title>Selection Editor</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Editor</secondary>
@@ -28,6 +19,7 @@
   <indexterm>
     <primary>Editor</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Selection Editor</guimenuitem> command displays the
     <quote>Selection Editor</quote> dialog window. This dialog window
@@ -39,10 +31,9 @@
     the menubar. The <quote>Selection Editor</quote> also offers some
     advanced options for the <quote>Select to Path</quote> command.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -55,18 +46,13 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Selection Editor</quote> dialog window
-      </phrase>
+      Description of the <quote>Selection Editor</quote> dialog window
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Selection Editor</quote> dialog window
-        </phrase>
-      </title>
+      <title>The <quote>Selection Editor</quote> dialog window</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/select-editor.png" format="PNG"/>
@@ -85,7 +71,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-selection-all-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-all-16.png"/>
                 </guiicon>
                 The <link linkend="gimp-selection-all">Select All</link>
                 button.
@@ -94,7 +81,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-selection-none-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-none-16.png" />
                 </guiicon>
                 The <link linkend="gimp-selection-none">Select None</link>
                 button.
@@ -103,7 +91,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-invert-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-invert-16.png"/>
                 </guiicon>
                 The <link linkend="gimp-selection-invert">Select Invert</link>
                 button.
@@ -112,7 +101,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-selection-to-channel-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-to-channel-16.png"/>
                 </guiicon>
                 The <link linkend="gimp-selection-to-channel">Save to
                 Channel</link> button.
@@ -121,7 +111,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-selection-to-path-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-to-path-16.png"/>
                 </guiicon>
                 The <link linkend="selection-to-path">To Path</link>
                 button. If you hold the <keycap>Shift</keycap> key while
@@ -133,7 +124,8 @@
             <listitem>
               <para>
                 <guiicon>
-                  <inlinegraphic fileref="images/dialogs/stock-selection-stroke-16.png" />
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-stroke-16.png"/>
                 </guiicon>
                 The <link linkend="gimp-selection-stroke">Stroke
                 Selection</link> button.
@@ -157,14 +149,13 @@
     </variablelist>
     <figure>
       <title>
-        <phrase>
-          Example of clicking in the <quote>Selection Editor</quote> display
-          window
-        </phrase>
+        Example of clicking in the <quote>Selection Editor</quote> display
+        window
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/selection-editor-click.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/selection-editor-click.png"/>
         </imageobject>
         <caption>
           <para>
@@ -181,9 +172,7 @@
 
   <sect3 id="advanced-settings-for-selection-to-path">
     <title>
-      <phrase>
-        The <quote>Selection to Path Advanced Settings</quote> dialog
-      </phrase>
+      The <quote>Selection to Path Advanced Settings</quote> dialog
     </title>
     <indexterm>
       <primary>Selection</primary>
@@ -191,14 +180,11 @@
       <tertiary>Advanced options</tertiary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Advanced Settings</quote> dialog window
-        </phrase>
-      </title>
+      <title>The <quote>Advanced Settings</quote> dialog window</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/selection-to-path-adv.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/selection-to-path-adv.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -212,13 +198,15 @@
     </para>
     <itemizedlist>
       <listitem>
-        <para><emphasis>Align Threshold</emphasis>:
+        <para>
+          <emphasis>Align Threshold</emphasis>:
           If two endpoints are closer than this value, they are made to be
           equal.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Corner Always Threshold</emphasis>:
+        <para>
+          <emphasis>Corner Always Threshold</emphasis>:
           If the angle defined by a point and its predecessors
           and successors is smaller than this, it is a corner,
           even if it is within <emphasis>Corner Surround</emphasis>
@@ -226,38 +214,48 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Corner Surround</emphasis>:
+        <para>
+          <emphasis>Corner Surround</emphasis>:
           Number of points to consider when determining if a
           point is a corner or not.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Corner Threshold</emphasis>:
+        <para>
+          <emphasis>Corner Threshold</emphasis>:
           If a point, its predecessors, and its successors
           define an angle smaller than this, it is a corner.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Error Threshold</emphasis>:
-          Amount of error at which a fitted spline
-          <footnote><para><quote>Spline</quote> is a mathematical term for a
-              function which defines a curve by using a series of control
-              points, such as a Bézier curve.
-              <mediaobject><imageobject><imagedata fileref="images/menus/250px-Bezier.png" format="PNG"/></imageobject></mediaobject>
-              See Wikipedia for more information.
-            </para></footnote>
+        <para>
+          <emphasis>Error Threshold</emphasis>:
+          Amount of error at which a fitted spline<footnote><para>
+            <quote>Spline</quote> is a mathematical term for a
+            function which defines a curve by using a series of control
+            points, such as a Bézier curve.
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                  fileref="images/menus/250px-Bezier.png"/>
+              </imageobject>
+            </mediaobject>
+            See Wikipedia for more information.
+          </para></footnote>
           is unacceptable. If any pixel is further away than this from the
           fitted curve, the algorithm tries again.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Alternative Surround</emphasis>:
+        <para>
+          <emphasis>Filter Alternative Surround</emphasis>:
           A second number of adjacent points to consider
           when filtering.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Epsilon</emphasis>:
+        <para>
+          <emphasis>Filter Epsilon</emphasis>:
           If the angles between the vectors produced by
           <emphasis>Filter Surround</emphasis> and
           <emphasis>Filter Alternative Surround</emphasis>
@@ -266,7 +264,8 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Iteration Count</emphasis>:
+        <para>
+          <emphasis>Filter Iteration Count</emphasis>:
           The number of times to smooth the original data points.
           Increasing this number dramatically, to 50 or
           so, can produce vastly better results.  But if
@@ -275,30 +274,35 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Percent</emphasis>: To produce the new point,
+        <para>
+          <emphasis>Filter Percent</emphasis>: To produce the new point,
           use the old point plus this times the neighbors.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Secondary Surround</emphasis>:
+        <para>
+          <emphasis>Filter Secondary Surround</emphasis>:
           Number of adjacent points to consider if
           <emphasis>Filter Surround</emphasis> points defines a
           straight line.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Filter Surround</emphasis>:
+        <para>
+          <emphasis>Filter Surround</emphasis>:
           Number of adjacent points to consider when filtering.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Keep Knees</emphasis>:
+        <para>
+          <emphasis>Keep Knees</emphasis>:
           This check box says whether or not to remove <quote>knee</quote>
           points after finding the outline.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Line Reversion Threshold</emphasis>:
+        <para>
+          <emphasis>Line Reversion Threshold</emphasis>:
           If a spline is closer to a straight line than this value,
           it remains a straight line, even if it would otherwise
           be changed back to a curve. This is weighted by the
@@ -307,20 +311,23 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Line Threshold</emphasis>:
+        <para>
+          <emphasis>Line Threshold</emphasis>:
           How many pixels (on the average) a spline can
           diverge from the line determined by its endpoints
           before it is changed to a straight line.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Reparametrize Improvement</emphasis>:
+        <para>
+          <emphasis>Reparametrize Improvement</emphasis>:
           If reparameterization doesn't improve the fit by this
           much percent, the algorithm stops doing it.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Reparametrize Threshold</emphasis>:
+        <para>
+          <emphasis>Reparametrize Threshold</emphasis>:
           Amount of error at which it is pointless to reparameterize.
           This happens, for example, when the algorithm is trying to fit the
           outline of the outside of an <quote>O</quote> with a single spline.
@@ -330,26 +337,30 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Subdivide Search</emphasis>:
+        <para>
+          <emphasis>Subdivide Search</emphasis>:
           Percentage of the curve away from the worst point
           to look for a better place to subdivide.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Subdivide Surround</emphasis>:
+        <para>
+          <emphasis>Subdivide Surround</emphasis>:
           Number of points to consider when deciding whether
           a given point is a better place to subdivide.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Subdivide Threshold</emphasis>:
+        <para>
+          <emphasis>Subdivide Threshold</emphasis>:
           How many pixels a point can diverge from a straight
           line and still be considered a better place to
           subdivide.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Tangent Surround</emphasis>:
+        <para>
+          <emphasis>Tangent Surround</emphasis>:
           Number of points to look at on either side of a
           point when computing the approximation to the
           tangent at that point.
diff --git a/src/menus/select/feather.xml b/src/menus/select/feather.xml
index b044f7a..dec83c3 100644
--- a/src/menus/select/feather.xml
+++ b/src/menus/select/feather.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -7,22 +8,13 @@
   2005/09/16 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-feather">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-14</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Feather</phrase>
-  </title>
+  <title>Feather</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Feather selection edges</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Feather</guimenuitem> command feathers the edges of
     the selection. This creates a smooth transition between the selection
@@ -30,31 +22,28 @@
     <quote>Feather Edges</quote> option of the selection tools, but you
     may feather them again with this command.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Feather</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Feather</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Feather Selection</quote> dialog window
-      </phrase>
+      Description of the <quote>Feather Selection</quote> dialog window
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Feather Selection</quote> dialog
-        </phrase>
-      </title>
+      <title>The <quote>Feather Selection</quote> dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/selection-feather.png" format="PNG"/>
diff --git a/src/menus/select/grow.xml b/src/menus/select/grow.xml
index d0b81e2..0159c44 100644
--- a/src/menus/select/grow.xml
+++ b/src/menus/select/grow.xml
@@ -1,59 +1,46 @@
 <?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:
-     2009-01-10 j.h: reviewed for v2.6
-     2007-05-12 Added Spanish translation by AntI
-     2006-01-28 en;fr reviewed by j.h - sect3 added for rounded corners
-     2005/09/14 reviewed; de added by axel.wernicke
+  2009-01-10 j.h: reviewed for v2.6
+  2007-05-12 Added Spanish translation by AntI
+  2006-01-28 en;fr reviewed by j.h - sect3 added for rounded corners
+  2005-09-14 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-grow">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-15</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Grow</phrase>
-  </title>
+  <title>Grow</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Grow selection</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Grow</guimenuitem> command increases the size of a
     selection in the current image. It works in a similar way to the
     <link linkend="gimp-selection-shrink">Shrink</link> command, which
     reduces the size of a selection.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Grow</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Grow</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        Description of the <quote>Grow Selection</quote> dialog
-      </phrase>
-    </title>
+    <title>Description of the <quote>Grow Selection</quote> dialog</title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Grow Selection</quote> dialog window
-        </phrase>
-      </title>
+      <title>The <quote>Grow Selection</quote> dialog window</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/selection-grow.png" format="PNG"/>
@@ -73,29 +60,28 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>A Peculiarity of Rectangular Selections</phrase>
-    </title>
+    <title>A Peculiarity of Rectangular Selections</title>
     <para>
       When you grow a rectangular selection, the resulting selection has
       rounded corners. The reason for this is shown in the image below:
     </para>
     <figure>
       <title>
-        <phrase>
-          Why growing a rectangular selection results in rounded corners
-        </phrase>
+        Why growing a rectangular selection results in rounded corners
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/selection-grow-corners.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/selection-grow-corners.png"/>
         </imageobject>
         <caption/>
       </mediaobject>
     </figure>
     <para>
-      If you do not want rounded corners, you can use the <link linkend="script-fu-selection-rounded-rectangle">Rounded
+      If you do not want rounded corners, you can use the
+      <link linkend="script-fu-selection-rounded-rectangle">Rounded
       Rectangle</link> command with a 0% radius.
     </para>
   </sect3>
diff --git a/src/menus/select/invert.xml b/src/menus/select/invert.xml
index 7fa8913..cf6eb53 100644
--- a/src/menus/select/invert.xml
+++ b/src/menus/select/invert.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:
   2009-01-10 j.h: reviewed for v2.6
   2008-01-02 Added access through Selection Editor
@@ -9,23 +10,13 @@
   2005/09/14 de created by axel.wernicke
 -->
 <sect2 id="gimp-selection-invert">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark>Reviewed for v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Invert</phrase>
-  </title>
+  <title>Invert</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Invert selection</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Invert</guimenuitem> command inverts the selection
     in the current layer. That means that all of the layer contents which
@@ -39,10 +30,9 @@
       <link linkend="gimp-layer-invert">Invert colors</link> command.
     </para>
   </warning>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -61,7 +51,8 @@
       </listitem>
       <listitem>
         <para>
-          or click on the corresponding icon in the <link linkend="gimp-selection-dialog">Selection Editor</link>
+          or click on the corresponding icon in the
+          <link linkend="gimp-selection-dialog">Selection Editor</link>
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/select/none.xml b/src/menus/select/none.xml
index 813297d..2b66457 100644
--- a/src/menus/select/none.xml
+++ b/src/menus/select/none.xml
@@ -1,41 +1,35 @@
 <?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-05-12 Added Spanish translation by AntI
   2006-01-28 en;fr reviewed by j.h
   2005/09/14 de created by axel.wernicke
 -->
 <sect2 id="gimp-selection-none">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-15</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>None</phrase>
-  </title>
+  <title>None</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Delete selections</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>None</guimenuitem> command cancels all selections in
     the image. If there are no selections, the command doesn't do anything.
     Floating selections are not affected.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>None</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>None</guimenuitem>
+          </menuchoice>.
           In addition, you can use the
           <link linkend="gimp-selection-dialog">Selection Editor</link>
           to access it.
@@ -44,7 +38,11 @@
       <listitem>
         <para>
           You can also use the keyboard shortcut
-          <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>.
+          <keycombo>
+            <keycap>Shift</keycap>
+            <keycap>Ctrl</keycap>
+            <keycap>A</keycap>
+          </keycombo>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/select/rounded-rectangle.xml b/src/menus/select/rounded-rectangle.xml
index e1dcf6a..d0f663a 100644
--- a/src/menus/select/rounded-rectangle.xml
+++ b/src/menus/select/rounded-rectangle.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:
   2009-01-11 j.h: reviewed for v2.6
   2007-05-12 Adde Spanish translation by AntI
   2005-09-6 reviewed; de added by axel.wernicke
 -->
 <sect2 id="script-fu-selection-rounded-rectangle">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-21</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Rounded Rectangle</phrase>
-  </title>
+  <title>Rounded Rectangle</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Rounded Rectangle</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Rounded rectangle</primary>
   </indexterm>
+
   <para>
     The <quote>Rounded Rectangle</quote> Script-Fu command converts an
     existing selection (rectangular, elliptical or other shape) into a
@@ -32,34 +24,33 @@
     toward the inside (concave) or toward the outside (convex). To do this,
     the command adds or removes circles at the corners of the selection.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menu bar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Rounded Rectangle</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Rounded Rectangle</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Rounded Rectangle</quote> Dialog Window
-      </phrase>
+      Description of the <quote>Rounded Rectangle</quote> Dialog Window
+
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Rounded Rectangle</quote> dialog
-        </phrase>
-      </title>
+      <title>The <quote>Rounded Rectangle</quote> dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/rounded-rect-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/rounded-rect-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/menus/select/sharpen.xml b/src/menus/select/sharpen.xml
index 1117ebf..e960cdf 100644
--- a/src/menus/select/sharpen.xml
+++ b/src/menus/select/sharpen.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -7,22 +8,13 @@
   2005/09/14 de created by axel.wernicke
 -->
 <sect2 id="gimp-selection-sharpen">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-15</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Sharpen</phrase>
-  </title>
+  <title>Sharpen</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Remove the feathering of border selection</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Sharpen</guimenuitem> command reduces the amount of
     blur or fuzziness around the edge of a selection. It reverses the effect
@@ -36,15 +28,17 @@
       <link linkend="plug-in-sharpen">Sharpen</link> filter.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Sharpen</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Sharpen</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/select/shrink.xml b/src/menus/select/shrink.xml
index 01f47ef..a5c5f77 100644
--- a/src/menus/select/shrink.xml
+++ b/src/menus/select/shrink.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:
   2009-01-10 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -7,22 +8,13 @@
   2005/09/12 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-shrink">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-15</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Shrink</phrase>
-  </title>
+  <title>Shrink</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Shrink the size of selection</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Shrink</guimenuitem> command reduces the size of the
     selected area by moving each point on the edge of the selection a
@@ -31,33 +23,30 @@
     shape of the feathering may be altered at the corners or at points of
     sharp curvature.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Shrink...</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Shrink...</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        Description of the <quote>Shrink</quote> dialog
-      </phrase>
-    </title>
+    <title>Description of the <quote>Shrink</quote> dialog</title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Shrink Selection</quote> dialog</phrase>
-      </title>
+      <title>The <quote>Shrink Selection</quote> dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/shrink-selection-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/shrink-selection-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/menus/select/to-channel.xml b/src/menus/select/to-channel.xml
index f6135ce..ef14a9f 100644
--- a/src/menus/select/to-channel.xml
+++ b/src/menus/select/to-channel.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:
   2009-01-11 j.h: reviewed for v2.6
   2007-05-12 Added Spanish translation by AntI
@@ -7,22 +8,13 @@
   2005/09/12 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-selection-to-channel">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-15</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Save to Channel</phrase>
-  </title>
+  <title>Save to Channel</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Save selection to channel</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Select to Channel</guimenuitem> command saves the
     selection as a channel. The channel can then be used as a channel
@@ -35,15 +27,17 @@
     selection to an alpha channel so that you can apply an alpha to logo
     filter to this selection.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Select</guimenu><guimenuitem>Save to Channel</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Select</guimenu>
+            <guimenuitem>Save to Channel</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/view/introduction.xml b/src/menus/view/introduction.xml
index a6b4943..4d27791 100644
--- a/src/menus/view/introduction.xml
+++ b/src/menus/view/introduction.xml
@@ -1,25 +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-04-19 ude: updated screenshots ('en','de')
   2007-05-20 Added Spanish translation by AntI
   2005-09-03 de created by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-view-introduction">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-04-19</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>
-      Introduction to the <quote>View</quote> Menu
-    </phrase>
-  </title>
+  <title>Introduction to the <quote>View</quote> Menu</title>
+
   <indexterm>
     <primary>View</primary>
     <secondary>Introduction</secondary>
diff --git a/src/menus/view/navigwindow.xml b/src/menus/view/navigwindow.xml
index 6953b82..c754369 100644
--- a/src/menus/view/navigwindow.xml
+++ b/src/menus/view/navigwindow.xml
@@ -1,38 +1,30 @@
 <?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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/24 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-navigation">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Navigation Window</phrase>
-  </title>
+  <title>Navigation Window</title>
+
   <indexterm>
     <primary>Navigation</primary>
     <secondary>View Navigation window</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Navigation Window</guimenuitem> command opens the
     <link linkend="gimp-navigation-dialog">navigation window</link>. This
     allows you to easily navigate through the image, to set zoom levels and
     to move the visible parts of the image. You can find more information
-    about using it in the <link linkend="gimp-navigation-dialog">Navigation dialog</link> chapter.
+    about using it in the
+    <link linkend="gimp-navigation-dialog">Navigation dialog</link> chapter.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -46,7 +38,13 @@
       <listitem>
         <para>
           You can also access it more rapidly by clicking on the
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/using/stock-navigation-16.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata fileref="images/using/stock-navigation-16.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           icon in the lower right corner of the image window.
         </para>
       </listitem>
diff --git a/src/menus/view/new.xml b/src/menus/view/new.xml
index d8bc9d5..88cd22c 100644
--- a/src/menus/view/new.xml
+++ b/src/menus/view/new.xml
@@ -1,26 +1,18 @@
 <?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:
   2009-01-16 j.h: updated to v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/24 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-new">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>New View</phrase>
-  </title>
+  <title>New View</title>
+
   <indexterm>
     <primary>New View</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>New View</guimenuitem> command creates a new image
     window for the current image, which you can set up differently from
@@ -41,10 +33,9 @@
     you have made changes to the image which you have not yet saved, you
     are asked for confirmation.
   </para>-->
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-grid.xml b/src/menus/view/show-grid.xml
index 496c06b..64ddc0d 100644
--- a/src/menus/view/show-grid.xml
+++ b/src/menus/view/show-grid.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005-10-24 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-grid">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Grid</phrase>
-  </title>
+  <title>Show Grid</title>
+
   <indexterm>
     <primary>Grid</primary>
     <secondary>Show/Mask Grid</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Grid</primary>
   </indexterm>
+
   <para>
     By using the <guimenuitem>Show Grid</guimenuitem> command, you can
     enable and disable displaying the grid. When you enable it, the grid
@@ -44,10 +36,9 @@
       <link linkend="gimp-view-snap-to-grid">Snap to Grid</link> command.
     </para>
   </tip>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-guides.xml b/src/menus/view/show-guides.xml
index c74fa2d..26193b1 100644
--- a/src/menus/view/show-guides.xml
+++ b/src/menus/view/show-guides.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-guides">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Guides</phrase>
-  </title>
+  <title>Show Guides</title>
+
   <indexterm>
     <primary>Guides</primary>
     <secondary>Show/Mask Guides</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Guides</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Guides</guimenuitem> command enables and disables
     displaying of <link linkend="glossary-guides">Guides</link> in the
@@ -35,10 +27,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -52,7 +43,9 @@
       <listitem>
         <para>
           or by using the keyboard shortcut
-          <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>T</keycap></keycombo>.
+          <keycombo>
+            <keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>T</keycap>
+          </keycombo>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/view/show-layer-boundary.xml b/src/menus/view/show-layer-boundary.xml
index 6470d07..7abe1b6 100644
--- a/src/menus/view/show-layer-boundary.xml
+++ b/src/menus/view/show-layer-boundary.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-layer-boundary">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Layer Boundary</phrase>
-  </title>
+  <title>Show Layer Boundary</title>
+
   <indexterm>
     <primary>Layer boundary</primary>
     <secondary>Show/mask layer boundary</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Layer Boundary</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Layer Boundary</guimenuitem> command enables and
     disables displaying the yellow dotted line that surrounds a layer
@@ -37,10 +29,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-menubar.xml b/src/menus/view/show-menubar.xml
index 0b74fb4..2a2540c 100644
--- a/src/menus/view/show-menubar.xml
+++ b/src/menus/view/show-menubar.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005-10-23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-menubar">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Menubar</phrase>
-  </title>
+  <title>Show Menubar</title>
+
   <indexterm>
     <primary>Menu-bar</primary>
     <secondary>Show/Mask menu bar</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Menubar</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Menubar</guimenuitem> command enables and disables
     displaying the menubar. It may be useful to disable it if you are
@@ -37,10 +29,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-rulers.xml b/src/menus/view/show-rulers.xml
index edd5f3b..555b613 100644
--- a/src/menus/view/show-rulers.xml
+++ b/src/menus/view/show-rulers.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005-10-23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-rulers">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Rulers</phrase>
-  </title>
+  <title>Show Rulers</title>
+
   <indexterm>
     <primary>Rulers</primary>
     <secondary>Show/Mask rulers</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Rulers</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Rulers</guimenuitem> command enables and disables
     displaying the rulers. It may be useful to disable them if you are
@@ -35,10 +27,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -52,7 +43,9 @@
       <listitem>
         <para>
           or by using the keyboard shortcut
-          <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>R</keycap></keycombo>.
+          <keycombo>
+            <keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>R</keycap>
+          </keycombo>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/view/show-sample-points.xml b/src/menus/view/show-sample-points.xml
index 0fc3bec..166fddb 100644
--- a/src/menus/view/show-sample-points.xml
+++ b/src/menus/view/show-sample-points.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:
   2009-01-16 j.h: reviewed for v2.6
   2008-07-20 KoSt: added 'no'
@@ -7,18 +8,8 @@
 -->
 
 <sect2 id="gimp-view-show-sample-points">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-04-19</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Sample Points</phrase>
-  </title>
+  <title>Show Sample Points</title>
+
   <indexterm>
     <primary>Sample Points</primary>
   </indexterm>
@@ -28,10 +19,9 @@
     pixels in the <link linkend="gimp-sample-point-dialog">sample points
     dialog</link>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-scrollbars.xml b/src/menus/view/show-scrollbars.xml
index 652cd9e..bc4ea8a 100644
--- a/src/menus/view/show-scrollbars.xml
+++ b/src/menus/view/show-scrollbars.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005-10-23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-scrollbars">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Scrollbars</phrase>
-  </title>
+  <title>Show Scrollbars</title>
+
   <indexterm>
     <primary>Scroll-bars</primary>
     <secondary>Show/Mask scrollbars</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Scrollbars</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Scrollbars</guimenuitem> command enables and
     disables displaying the scrollbars. It may be useful to disable them if
@@ -36,10 +28,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-selection.xml b/src/menus/view/show-selection.xml
index 2893f16..f77845f 100644
--- a/src/menus/view/show-selection.xml
+++ b/src/menus/view/show-selection.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-selection">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Selection</phrase>
-  </title>
+  <title>Show Selection</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Selection boundary</secondary>
@@ -26,6 +17,7 @@
   <indexterm>
     <primary>Show Selection</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Selection</guimenuitem> command enables and
     disables displaying the dotted line surrounding the selection in the
@@ -37,10 +29,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/show-statusbar.xml b/src/menus/view/show-statusbar.xml
index 14388ff..4d40080 100644
--- a/src/menus/view/show-statusbar.xml
+++ b/src/menus/view/show-statusbar.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-show-statusbar">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Show Statusbar</phrase>
-  </title>
+  <title>Show Statusbar</title>
+
   <indexterm>
     <primary>Status bar</primary>
     <secondary>Show/Hide status bar</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Show Statusbar</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Show Statusbar</guimenuitem> command enables and
     disables displaying the status bar. It may be useful to disable it when
@@ -36,10 +28,9 @@
     <link linkend="gimp-prefs-image-window">Image Window Appearance</link>
     dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/shrink-wrap.xml b/src/menus/view/shrink-wrap.xml
index 543334c..c887139 100644
--- a/src/menus/view/shrink-wrap.xml
+++ b/src/menus/view/shrink-wrap.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-shrink-wrap">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Shrink Wrap</phrase>
-  </title>
+  <title>Shrink Wrap</title>
+
   <indexterm>
     <primary>Shrink Wrap</primary>
   </indexterm>
@@ -41,10 +32,9 @@
       your computer, or in the worst case, might not be available at all.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/snap-to-grid.xml b/src/menus/view/snap-to-grid.xml
index 12e4300..ad6b4f8 100644
--- a/src/menus/view/snap-to-grid.xml
+++ b/src/menus/view/snap-to-grid.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005-10-23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-snap-to-grid">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Snap to Grid</phrase>
-  </title>
+  <title>Snap to Grid</title>
+
   <indexterm>
     <primary>Grid</primary>
     <secondary>Snap to Grid</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Snap to Grid</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Snap to Grid</guimenuitem> command enables and disables
     snap to grid. When snap to grid is enabled, the grid you set (see
@@ -33,10 +25,9 @@
     pull on it when it approaches. This is enormously useful for accurate
     placement of image elements.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/view/snap-to-guides.xml b/src/menus/view/snap-to-guides.xml
index 57c999d..e96c753 100644
--- a/src/menus/view/snap-to-guides.xml
+++ b/src/menus/view/snap-to-guides.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:
   2009-01-16 j.h: reviewed for v2.6
   2007-05-20 Added Spanish translation by AntI
   2005/10/23 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-snap-to-guides">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-10</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Snap to Guides</phrase>
-  </title>
+  <title>Snap to Guides</title>
+
   <indexterm>
     <primary>Guides</primary>
     <secondary>Snap to Guides</secondary>
@@ -25,6 +16,7 @@
   <indexterm>
     <primary>Snap to Guides</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Snap to Guides</guimenuitem> command enables and
     disables snap to guides. When snap to guides is enabled, the guides
@@ -33,10 +25,9 @@
     appear to pull on it when it approaches. This is enormously useful for
     accurate placement of image elements.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/windows-open-recent-docks.xml b/src/menus/windows-open-recent-docks.xml
index 1844fdb..e9437ce 100644
--- a/src/menus/windows-open-recent-docks.xml
+++ b/src/menus/windows-open-recent-docks.xml
@@ -6,21 +6,7 @@
 -->
 <sect2 id="gimp-windows-open-recent-dock"
        xmlns:xi="http://www.w3.org/2001/XInclude";>
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-07</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-
-  <title>
-    <phrase>
-      The <quote>Recently Closed Docks</quote> submenu
-    </phrase>
-  </title>
+  <title>The <quote>Recently Closed Docks</quote> submenu</title>
 
   <indexterm>
     <primary>Docks</primary>
@@ -34,9 +20,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
 
     <para>
       You can access this command from the image menubar through
@@ -47,4 +31,4 @@
     </para>
   </sect3>
 
-</sect2>
\ No newline at end of file
+</sect2>
diff --git a/src/menus/windows-show-docks.xml b/src/menus/windows-show-docks.xml
index 7f1dd42..12def31 100644
--- a/src/menus/windows-show-docks.xml
+++ b/src/menus/windows-show-docks.xml
@@ -6,21 +6,7 @@
 -->
 <sect2 id="gimp-windows-show-dock"
        xmlns:xi="http://www.w3.org/2001/XInclude";>
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-07</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-
-  <title>
-    <phrase>
-      The <quote>Dockable Dialogs</quote> submenu
-    </phrase>
-  </title>
+  <title>The <quote>Dockable Dialogs</quote> submenu</title>
 
   <indexterm>
     <primary>Docks</primary>
@@ -28,9 +14,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>The <quote>Dockable Dialogs</quote> list</phrase>
-    </title>
+    <title>The <quote>Dockable Dialogs</quote> list</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/windows-dockable_dialogs.png"
@@ -50,9 +34,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <para>
       You can access this command from the image menubar through
       <menuchoice>



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