[gimp-help-2] Updated toolbox xml files



commit 51fb9db5e290a23e2dba7c28f81ade0021c45e85
Author: Julien Hardelin <jm hard wanadoo fr>
Date:   Sun Apr 19 15:23:22 2009 +0200

    Updated toolbox xml files
---
 ChangeLog                                      |   51 ++++++++++
 src/toolbox/about-common-brush-options.xml     |    9 --
 src/toolbox/about-common-options-display.xml   |    5 -
 src/toolbox/about-common-painting-options.xml  |    8 --
 src/toolbox/about-common-select-modifiers.xml  |   10 --
 src/toolbox/about-common-select-options.xml    |    9 --
 src/toolbox/about-common-transform-options.xml |   13 +--
 src/toolbox/intro.xml                          |   16 ++--
 src/toolbox/tool-align.xml                     |   21 ++---
 src/toolbox/tool-brightness-contrast.xml       |   46 +++++++---
 src/toolbox/tool-brush.xml                     |    2 +-
 src/toolbox/tool-by-color-select.xml           |   45 +++------
 src/toolbox/tool-clone.xml                     |   16 +++-
 src/toolbox/tool-color-balance.xml             |   60 +++++++-----
 src/toolbox/tool-color-picker.xml              |   76 +++++----------
 src/toolbox/tool-colorize.xml                  |   59 +++++++----
 src/toolbox/tool-crop.xml                      |   72 +++++---------
 src/toolbox/tool-curves.xml                    |   67 ++++++++------
 src/toolbox/tool-desaturate.xml                |   32 ++-----
 src/toolbox/tool-dodge-burn.xml                |    5 +-
 src/toolbox/tool-ellipse-select.xml            |    2 +-
 src/toolbox/tool-flip.xml                      |    9 +-
 src/toolbox/tool-foreground-select.xml         |   54 ++++-------
 src/toolbox/tool-free-select.xml               |   33 +-----
 src/toolbox/tool-fuzzy-select.xml              |   11 ++-
 src/toolbox/tool-heal.xml                      |    8 +-
 src/toolbox/tool-hue-saturation.xml            |   46 +++++++---
 src/toolbox/tool-iscissors.xml                 |   36 +++-----
 src/toolbox/tool-levels.xml                    |   51 +++++++----
 src/toolbox/tool-measure.xml                   |  122 +++++++++--------------
 src/toolbox/tool-move.xml                      |    7 +-
 src/toolbox/tool-paintbrush.xml                |    2 +-
 src/toolbox/tool-path.xml                      |   90 ++++++++----------
 src/toolbox/tool-perspective-clone.xml         |   13 +--
 src/toolbox/tool-posterize.xml                 |    8 +-
 src/toolbox/tool-rect-select.xml               |   78 +++++++++-------
 src/toolbox/tool-rotate.xml                    |   12 +--
 src/toolbox/tool-scale.xml                     |   14 +--
 src/toolbox/tool-select.xml                    |   43 ++-------
 src/toolbox/tool-shear.xml                     |   12 +--
 src/toolbox/tool-smudge.xml                    |   10 +-
 src/toolbox/tool-text.xml                      |   71 ++++++--------
 src/toolbox/tool-threshold.xml                 |   50 +++++++---
 src/toolbox/tool-transform.xml                 |   71 +++++++-------
 src/toolbox/tool-zoom.xml                      |   63 ++++---------
 src/toolbox/toolbox-color-area.xml             |    2 +-
 src/toolbox/tools-painting.xml                 |   12 +--
 47 files changed, 712 insertions(+), 840 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af83de0..b28c1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2009-04-19 Julien hardelin <jm hard wanadoo fr>
+
+        * src/toolbox/about-common-brush-options.xml
+        * src/toolbox/about-common-options-display.xml
+        * src/toolbox/about-common-painting-options.xml
+        * src/toolbox/about-common-select-modifiers.xml
+        * src/toolbox/about-common-select-options.xml
+        * src/toolbox/about-common-transform-options.xml
+        * src/toolbox/intro.xml
+        * src/toolbox/tool-align.xml
+        * src/toolbox/tool-brightness-contrast.xml
+        * src/toolbox/tool-brush.xml
+        * src/toolbox/tool-by-color-select.xml
+        * src/toolbox/tool-clone.xml
+        * src/toolbox/tool-color-balance.xml
+        * src/toolbox/tool-color-picker.xml
+        * src/toolbox/tool-colorize.xml
+        * src/toolbox/tool-crop.xml
+        * src/toolbox/tool-curves.xml
+        * src/toolbox/tool-desaturate.xml
+        * src/toolbox/tool-dodge-burn.xml
+        * src/toolbox/tool-ellipse-select.xml
+        * src/toolbox/tool-flip.xml
+        * src/toolbox/tool-foreground-select.xml
+        * src/toolbox/tool-free-select.xml
+        * src/toolbox/tool-fuzzy-select.xml
+        * src/toolbox/tool-heal.xml
+        * src/toolbox/tool-hue-saturation.xml
+        * src/toolbox/tool-iscissors.xml
+        * src/toolbox/tool-levels.xml
+        * src/toolbox/tool-measure.xml
+        * src/toolbox/tool-move.xml
+        * src/toolbox/tool-paintbrush.xml
+        * src/toolbox/tool-path.xml
+        * src/toolbox/tool-perspective-clone.xml
+        * src/toolbox/tool-posterize.xml
+        * src/toolbox/tool-rect-select.xml
+        * src/toolbox/tool-rotate.xml
+        * src/toolbox/tool-scale.xml
+        * src/toolbox/tool-select.xml
+        * src/toolbox/tool-shear.xml
+        * src/toolbox/tool-smudge.xml
+        * src/toolbox/tool-text.xml
+        * src/toolbox/tool-threshold.xml
+        * src/toolbox/tool-transform.xml
+        * src/toolbox/tool-zoom.xml
+        * src/toolbox/toolbox-color-area.xml
+        * src/toolbox/tools-painting.xml: replaced '<guiicon><inlinemediaobject...'
+        with '<guiicon><inlinegraphic...' to avoid placeholders in PO files.
+        Updated 'presets' options in color tools.
+
 2009-04-15  Marco Ciampa  <ciampix libero it>
 
 	* src/toolbox/tool-levels.xml
diff --git a/src/toolbox/about-common-brush-options.xml b/src/toolbox/about-common-brush-options.xml
index af37c3a..211a700 100644
--- a/src/toolbox/about-common-brush-options.xml
+++ b/src/toolbox/about-common-brush-options.xml
@@ -4,15 +4,6 @@
   This file is meant to be included by the painting tools files:
   src/toolbox/tool-{pencil, paintbrush, eraser, airbrush, ink, clone,
   convolve, dodge-burn, smudge}.xml.
-
-  TODO cs es it nl ru ko zh_CN:  If you want to use his file:
-      1. translate src/toolbox/tool-brush.xml, especially
-         section "Tool Options" ("Tool Options shared by all brush tools");
-      2. translate the note below, link target may be
-         "gimp-tool-brush" or "gimp-tool-brush-options";
-      3. check tool-{pencil, paintbrush, eraser, airbrush, ink, clone,
-         convolve, dodge-burn, smudge}.xml;
-      4. enable this note by adding your "lang" attribute.
 -->
 <note>
   <para>
diff --git a/src/toolbox/about-common-options-display.xml b/src/toolbox/about-common-options-display.xml
index d3e531b..36b97be 100644
--- a/src/toolbox/about-common-options-display.xml
+++ b/src/toolbox/about-common-options-display.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.docbook.org/xml/4.3/docbookx.dtd";>
-<!--
-  This file is meant to be included by the selection tools files:
-      src/toolbox/tool-{rect,ellipse,fuzzy,by-color,iscissors}-select.xml.
--->
-
 
   <para>
     Normally, tool options are displayed in a window attached under the
diff --git a/src/toolbox/about-common-painting-options.xml b/src/toolbox/about-common-painting-options.xml
index ed8ba39..e392b72 100644
--- a/src/toolbox/about-common-painting-options.xml
+++ b/src/toolbox/about-common-painting-options.xml
@@ -3,14 +3,6 @@
 <!--
   This file is meant to be included by the painting tools files:
       src/toolbox/tool-{pencil,paintbrush,ink}.xml.
-
-  TODO cs es it nl ko zh_CN:  If you want to use his file:
-      1. translate src/toolbox/tools-painting.xml, especially
-         section "Options";
-      2. translate the note below, link target may be
-         "gimp-tool-painting" or "gimp-tool-painting-options";
-      3. check tool-{pencil,paintbrush,ink}.xml;
-      4. enable this note by adding your "lang" attribute.
 -->
 <note>
   <para>
diff --git a/src/toolbox/about-common-select-modifiers.xml b/src/toolbox/about-common-select-modifiers.xml
index 65f43ad..33f2a94 100644
--- a/src/toolbox/about-common-select-modifiers.xml
+++ b/src/toolbox/about-common-select-modifiers.xml
@@ -3,17 +3,7 @@
 <!--
   This file is meant to be included by the selection tools files:
       src/toolbox/tool-{rect,ellipse}-select.xml.
-
-  Using this file:
-      1. translate src/toolbox/tool-select.xml, especially section
-         "Key modifiers";
-      2. adapt/translate the note below; link target may be
-         "gimp-tool-select" or "gimp-tools-select-modifiers";
-      3. include this file from tool-{rect,ellipse}-select.xml, remove
-         the original note there;
-      4. enable this note by adding your "lang" attribute.
 -->
-<!--TODO es it ko nl pl zh_CN: edit/use this file(?)-->
 <note>
   <para>
     See <link linkend="gimp-tool-select">Selection Tools</link> for
diff --git a/src/toolbox/about-common-select-options.xml b/src/toolbox/about-common-select-options.xml
index d19c6f2..fcf4af1 100644
--- a/src/toolbox/about-common-select-options.xml
+++ b/src/toolbox/about-common-select-options.xml
@@ -3,16 +3,7 @@
 <!--
   This file is meant to be included by the selection tools files:
       src/toolbox/tool-{rect,ellipse,fuzzy,by-color,iscissors}-select.xml.
-
-  Using this file:
-      1. translate src/toolbox/tool-select.xml, especially "Options" section;
-      2. adapt/translate the note below; link target may be
-         "gimp-tool-select" or "gimp-tools-select-options";
-      3. include this file from tool-{rect,ellipse,...}-select.xml,
-         remove the original note there;
-      4. enable this note by adding your "lang" attribute.
 -->
-<!--TODO es it ko nl pl zh_CN: edit/use this file(?)-->
 <note>
   <para>
     See <link linkend="gimp-tool-select">Selection Tools</link>
diff --git a/src/toolbox/about-common-transform-options.xml b/src/toolbox/about-common-transform-options.xml
index 0a3f08c..828ce4e 100644
--- a/src/toolbox/about-common-transform-options.xml
+++ b/src/toolbox/about-common-transform-options.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
-<!-- 
+<!--
   This file is meant to be included by the transform tools files:
       src/toolbox/tool-{move,rotate,scale,shear,perspective,flip}.xml.
-
-  TODO cs it nl ru ko zh_CN:  If you want to use his file:
-      1. translate src/toolbox/tool-transform.xml, especially
-         section "Tool Options" ("Common options of transform tools");
-      2. translate the note below, link target may be
-         "gimp-tool-transform" or "gimp-tool-transform-options";
-      3. check tool-{move,rotate,scale,shear,perspective,flip}.xml;
-      4. enable this note by adding your "lang" attribute.
 -->
 <note>
   <para>
-    These options are described in <link linkend="gimp-tool-transform">Transform tools common options</link>.
+    These options are described in
+    <link linkend="gimp-tool-transform">Transform tools common options</link>.
   </para>
 </note>
diff --git a/src/toolbox/intro.xml b/src/toolbox/intro.xml
index 2595e09..9253647 100644
--- a/src/toolbox/intro.xml
+++ b/src/toolbox/intro.xml
@@ -24,6 +24,14 @@
     within The <acronym>GIMP</acronym>'s toolbox are discussed in detail here.
   </para>
   <para>
+    (In case you're curious, in GIMP lingo a "tool" is a way of acting on an
+    image that requires access to its display, either to let you indicate what
+    you want to do by moving the pointer around inside the display, or to show
+    you interactively the results of changes that you have made. But if you
+    want to think of a tool as a saw, and an image as a piece of wood, it
+    probably won't do you a great deal of harm.)
+  </para>
+  <para>
     GIMP has a diverse assortment of tools that let you perform a large
     variety of tasks. The tools can be thought of as falling into five
     categories: <emphasis>Selection tools</emphasis>,
@@ -36,14 +44,6 @@
     which don't fall into the other four categories.
   </para>
   <para>
-    (In case you're curious, in GIMP lingo a "tool" is a way of acting on an
-    image that requires access to its display, either to let you indicate what
-    you want to do by moving the pointer around inside the display, or to show
-    you interactively the results of changes that you have made. But if you
-    want to think of a tool as a saw, and an image as a piece of wood, it
-    probably won't do you a great deal of harm.)
-  </para>
-  <para>
     Most tools can be activated by clicking on an icon in the Toolbox.
     Some, however (namely, the Color tools), are accessible only via
     the menus, either as
diff --git a/src/toolbox/tool-align.xml b/src/toolbox/tool-align.xml
index 9410c6b..56229cf 100644
--- a/src/toolbox/tool-align.xml
+++ b/src/toolbox/tool-align.xml
@@ -51,25 +51,22 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Transform Tools</guisubmenu>
             <guimenuitem>Align</guimenuitem>
-          </menuchoice>.
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon:
+          by clicking on the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-align-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
-          in the toolbox.
+          in the toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the <keycap>Q</keycap> keyboard shortcut.
+          by using the <keycap>Q</keycap> keyboard shortcut.
         </para>
       </listitem>
     </itemizedlist>
@@ -79,9 +76,7 @@
     <title>Key modifiers (Defaults)</title>
     <variablelist>
       <varlistentry>
-        <term>
-          <keycap>Shift</keycap>
-        </term>
+        <term><keycap>Shift</keycap></term>
         <listitem>
           <para>
             You can select several layers by holding <keycap>Shift</keycap>
@@ -294,7 +289,7 @@
             on the
             <guiicon><inlinegraphic
               fileref="images/tool-options/stock-gravity-east-24.png"/>
-            </guiicon> button (Related to). The red layer is aligned with
+            </guiicon> button (Related to). The red layer alignes with
             the right side of the selection.
           </para>
         </caption>
@@ -344,7 +339,7 @@
             <guiicon><inlinegraphic
               fileref="images/tool-options/stock-gravity-west-24.png"/>
             </guiicon>
-            button, both layers are aligned with the left side of the
+            button, both layers aligne with the left side of the
             selection.
           </para>
         </caption>
diff --git a/src/toolbox/tool-brightness-contrast.xml b/src/toolbox/tool-brightness-contrast.xml
index 37e9628..76299f9 100644
--- a/src/toolbox/tool-brightness-contrast.xml
+++ b/src/toolbox/tool-brightness-contrast.xml
@@ -58,12 +58,8 @@
         <para>
           by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-brightness-contrast-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
@@ -72,6 +68,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>Options</title>
     <figure>
@@ -90,16 +87,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> drop-down
-            list.
+            button opens a menu:
           </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/tool-brush.xml b/src/toolbox/tool-brush.xml
index e54ec18..0c78722 100644
--- a/src/toolbox/tool-brush.xml
+++ b/src/toolbox/tool-brush.xml
@@ -522,7 +522,7 @@
             Page-Down keys to vary by ±0.05. You can obtain the same result if
             you have correctly set your mouse-wheel in the Preferences. See
             <link linkend="gimp-using-variable-size-brush">How to vary the
-            height of a brush</link>
+            size of a brush</link>
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/toolbox/tool-by-color-select.xml b/src/toolbox/tool-by-color-select.xml
index 1a0b4a7..6ec6fbd 100644
--- a/src/toolbox/tool-by-color-select.xml
+++ b/src/toolbox/tool-by-color-select.xml
@@ -12,9 +12,7 @@
   2005=05-19 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-by-color-select">
-  <title>
-    <phrase>Select By Color</phrase>
-  </title>
+  <title>Select By Color</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Selection by color</secondary>
@@ -29,9 +27,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Select by Color tool icon in the Toolbox</phrase>
-    </title>
+    <title>Select by Color tool icon in the Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-selbycolor.png" format="PNG"/>
@@ -51,9 +47,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the tool</phrase>
-    </title>
+    <title>Activating the tool</title>
     <para>
       You can access to the Select by Color Tool in different ways:
     </para>
@@ -65,19 +59,21 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
             <guimenuitem>By Color Select</guimenuitem>
-          </menuchoice>;
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-rect-select-22.png"/></imageobject></inlinemediaobject></guiicon>
-          in the ToolBox;
+          by clicking on the tool icon
+          <guiicon><inlinegraphic
+            fileref="images/toolbox/stock-tool-by-color-select-22.png"/>
+          </guiicon>
+          in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycombo><keycap>Shift
+          by using the keyboard shortcut <keycombo><keycap>Shift
         </keycap><keycap>O</keycap></keycombo>.
         </para>
       </listitem>
@@ -85,9 +81,7 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <para>
       The select by color tool does not have any special key modifiers,
       only the ones that affect all selection tools in the same way.
@@ -97,14 +91,10 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Handling tool</phrase>
-    </title>
+    <title>Handling tool</title>
     <figure>
       <title>
-        <phrase>
-          Using Select by Color tool: selected pixels are not only contiguous
-        </phrase>
+        Using Select by Color tool: selected pixels are not only contiguous
       </title>
       <mediaobject>
         <imageobject>
@@ -124,14 +114,11 @@
       mouse...).-->
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Tool Options for the Select by Color tool</phrase>
-      </title>
+      <title>Tool Options for the Select by Color tool</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-selbycolor.png" format="PNG"/>
diff --git a/src/toolbox/tool-clone.xml b/src/toolbox/tool-clone.xml
index f6112b0..147d601 100644
--- a/src/toolbox/tool-clone.xml
+++ b/src/toolbox/tool-clone.xml
@@ -151,6 +151,18 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <para>
+      Normally, tool options are displayed in a window attached under the
+      Toolbox as soon as you activate a tool. If they are not, you can access
+      them from the image menu bar through
+      <menuchoice>
+        <guimenu>Windows</guimenu>
+        <guisubmenu>Dockable Windows</guisubmenu>
+        <guimenuitem>Tool Options</guimenuitem>
+      </menuchoice> which opens the option window of the selected tool.
+    </para>
+
     <variablelist>
       <varlistentry>
         <term>
@@ -324,10 +336,6 @@
                   another layer within the same image. (But remember that you
                   can also clone from one image to another image.)
                 </para>
-                <para>
-                  When you selected a pattern as source, imagine a new layer
-                  filled with this pattern as the registered source layer.
-                </para>
                 <figure>
                   <title><quote>Registered</quote> clone alignment</title>
                   <mediaobject>
diff --git a/src/toolbox/tool-color-balance.xml b/src/toolbox/tool-color-balance.xml
index 3378b3a..6dabc9e 100644
--- a/src/toolbox/tool-color-balance.xml
+++ b/src/toolbox/tool-color-balance.xml
@@ -29,9 +29,7 @@
     predominant colors in digital photos.
   </para>
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can get to the Color balance tool in several ways :
     </para>
@@ -47,19 +45,15 @@
           <menuchoice>
             <guimenu>Colors</guimenu>
             <guimenuitem>Color Balance</guimenuitem>
-          </menuchoice>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking the tool icon:
+          by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                   fileref="images/toolbox/stock-tool-color-balance-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
@@ -70,13 +64,9 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Color Balance options</phrase>
-      </title>
+      <title>Color Balance options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tools-color-balance.png" format="PNG"/>
@@ -91,15 +81,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> button.
+            button opens a menu:
           </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/tool-color-picker.xml b/src/toolbox/tool-color-picker.xml
index 01d2ce0..caa70b9 100644
--- a/src/toolbox/tool-color-picker.xml
+++ b/src/toolbox/tool-color-picker.xml
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-04-06 j.h: reviewed for v2.6
   2008-01-29 j.h: updated to v2.4 'en;fr'
   2007-06-03 kost: added 'no'
   2006-06-02 "Add to palette" translated to en;fr from german by j.h
@@ -11,19 +12,8 @@
   050818 de fixed wrong shortcut - its O not Shift-O
   050817 de reviewed by axel.wernicke
 -->
-<sect2 id="gimp-tool-color-picker">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Color Picker</phrase>
-  </title>
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-color-picker">
+  <title>Color Picker</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Color Picker</secondary>
@@ -39,9 +29,7 @@
     <secondary>Grab color</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Eye dropper</phrase>
-    </title>
+    <title>Eye dropper</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-eyedropper.png" format="PNG"/>
@@ -59,21 +47,24 @@
     <guilabel>Info window</guilabel> opens when you click on the image.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>You can get to this tool in several ways :</para>
     <itemizedlist>
       <listitem>
         <para>
           In the image menu through
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu>C<accel>o</accel>lor Picker.</guisubmenu></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Picker.</guisubmenu>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           by clicking the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-color-picker-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon><inlinegraphic
+            fileref="images/toolbox/stock-tool-color-picker-22.png"/>
+          </guiicon>
           in Toolbox,
         </para>
       </listitem>
@@ -83,7 +74,7 @@
         </para>
       </listitem>
       <listitem>
-        <para><!--TODO es;it;pl;ru-->
+        <para>
           by pressing the <keycap>Ctrl</keycap> key while using a paint
           tool. The Color-picker dialog is not opened during this operation
           and the tool remains unchanged after releasing the key.
@@ -93,10 +84,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <variablelist>
       <varlistentry>
         <term>Shortcut</term>
@@ -140,38 +130,22 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Color Picker Options</phrase>
-      </title>
+      <title>Color Picker Options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/color-picker-options.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Color Picker can be accessed by
-            double clicking the Color Picker tool icon
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/stock-tool-color-picker-22.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Sample Merged</term>
         <listitem>
           <para>
@@ -240,9 +214,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Use info window</phrase>
-        </term>
+        <term>Use info window</term>
         <listitem>
           <para>
             When this option is checked, the information window is opened
@@ -250,9 +222,7 @@
             toggle this possibility temporarily.
           </para>
           <figure>
-            <title>
-              <phrase>Color Picker Info Window</phrase>
-            </title>
+            <title>Color Picker Info Window</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/menus/color-picker-info.png" format="PNG"/>
diff --git a/src/toolbox/tool-colorize.xml b/src/toolbox/tool-colorize.xml
index f1e15bf..c3fff03 100644
--- a/src/toolbox/tool-colorize.xml
+++ b/src/toolbox/tool-colorize.xml
@@ -30,11 +30,9 @@
     <xref linkend="glossary-colormodel"/> for Hue, Saturation, Luminosity.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating tool</title>
     <para>
-      You can get to the Hue-Saturation tool in two ways :
+      You can get to the Colorize tool in two ways :
     </para>
     <itemizedlist>
       <listitem>
@@ -56,12 +54,8 @@
         <para>
           or by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                   fileref="images/toolbox/stock-tool-colorize-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
@@ -70,14 +64,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Colorize options</phrase>
-      </title>
+      <title>Colorize options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tools-colorize.png" format="PNG"/>
@@ -92,15 +83,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> button.
+            button opens a menu:
           </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/tool-crop.xml b/src/toolbox/tool-crop.xml
index 3ab0967..315f8f2 100644
--- a/src/toolbox/tool-crop.xml
+++ b/src/toolbox/tool-crop.xml
@@ -71,15 +71,15 @@
   <note>
     <para>
       You can see the aspect ratio in the status bar:
-      <figure>
-        <title>Aspect ratio display</title>
+<!--      <figure>
+        <title>Aspect ratio display</title>-->
         <mediaobject>
           <imageobject>
             <imagedata format="PNG"
                        fileref="images/toolbox/display_ratio.png"/>
           </imageobject>
         </mediaobject>
-      </figure>
+<!--      </figure>-->
     </para>
   </note>
 
@@ -98,22 +98,21 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Transform tools</guisubmenu>
             <guimenuitem>Crop</guimenuitem>
-          </menuchoice>.
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking the tool icon:
+          by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject><imageobject><imagedata
-              fileref="images/toolbox/stock-tool-crop-22.png"/></imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-crop-22.png"/>
           </guiicon>in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut
+          by using the keyboard shortcut
           <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo>.
         </para>
       </listitem>
@@ -122,42 +121,25 @@
 
   <sect3>
     <title>Key modifiers (Defaults)</title>
-    <variablelist>
-      <varlistentry>
-        <term>Shortcut</term>
-        <listitem>
-          <para>
-            The
-            <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo>
-            shortcut will change the active tool to the Crop Tool.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Key modifiers</term>
-        <listitem>
-          <para>
-            When you maintain click on the crop rectangle, handles
-            disappear and
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                holding down the <keycap>Ctrl</keycap> key toggles to the
-                <guilabel>Extend from Center</guilabel> option,
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                holding down the <keycap>Shift</keycap> key toggles to the
-                <guilabel>Fixed</guilabel> option, which makes some
-                dimensions fixed.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <para>
+      When you maintain click on the crop rectangle, handles
+      disappear and
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          holding down the <keycap>Ctrl</keycap> key toggles to the
+          <guilabel>Extend from Center</guilabel> option,
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          holding down the <keycap>Shift</keycap> key toggles to the
+          <guilabel>Fixed</guilabel> option, which makes some
+          dimensions fixed.
+        </para>
+      </listitem>
+    </itemizedlist>
   </sect3>
 
   <sect3>
diff --git a/src/toolbox/tool-curves.xml b/src/toolbox/tool-curves.xml
index b9c013b..677767e 100644
--- a/src/toolbox/tool-curves.xml
+++ b/src/toolbox/tool-curves.xml
@@ -49,12 +49,8 @@
         <para>
           By clicking on the tool icon
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                   fileref="images/toolbox/stock-tool-curves-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox, if this tool has been installed there (see
           <link linkend="gimp-tools-dialog">Tools dialog</link>.
@@ -81,15 +77,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> button.
+            button opens a menu:
           </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -252,7 +272,7 @@
           </para>
           <para><guilabel>Free Hand</guilabel>: With this mode, you can draw
             a broken line that you can smooth by clicking the
-            <guibutton>Smooth</guibutton> button.
+            <guibutton>Curve Type</guibutton> button again.
           </para>
         </listitem>
       </varlistentry>
@@ -297,6 +317,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>Using the <quote>Curves</quote> tool</title>
     <variablelist>
@@ -323,9 +344,7 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Making the curve more horizontal</phrase>
-            </title>
+            <title>Making the curve more horizontal</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-horiz-1.png" format="PNG"/>
@@ -351,9 +370,7 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Making the curve more vertical</phrase>
-            </title>
+            <title>Making the curve more vertical</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-vert-1.png" format="PNG"/>
@@ -397,9 +414,7 @@
         <term>Practical cases</term>
         <listitem>
           <figure>
-            <title>
-              <phrase>Invert colors</phrase>
-            </title>
+            <title>Invert colors</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-invert.png" format="PNG"/>
@@ -417,9 +432,7 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Enhance contrast</phrase>
-            </title>
+            <title>Enhance contrast</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-H-S.png" format="PNG"/>
@@ -435,9 +448,7 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Working on color channels</phrase>
-            </title>
+            <title>Working on color channels</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-lighten-1.png" format="PNG"/>
diff --git a/src/toolbox/tool-desaturate.xml b/src/toolbox/tool-desaturate.xml
index c1249e3..9e6b7de 100644
--- a/src/toolbox/tool-desaturate.xml
+++ b/src/toolbox/tool-desaturate.xml
@@ -47,24 +47,20 @@
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Color Tools</guisubmenu>
-            <guimenuitem>Desturate</guimenuitem>
+            <guimenuitem>Desaturate</guimenuitem>
           </menuchoice> or
           <menuchoice>
             <guimenu>Colors</guimenu>
             <guimenuitem>Desaturate</guimenuitem>
-          </menuchoice>.
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
+          by clicking on the tool icon
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                   fileref="images/toolbox/stock-convert-grayscale-16.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox, if this tool has been installed there (see
           <link linkend="gimp-tools-dialog">Tools dialog</link>.
@@ -85,13 +81,9 @@
     </figure>
     <para>Three options are available:</para>
     <variablelist>
-      <title>
-        <phrase>Choose shade of gray based on</phrase>
-      </title>
+      <title>Choose shade of gray based on</title>
       <varlistentry>
-        <term>
-          <phrase>Lightness</phrase>
-        </term>
+        <term>Lightness</term>
         <listitem>
           <para>The graylevel will be calculated as</para>
           <informalequation>
@@ -106,9 +98,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Luminosity</phrase>
-        </term>
+        <term>Luminosity</term>
         <listitem>
           <para>The graylevel will be calculated as</para>
           <informalequation>
@@ -123,9 +113,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Average</phrase>
-        </term>
+        <term>Average</term>
         <listitem>
           <para>The graylevel will be calculated as</para>
           <informalequation>
@@ -139,9 +127,7 @@
       </varlistentry>
     </variablelist>
     <figure>
-      <title>
-        <phrase>Comparing the three options</phrase>
-      </title>
+      <title>Comparing the three options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/sunflower.png" format="PNG"/>
diff --git a/src/toolbox/tool-dodge-burn.xml b/src/toolbox/tool-dodge-burn.xml
index 26f7a92..9a88bec 100644
--- a/src/toolbox/tool-dodge-burn.xml
+++ b/src/toolbox/tool-dodge-burn.xml
@@ -52,10 +52,9 @@
       <listitem>
         <para>
           The Tool can also be called by clicking the tool icon:
-          <guiicon><inlinemediaobject>
-              <imageobject><imagedata
+          <guiicon>
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-dodge-22.png"/>
-              </imageobject></inlinemediaobject>
           </guiicon>,
         </para>
       </listitem>
diff --git a/src/toolbox/tool-ellipse-select.xml b/src/toolbox/tool-ellipse-select.xml
index e78f08d..eb41053 100644
--- a/src/toolbox/tool-ellipse-select.xml
+++ b/src/toolbox/tool-ellipse-select.xml
@@ -15,7 +15,7 @@
 <!--  <sect2info>
     <revhistory>
       <revision>
-        <revnumber>$Revision$</revnumber>
+        <revnumber>$Revision: 2745 $</revnumber>
         <date>2007-12-22</date>
         <authorinitials>P.P</authorinitials>
       </revision>
diff --git a/src/toolbox/tool-flip.xml b/src/toolbox/tool-flip.xml
index 0df7263..6889e19 100644
--- a/src/toolbox/tool-flip.xml
+++ b/src/toolbox/tool-flip.xml
@@ -39,7 +39,7 @@
   <sect3>
     <title>Activating the Tool</title>
     <para>
-      You can access to the Selection Tool in different ways:
+      You can access to the Flip Tool in different ways:
     </para>
     <itemizedlist>
       <listitem>
@@ -54,17 +54,14 @@
         <para>
           By clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-flip-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon> in Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the
+          by using the
           <keycombo><keycap>Shift</keycap><keycap>F</keycap></keycombo> key
           combination.
         </para>
diff --git a/src/toolbox/tool-foreground-select.xml b/src/toolbox/tool-foreground-select.xml
index 5894e11..864aa6c 100644
--- a/src/toolbox/tool-foreground-select.xml
+++ b/src/toolbox/tool-foreground-select.xml
@@ -26,11 +26,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>
-        The <quote>Foreground Select</quote> tool in the Toolbox
-      </phrase>
-    </title>
+    <title>The <quote>Foreground Select</quote> tool in the Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/FG-select-toolbox.png" format="PNG"/>
@@ -45,9 +41,7 @@
     <xref linkend="bibliography-online-siox"/>.
   </para>
   <sect3 id="tool-fg-select-usage">
-    <title>
-      <phrase>Directions for use</phrase>
-    </title>
+    <title>Directions for use</title>
     <para>
       The creation of a selection with this tool works in a couple of steps:
     </para>
@@ -66,9 +60,7 @@
           next step.
         </para>
         <figure>
-          <title>
-            <phrase>The foreground is roughly selected</phrase>
-          </title>
+          <title>The foreground is roughly selected</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/toolbox/FG-select-ex1.png" format="PNG"/>
@@ -85,9 +77,7 @@
           careful not painting background pixels.
         </para>
         <figure>
-          <title>
-            <phrase>The line drawn on the foreground</phrase>
-          </title>
+          <title>The line drawn on the foreground</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/toolbox/FG-select-ex2.png" format="PNG"/>
@@ -107,9 +97,7 @@
           dark :
         </para>
         <figure>
-          <title>
-            <phrase>The area which will be selected</phrase>
-          </title>
+          <title>The area which will be selected</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/toolbox/FG-select-ex3.png" format="PNG"/>
@@ -123,9 +111,7 @@
           wanted selection :
         </para>
         <figure>
-          <title>
-            <phrase>Foreground is selected.</phrase>
-          </title>
+          <title>Foreground is selected</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/toolbox/FG-select-ex4.png" format="PNG"/>
@@ -146,23 +132,24 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can activate the Foreground Select tool in two ways:
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-foreground-select-22.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
-          in the Toolbox.
+          by clicking on the tool icon
+          <guiicon>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-foreground-select-22.png"/>
+          </guiicon>
+          in the Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          Through
+          through
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
@@ -187,9 +174,7 @@
     </itemizedlist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <variablelist>
       <varlistentry>
         <term>
@@ -205,14 +190,9 @@
     </variablelist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Foreground Select</quote> tool options
-        </phrase>
-      </title>
+      <title><quote>Foreground Select</quote> tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/FG-select-options.png" format="PNG"/>
diff --git a/src/toolbox/tool-free-select.xml b/src/toolbox/tool-free-select.xml
index 944bb07..0b22dc6 100644
--- a/src/toolbox/tool-free-select.xml
+++ b/src/toolbox/tool-free-select.xml
@@ -70,7 +70,7 @@
     click only. This creates an anchor point. Then moving the mouse pointer
     draws a line with a new anchor point that you can move as long as you
     don't click again (the mouse pointer comes with the moving cross).
-    Clicking gain anchors this point and creates a segment. By pressing
+    Clicking again anchors this point and creates a segment. By pressing
     the <keycap>Ctrl</keycap> keyboard key while moving the mouse pointer
     contrains moving angles to 15°.
   </para>
@@ -100,25 +100,22 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
             <guimenuitem>Free Select</guimenuitem>
-          </menuchoice>;
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
+          by clicking on the tool icon
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/toolbox/stock-tool-free-select-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-free-select-22.png"/>
           </guiicon>
           in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycap>F</keycap>.
+          by using the keyboard shortcut <keycap>F</keycap>.
         </para>
       </listitem>
     </itemizedlist>
@@ -161,24 +158,6 @@
       </mediaobject>
     </figure>
 
-    <!--Sorry. I can't use
-               <xi:include href="about-common-options-display.xml"/>
-        here. I don't understand why.-->
-    <!-- You forgot to add 'xmlns:xi="..."' to the root element -->
-    <!--
-    <note>
-      <para>
-        Normally, tool options are displayed in a window attached under the
-        Toolbox as soon as you activate a tool. If they are not, you can access
-        them from the image menu bar through
-        <menuchoice>
-          <guimenu>Windows</guimenu>
-          <guisubmenu>Dockable Windows</guisubmenu>
-          <guimenuitem>Tool Options</guimenuitem>
-        </menuchoice> which opens the option window of the selected tool.
-      </para>
-    </note>
-    -->
     <xi:include href="about-common-options-display.xml"/>
 
     <para>
diff --git a/src/toolbox/tool-fuzzy-select.xml b/src/toolbox/tool-fuzzy-select.xml
index defee5b..07707c4 100644
--- a/src/toolbox/tool-fuzzy-select.xml
+++ b/src/toolbox/tool-fuzzy-select.xml
@@ -86,19 +86,22 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
             <guimenuitem>Fuzzy Select</guimenuitem>
-          </menuchoice>;
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-rect-select-22.png"/></imageobject></inlinemediaobject></guiicon>
+          by clicking on the tool icon
+          <guiicon>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-fuzzy-select-22.png"/>
+          </guiicon>
           in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycap>U</keycap>.
+          by using the keyboard shortcut <keycap>U</keycap>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/tool-heal.xml b/src/toolbox/tool-heal.xml
index f7c6b96..a695fe8 100644
--- a/src/toolbox/tool-heal.xml
+++ b/src/toolbox/tool-heal.xml
@@ -64,13 +64,9 @@
       </listitem>
       <listitem>
         <para>
-          The Tool can also be called by clicking the tool icon:
+          or by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
-                fileref="images/toolbox/stock-tool-heal-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic fileref="images/toolbox/stock-tool-heal-22.png"/>
           </guiicon>
           in the Toolbox,
         </para>
diff --git a/src/toolbox/tool-hue-saturation.xml b/src/toolbox/tool-hue-saturation.xml
index cba74b2..5417410 100644
--- a/src/toolbox/tool-hue-saturation.xml
+++ b/src/toolbox/tool-hue-saturation.xml
@@ -48,12 +48,8 @@
         <para>
           By clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
-                  fileref="images/toolbox/stock-tool-hue-saturation-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-hue-saturation-22.png"/>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
@@ -84,15 +80,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> button.
+            button opens a menu:
+          </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
           </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/tool-iscissors.xml b/src/toolbox/tool-iscissors.xml
index e70e923..6989ab1 100644
--- a/src/toolbox/tool-iscissors.xml
+++ b/src/toolbox/tool-iscissors.xml
@@ -82,25 +82,22 @@
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
             <guimenuitem>Intelligent Scissors</guimenuitem>
-          </menuchoice>.
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
+          by clicking on the tool icon
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/toolbox/stock-tool-rect-select-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-iscissors-22.png"/>
           </guiicon>
-          in the ToolBox.
+          in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycap>I</keycap>.
+          by using the keyboard shortcut <keycap>I</keycap>.
         </para>
       </listitem>
     </itemizedlist>
@@ -158,27 +155,18 @@
       the first one. When the selection is closed the pointer shape
       changes according to its position: inside
       <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="images/toolbox/cissors-mouse.png"/>
-          </imageobject>
-        </inlinemediaobject>
+        <inlinegraphic
+          fileref="images/toolbox/cissors-mouse.png"/>
       </guiicon>,
       on the boundary
       <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="images/toolbox/cissors-plus.png"/>
-          </imageobject>
-        </inlinemediaobject>
+        <inlinegraphic
+          fileref="images/toolbox/cissors-plus.png"/>
       </guiicon>,
       and outside
       <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="images/toolbox/cissors-bad.png"/>
-          </imageobject>
-        </inlinemediaobject>
+        <inlinegraphic
+          fileref="images/toolbox/cissors-bad.png"/>
       </guiicon>.
       You can adjust the selection creating new points by clicking on the
       boundary or by moving each control points (merged first and last
diff --git a/src/toolbox/tool-levels.xml b/src/toolbox/tool-levels.xml
index 74841c1..f38516d 100644
--- a/src/toolbox/tool-levels.xml
+++ b/src/toolbox/tool-levels.xml
@@ -10,7 +10,7 @@
   2005-12-06 replaced imformalfigure by figure by lexa
   050807 de reviewed by axel.wernicke
 -->
-<sect2 id="gimp-tool-levels">
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-levels">
   <title>Levels</title>
   <indexterm>
     <primary>Tools</primary>
@@ -59,12 +59,8 @@
     <para>
       or by clicking the
       <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata
+        <inlinegraphic
               fileref="images/toolbox/stock-tool-levels-22.png"/>
-          </imageobject>
-        </inlinemediaobject>
       </guiicon>
       icon in Toolbox if this tool has been installed there. For this, go to
         <link linkend="gimp-tools-dialog">Tools Dialog</link>.
@@ -90,16 +86,39 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic fileref="images/toolbox/save-color-settings.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> drop-down
-            list.
           </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/presets-menu-icon.png"/>
+            </guiicon>
+            button opens a menu:
+          </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -225,9 +244,7 @@
             </caption>
           </mediaobject>
           <figure>
-            <title>
-              <phrase>Example for Input Levels</phrase>
-            </title>
+            <title>Example for Input Levels</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/levels-input-2.png" format="PNG"/>
diff --git a/src/toolbox/tool-measure.xml b/src/toolbox/tool-measure.xml
index e3443d4..f711f83 100644
--- a/src/toolbox/tool-measure.xml
+++ b/src/toolbox/tool-measure.xml
@@ -12,18 +12,7 @@
   050818 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-measure">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-30</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Measure</phrase>
-  </title>
+  <title>Measure</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Measure</secondary>
@@ -41,9 +30,7 @@
     <primary>Measure a surface</primary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Measure tool</phrase>
-    </title>
+    <title>Measure tool</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-measure.png" format="PNG"/>
@@ -61,51 +48,63 @@
     When you pass the mouse pointer over the end point it turns to a move
     pointer. Then if you click you can resume the measure.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Status Bar</phrase>
-    </title>
+    <title>Status Bar</title>
     <para>
       Information is displayed in the
       <link linkend="gimp-image-window-status-bar">status bar</link>, at the
-      bottom of the Image window. The status bar shows a pair of
-      numbers. The first number is the <emphasis>distance between the
-      original point and the mouse pointer</emphasis>. Mostly the measure
-      unit is shown as <emphasis>Pixel</emphasis>. The second number is
-      the <emphasis>angle</emphasis> in every quadrant, from 0° to 90°.
+      bottom of the Image window:
+      <itemizedlist>
+        <listitem>
+          <para>
+            Distance between the original point and the mouse pointer, in
+            pixels.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Angle, in every quadrant, from 0° to 90°.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Pointer coordinates relative to the original point.
+          </para>
+        </listitem>
+      </itemizedlist>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <itemizedlist>
       <listitem>
         <para>
           You can get to the Measure Tool from the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guimenuitem><accel>M</accel>easure</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guimenuitem>Measure</guimenuitem>
+          </menuchoice >,
         </para>
       </listitem>
       <listitem>
         <para>
           or by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-measure-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon><inlinegraphic
+            fileref="images/toolbox/stock-tool-measure-22.png"/>
+          </guiicon>
           in Toolbox.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Key modifiers</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>
-            <keycap>Shift</keycap>
-          </phrase>
-        </term>
+        <term>Shift</term>
         <listitem>
           <para>
             Holding down the <keycap>Shift</keycap> allows to start a new
@@ -118,11 +117,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>
-            <keycap>Ctrl</keycap>
-          </phrase>
-        </term>
+        <term>Ctrl</term>
         <listitem>
           <para>
             Holding down the <keycap>Ctrl</keycap> key puts the tool
@@ -131,21 +126,21 @@
           </para>
           <para><keycap>Ctrl</keycap> key pressed and click on an end point
             creates a horizontal guide. The mouse pointer goes with the
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/measure-horiz.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/measure-horiz.png" />
+            </guiicon>
             icon.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>
-            <keycap>Alt</keycap>
-          </phrase>
-        </term>
+        <term>Alt</term>
         <listitem>
           <para><keycap>Alt</keycap> key and click on an end point creates a
             vertical guide. The mouse pointer goes with the
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/measure-vert.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+            <guiicon>
+              <inlinegraphic fileref="images/toolbox/measure-vert.png"/>
+            </guiicon>
             icon.
           </para>
         </listitem>
@@ -172,14 +167,11 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Measure</quote> tool options</phrase>
-      </title>
+      <title><quote>Measure</quote> tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/measure-tool-options.png" format="PNG"/>
@@ -188,23 +180,6 @@
     </figure>
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            There is only one available option for the Measure Tool which can
-            be accessed by double clicking the Measure tool icon
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="images/toolbox/stock-tool-measure-22.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Use Info Window</term>
         <listitem>
           <para>
@@ -216,10 +191,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Measuring surfaces</phrase>
-    </title>
+    <title>Measuring surfaces</title>
     <para>
       You can't measure surfaces directly, but you can use the
       <link linkend="gimp-histogram-dialog">Histogram</link> that gives you
diff --git a/src/toolbox/tool-move.xml b/src/toolbox/tool-move.xml
index 093e7a0..188817b 100644
--- a/src/toolbox/tool-move.xml
+++ b/src/toolbox/tool-move.xml
@@ -59,11 +59,8 @@
         <para>
           By clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/toolbox/stock-tool-move-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-move-22.png"/>
           </guiicon>.
         </para>
       </listitem>
diff --git a/src/toolbox/tool-paintbrush.xml b/src/toolbox/tool-paintbrush.xml
index 8ec6f68..a9916f2 100644
--- a/src/toolbox/tool-paintbrush.xml
+++ b/src/toolbox/tool-paintbrush.xml
@@ -102,7 +102,7 @@
       </mediaobject>
     </figure>
 
-    <!--<xi:include href="about-common-options-display.xml"/>-->
+    <xi:include href="about-common-options-display.xml"/>
 
     <variablelist>
       <varlistentry>
diff --git a/src/toolbox/tool-path.xml b/src/toolbox/tool-path.xml
index b8a7c7c..ea5412d 100644
--- a/src/toolbox/tool-path.xml
+++ b/src/toolbox/tool-path.xml
@@ -14,18 +14,7 @@
   2005-08-14 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-path">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-11</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Path</phrase>
-  </title>
+  <title>Path</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Path</secondary>
@@ -38,9 +27,7 @@
     <primary>Bézier's curve</primary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Path tool</phrase>
-    </title>
+    <title>Path tool</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-path.png" format="PNG"/>
@@ -55,22 +42,27 @@
     Paths have their own dialog box:
     <link linkend="gimp-path-dialog">Dialog</link>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>You can get to Path tool in several ways :</para>
     <itemizedlist>
       <listitem>
         <para>
           In the image menu through
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aths</guisubmenu></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paths</guisubmenu>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-path-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-path-22.png"/>
+          </guiicon>
           in Toolbox,
         </para>
       </listitem>
@@ -81,10 +73,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <note>
       <para>
         Help messages pop up at the bottom of the image window to help you
@@ -116,37 +107,31 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Path</quote> tool options
-        </phrase>
-      </title>
+      <title><quote>Path</quote> tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/path-tool-options.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </figure>
+
+    <para>
+      Normally, tool options are displayed in a window attached under the
+      Toolbox as soon as you activate a tool. If they are not, you can access
+      them from the image menu bar through
+      <menuchoice>
+        <guimenu>Windows</guimenu>
+        <guisubmenu>Dockable Windows</guisubmenu>
+        <guimenuitem>Tool Options</guimenuitem>
+      </menuchoice> which opens the option window of the selected tool.
+    </para>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Path Tool can be accessed by
-            double clicking the Path Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-path-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-          <para>
-            As with other tools, you can delete your changes by
-            <keycap>Ctrl-Z</keycap>.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Design Mode</term>
         <listitem>
           <para>
@@ -223,8 +208,8 @@
             before. A handle appears. Drag it to bend the curve.
             Pressing <keycap>Shift</keycap> toggles to symmetric handles.
           </para>
-          <para><emphasis>Modify segment</emphasis>: When you click on a
-            segment, the mouse pointer turns to a 4-arrows cross. Drag
+          <para><emphasis>Modify segment</emphasis>: When the mouse pointer
+            goes over a segment, it turns to a 4-arrows cross. Click-and-drag
             it to bend the segment. As soon as you move, handles appear
             at both ends of the segment. Pressing <keycap>Shift</keycap>
             key toggles to symmetric handles.
@@ -241,7 +226,7 @@
             there is no path!) and you can do nothing.
           </para>
           <para><emphasis>Add a segment between two nodes</emphasis>: Click
-            on a node at one end of the path to activate it. Pointer is
+            on a node at one end of the path to activate it. The pointer is
             like a union symbol. Click on an other node to link both
             nodes. This is useful when you have to link unclosed
             components.
@@ -256,7 +241,8 @@
             the new control point.
           </para>
           <para><emphasis>Remove a node</emphasis>: While pressing
-            <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> key combination, point to a node. Pointer turns
+            <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo>
+            key combination, point to a node. Pointer turns
             to -. Click to delete the node.
           </para>
           <para><emphasis>Add a handle to a node</emphasis>: Point to a
@@ -266,7 +252,8 @@
             handles.
           </para>
           <para><emphasis>Remove a handle from a node</emphasis>: While pressing
-            <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo> key combination, point to a handle. Pointer
+            <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap></keycombo>
+            key combination, point to a handle. The pointer
             doesn't turn to the expected - and remains a hand. Click
             to delete the handle.
           </para>
@@ -339,8 +326,9 @@
         </listitem>
       </varlistentry>
     </variablelist>
-    <para><!--added 20060607-->
-      See the <link linkend="gimp-concepts-paths"><quote>Path</quote></link>concept.
+    <para>
+      See the <link linkend="gimp-concepts-paths"><quote>Path</quote>
+      </link>concept.
     </para>
   </sect3>
 </sect2>
diff --git a/src/toolbox/tool-perspective-clone.xml b/src/toolbox/tool-perspective-clone.xml
index 6f72ac4..0a9d5f3 100644
--- a/src/toolbox/tool-perspective-clone.xml
+++ b/src/toolbox/tool-perspective-clone.xml
@@ -56,11 +56,8 @@
         <para>
           The Tool can also be called by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-perspective-clone-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in the Toolbox.
         </para>
@@ -113,9 +110,7 @@
 
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Operating mode</phrase>
-        </term>
+        <term>Operating mode</term>
         <listitem>
           <para>
             When using this tool you first have to choose
@@ -137,9 +132,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Source, Alignment</phrase>
-        </term>
+        <term>Source, Alignment</term>
         <listitem>
           <para>
             This are the same as in the tool
diff --git a/src/toolbox/tool-posterize.xml b/src/toolbox/tool-posterize.xml
index 9f53920..c7eaa27 100644
--- a/src/toolbox/tool-posterize.xml
+++ b/src/toolbox/tool-posterize.xml
@@ -40,12 +40,8 @@
     <para>
       or by clicking the
       <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/toolbox/stock-tool-posterize-22.png"/>
-          </imageobject>
-        </inlinemediaobject>
+        <inlinegraphic
+          fileref="images/toolbox/stock-tool-posterize-22.png"/>
       </guiicon>
       icon in ToolBox, if Color Tools have been added to it.
     </para>
diff --git a/src/toolbox/tool-rect-select.xml b/src/toolbox/tool-rect-select.xml
index 01a7f1a..2c04ab5 100644
--- a/src/toolbox/tool-rect-select.xml
+++ b/src/toolbox/tool-rect-select.xml
@@ -12,9 +12,7 @@
   050517 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-rect-select">
-  <title>
-    <phrase>Rectangle Selection</phrase>
-  </title>
+  <title>Rectangle Selection</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Rectangle Selection</secondary>
@@ -25,9 +23,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Rectangle Select icon in the Toolbox</phrase>
-    </title>
+    <title>Rectangle Select icon in the Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-rectsel.png" format="PNG"/>
@@ -36,9 +32,9 @@
   </figure>
   <para>
     The Rectangle Selection tool is designed to select rectangular regions of
-    an image: it is the most basic of the selection tools, but very commonly
-    used. For information on selections and how they are used in GIMP see
-    <link linkend="gimp-concepts-selection">Selections</link>;
+    the active layer: it is the most basic of the selection tools, but very
+    commonly used. For information on selections and how they are used in GIMP
+    see <link linkend="gimp-concepts-selection">Selections</link>;
     for information on features common to all selection tools see
     <link linkend="gimp-tool-select">Selection Tools</link>.
   </para>
@@ -52,42 +48,40 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the tool</phrase>
-    </title>
+    <title>Activating the tool</title>
     <para>
       You can access to the Selection Tool in different ways:
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          From the image menu bar
+          from the image menu bar
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Selection Tools</guisubmenu>
             <guimenuitem>Rectangle Select</guimenuitem>
-          </menuchoice>;
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-rect-select-22.png"/></imageobject></inlinemediaobject></guiicon>
+          by clicking on the tool icon
+          <guiicon><inlinegraphic
+            fileref="images/toolbox/stock-tool-rect-select-22.png"/>
+          </guiicon>
           in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycap>R</keycap>.
+          by using the keyboard shortcut <keycap>R</keycap>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Key modifiers</phrase>
-    </title>
+    <title>Key modifiers</title>
     <xi:include href="about-common-select-modifiers.xml"/>
     <variablelist>
       <varlistentry>
@@ -103,7 +97,10 @@
             press the Ctrl key <emphasis>before</emphasis> starting to
             make the selection, the resulting selection will be
             subtracted from the existing selection. The cursor becomes
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/cursor-select-rect-minus.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/toolbox/cursor-select-rect-minus.png"/>
+            </guiicon>
           </para>
         </listitem>
       </varlistentry>
@@ -117,7 +114,9 @@
             <emphasis>before</emphasis> starting the selection, the
             resulting selection will be added to the existing one. The cursor
             becomes
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/cursor-select-rect-plus.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+            <guiicon><inlinegraphic
+              fileref="images/toolbox/cursor-select-rect-plus.png"/>
+            </guiicon>
           </para>
           <para>
             Pressing the <keycap>Shift</keycap> key <emphasis>after
@@ -144,13 +143,15 @@
             on your starting point. Note that pressing these keys before
             starting your selection intersects the resulting selection with
             the existing one and the pointer change shape accordingly :
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/cursor-select-rect-intersect.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>.
-
+            <guiicon><inlinegraphic
+              fileref="images/toolbox/cursor-select-rect-intersect.png"/>
+            </guiicon>
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3 id="tool-rect-select-manip">
     <title>
       <phrase>Tool manipulation</phrase>
@@ -167,7 +168,10 @@
     </figure>
     <para>
       When this tool is selected the mouse pointer is displayed like this:
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/cross-pt.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinegraphic
+          fileref="images/toolbox/cross-pt.png"/>
+      </guiicon>
       as soon as it is over the image. A drag and drop allows to get a
       rectangular (or square) shape. When the mouse button is relaxed, a
       dotted line (<quote>marching ants</quote>) outlines the selection. It's
@@ -191,20 +195,29 @@
       selection. In selection corners the pointer changes into a shape
       according to the context; for instance in the low right corner it
       becomes:
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/corner-pt.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>.
+      <guiicon>
+        <inlinegraphic
+          fileref="images/toolbox/corner-pt.png"/>
+      </guiicon>.
       So, by click-and-dragging these areas, you can magnify or shrink the
       selection size. Over median selection parts, lateral, low or up,
       pointer is changed into appropriate shapes according to the context.
       For instance, when the mouse pointer is over the median right side, the
       pointer looks like:
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/side-pt.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>.
+      <guiicon>
+        <inlinegraphic
+          fileref="images/toolbox/side-pt.png"/>
+      </guiicon>.
       So you can click-and-drag to magnify or to shrink the selection size by
       moving the chosen boundary.
     </para>
     <para>
       - inside selection central area the mouse pointer looks like usual for
       object manipulation, i.e.:
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/pointer.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>.
+      <guiicon>
+        <inlinegraphic
+          fileref="images/toolbox/pointer.png"/>
+      </guiicon>.
       So you can move the whole selection by a click-and-drag.
     </para>
     <para>
@@ -244,14 +257,11 @@
       paint the selection.
     </para>
   </sect3>
+
   <sect3 id="tool-rect-select-options">
-    <title>
-      <phrase>Tool Options</phrase>
-    </title>
+    <title>Tool Options</title>
     <figure>
-      <title>
-        <phrase>Tool Options for the Rectangle Select tool</phrase>
-      </title>
+      <title>Tool Options for the Rectangle Select tool</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-rectsel.png" format="PNG"/>
diff --git a/src/toolbox/tool-rotate.xml b/src/toolbox/tool-rotate.xml
index ab0e015..07b9f01 100644
--- a/src/toolbox/tool-rotate.xml
+++ b/src/toolbox/tool-rotate.xml
@@ -51,7 +51,7 @@
     <itemizedlist>
       <listitem>
         <para>
-          From the image menu bar
+          from the image menu bar
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Transform Tools</guisubmenu>
@@ -61,18 +61,16 @@
       </listitem>
       <listitem>
         <para>
-          By clicking the tool icon:
+          by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-rotate-22.png"/>
-              </imageobject></inlinemediaobject>
-          </guiicon> in the Toolbox.
+          </guiicon> in the Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the
+          by using the
           <keycombo><keycap>Shift</keycap><keycap>R</keycap></keycombo>
           key combination.
         </para>
diff --git a/src/toolbox/tool-scale.xml b/src/toolbox/tool-scale.xml
index 5b913e4..f3428da 100644
--- a/src/toolbox/tool-scale.xml
+++ b/src/toolbox/tool-scale.xml
@@ -54,28 +54,26 @@
     <itemizedlist>
       <listitem>
         <para>
-          From the image menu bar
+          from the image menu bar
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Transform Tools</guisubmenu>
             <guimenuitem>Scale</guimenuitem>
-          </menuchoice>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking the tool icon:
+          by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-scale-22.png"/>
-              </imageobject></inlinemediaobject>
           </guiicon> in the Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the
+          by using the
           <keycombo><keycap>Shift</keycap><keycap>T</keycap></keycombo>
           key combination.
         </para>
@@ -92,7 +90,7 @@
         </term>
         <listitem>
           <para>
-            When moving a corner, holding the <keycap>Ctrl</keycap> key down
+            Holding the <keycap>Ctrl</keycap> key down
             will toggle the <guilabel>Keep Aspect</guilabel> option.
           </para>
         </listitem>
diff --git a/src/toolbox/tool-select.xml b/src/toolbox/tool-select.xml
index 75a8de2..8df40fe 100644
--- a/src/toolbox/tool-select.xml
+++ b/src/toolbox/tool-select.xml
@@ -13,18 +13,7 @@
   2005-05-16 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-select">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-06-15</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Common Features</phrase>
-  </title>
+  <title>Common Features</title>
   <indexterm>
     <primary>Selections</primary>
     <secondary>Common Features</secondary>
@@ -40,7 +29,7 @@
     </mediaobject>
   </figure>
   <para>
-    Selection tools are designed to select regions from images or layers so
+    Selection tools are designed to select regions from the active layer so
     you can work on them without affecting the unselected areas. Each tool has
     its own individual properties, but the selection tools also share a number
     of options and features in common. These common features are described
@@ -99,10 +88,9 @@
     more, though, and does not share the same set of options with the other
     selection tools.
   </para>
+
   <sect3 id="gimp-tools-select-modifiers">
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <para>
       The behavior of selection tools is modified if you hold down the
       <keycap>Ctrl</keycap>, <keycap>Shift</keycap>, and/or
@@ -122,7 +110,7 @@
           <keycap>Ctrl</keycap>
         </term>
         <listitem>
-          <para><!--Changed 2007-12-22-->
+          <para>
             When creating a selection, holding down the
             <keycap>Ctrl</keycap> key can have two different actions
             according to the way you use it:
@@ -245,9 +233,7 @@
     </variablelist>
   </sect3>
   <sect3 id="gimp-tool-select-options">
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <para>
       Here we describe the tool options that apply to all selection tools:
       options that apply only to some tools, or that affect each tool
@@ -260,9 +246,7 @@
       of the tools.
     </para>
     <figure>
-      <title>
-        <phrase>Common options of selection tools</phrase>
-      </title>
+      <title>Common options of selection tools</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-selection.png" format="PNG"/>
@@ -374,17 +358,4 @@
       </varlistentry>
     </variablelist>
   </sect3>
-  <sect3>
-    <title>
-      <phrase>Additional information</phrase>
-    </title>
-    <note>
-      <para>
-        When moving a selection beyond the boundaries of the image canvas, the
-        selection will be cropped to the image area. Selections can exist on
-        the visible canvas only. Selection movements and changes are, however,
-        kept in the undo buffer should you need to repair an error.
-      </para>
-    </note>
-  </sect3>
 </sect2>
diff --git a/src/toolbox/tool-shear.xml b/src/toolbox/tool-shear.xml
index 57429b9..9ec2dd5 100644
--- a/src/toolbox/tool-shear.xml
+++ b/src/toolbox/tool-shear.xml
@@ -59,12 +59,12 @@
   <sect3>
     <title>Activating the Tool</title>
     <para>
-      You can access to the Selection Tool in different ways:
+      You can access to the Shear Tool in different ways:
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          From the image menu bar
+          from the image menu bar
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Transform Tools</guisubmenu>
@@ -74,19 +74,17 @@
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon:
+          by clicking on the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-shear-22.png"/>
-              </imageobject></inlinemediaobject>
           </guiicon>
           in Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          By using the
+          by using the
           <keycombo><keycap>Shift</keycap><keycap>S</keycap></keycombo> key
           combination.
         </para>
diff --git a/src/toolbox/tool-smudge.xml b/src/toolbox/tool-smudge.xml
index 2384809..e39a9c6 100644
--- a/src/toolbox/tool-smudge.xml
+++ b/src/toolbox/tool-smudge.xml
@@ -42,23 +42,21 @@
     <itemizedlist>
       <listitem>
         <para>
-          Through
+          through
           <menuchoice>
             <guimenu>Tools</guimenu>
             <guisubmenu>Paint Tools</guisubmenu>
             <guimenuitem>Smudge.</guimenuitem>
           </menuchoice>
-          in the image menu.
+          in the image menu,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking on the tool icon:
+          by clicking on the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject><imagedata
+            <inlinegraphic
                 fileref="images/toolbox/stock-tool-smudge-22.png"/>
-              </imageobject></inlinemediaobject>
           </guiicon>
           in Toolbox,
         </para>
diff --git a/src/toolbox/tool-text.xml b/src/toolbox/tool-text.xml
index 2f0862a..5a00c9b 100644
--- a/src/toolbox/tool-text.xml
+++ b/src/toolbox/tool-text.xml
@@ -23,9 +23,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>The Text tool in Toolbox</phrase>
-    </title>
+    <title>The Text tool in Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-text.png" format="PNG"/>
@@ -48,9 +46,18 @@
     automatically adapted to the frame size. You can adjust this frame
     whenever you like.
   </para>
+  <figure>
+    <title>Text tool bounding box</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata format="PNG"
+                    fileref="images/using/text-tool.png"/>
+      </imageobject>
+    </mediaobject>
+  </figure>
   <para>
     When the mouse pointer is around the center of the frame, it
-    comes with a small move-cross
+    comes with a small crosshair
     <guiicon>
       <inlinegraphic fileref="images/toolbox/stock-tool-move-16.png"/>
     </guiicon>.
@@ -78,11 +85,7 @@
         <para>
           by clicking the tool icon
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata fileref="images/toolbox/stock-tool-text-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic fileref="images/toolbox/stock-tool-text-22.png"/>
           </guiicon>
           in Toolbox,
         </para>
@@ -94,14 +97,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Text tool options</phrase>
-      </title>
+      <title>Text tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-text.png" format="PNG"/>
@@ -109,24 +109,18 @@
       </mediaobject>
     </figure>
 
-    <variablelist>
-      <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Text tool can be accessed
-            by double clicking the text tool icon:
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/stock-tool-text-22.png"/>
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
+    <para>
+      Normally, tool options are displayed in a window attached under the
+      Toolbox as soon as you activate a tool. If they are not, you can access
+      them from the image menu bar through
+      <menuchoice>
+        <guimenu>Windows</guimenu>
+        <guisubmenu>Dockable Windows</guisubmenu>
+        <guimenuitem>Tool Options</guimenuitem>
+      </menuchoice> which opens the option window of the selected tool.
+    </para>
 
+    <variablelist>
       <varlistentry>
         <term>Font</term>
         <listitem>
@@ -277,9 +271,7 @@
           </para>
           <figure>
             <title>
-              <phrase>
-                The Text to Path command among text commands in the Layer menu
-              </phrase>
+              The Text to Path command among text commands in the Layer menu
             </title>
             <mediaobject>
               <imageobject>
@@ -306,10 +298,7 @@
               dialog</link>. All path options should apply to this new path.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Text along Path</quote> example
-              </phrase>
-            </title>
+            <title><quote>Text along Path</quote> example</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/text-along-path.png" format="PNG"/>
@@ -347,9 +336,7 @@
       <secondary>Editor</secondary>
     </indexterm>
     <figure>
-      <title>
-        <phrase>The Text Editor options</phrase>
-      </title>
+      <title>The Text Editor options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-dialog-text.png" format="PNG"/>
diff --git a/src/toolbox/tool-threshold.xml b/src/toolbox/tool-threshold.xml
index 1476abf..a67b396 100644
--- a/src/toolbox/tool-threshold.xml
+++ b/src/toolbox/tool-threshold.xml
@@ -12,7 +12,7 @@
   2005-12-06 replaced informalfigure by figure by lexa
   2005-08-07 de reviewed and restructured by axel.wernicke
 -->
-<sect2 id="gimp-tool-threshold">
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-threshold">
   <title>Threshold</title>
   <indexterm>
     <primary>Tools</primary>
@@ -68,12 +68,8 @@
         <para>
           or by clicking on the
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
-                  fileref="images/toolbox/stock-tool-threshold-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
+            <inlinegraphic
+              fileref="images/toolbox/stock-tool-threshold-22.png"/>
           </guiicon>
           icon in Toolbox if this tool has been installed in it. You can do
           that through the <link linkend="gimp-tools-dialog">Tool dialog</link>.
@@ -101,15 +97,41 @@
             You can save the color settings of your image by clicking the
             <guibutton>Add settings to favourites</guibutton> button
             <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
-                </imageobject>
-              </inlinemediaobject>
+              <inlinegraphic
+                            fileref="images/toolbox/save-color-settings.png"/>
+            </guiicon>
+          </para>
+          <para>
+            The
+            <guiicon>
+              <inlinegraphic
+                            fileref="images/toolbox/presets-menu-icon.png"/>
             </guiicon>
-            and you can get a favourite preset back by selecting it in the
-            <guibutton>Pick a setting from the list</guibutton> button.
+            button opens a menu:
           </para>
+          <figure>
+            <title>Preset Menu</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/presets-menu.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            which lets you <guilabel>Import Settings from File</guilabel> or
+            <guilabel>Export Settings to File</guilabel>,
+            and gives you access to the Manage Save Settings dialog:
+          </para>
+          <figure>
+            <title>Manage saved Settings Dialog</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/manage-saved-settings.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/tool-transform.xml b/src/toolbox/tool-transform.xml
index 27114f9..12f97b3 100644
--- a/src/toolbox/tool-transform.xml
+++ b/src/toolbox/tool-transform.xml
@@ -1,7 +1,8 @@
 <?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";>
-<!-- section history:
+<!-- section history
+  2009 04-08 j.h: made some explanations clearer, I hope
   2009-03-17 j.h: updated to v2.6. Added Opacity
   2008-02-26 kost: updated 'no' v2.4
   2007-06-10 kost: added 'no'
@@ -69,12 +70,8 @@
               <para>
                 When you activate the first button
                 <guiicon>
-                  <inlinemediaobject>
-                    <imageobject>
-                      <imagedata
+                  <inlinegraphic
                         fileref="images/tool-options/rotate-affect-layer.png"/>
-                    </imageobject>
-                  </inlinemediaobject>
                 </guiicon>
                 the tool works on the active layer. If no selection exists in
                 this layer, the whole layer will be transformed.
@@ -84,12 +81,8 @@
               <para>
                 When you activate the second button
                 <guiicon>
-                  <inlinemediaobject>
-                    <imageobject>
-                      <imagedata
+                  <inlinegraphic
                       fileref="images/tool-options/rotate-affect-selection.png"/>
-                    </imageobject>
-                  </inlinemediaobject>
                 </guiicon>
                 the tool works on the selection contour only (the whole layer
                 contour if no selection).
@@ -99,12 +92,8 @@
               <para>
                 When you activate the third button,
                 <guiicon>
-                  <inlinemediaobject>
-                    <imageobject>
-                      <imagedata
+                  <inlinegraphic
                         fileref="images/tool-options/rotate-affect-path.png"/>
-                    </imageobject>
-                  </inlinemediaobject>
                 </guiicon>
                 the tool works on the path only.
               </para>
@@ -115,21 +104,22 @@
       <varlistentry>
         <term>Direction</term>
         <listitem>
-          <para><guilabel>Direction</guilabel> sets which way or direction a
-            layer is transformed. The Traditional mode will transform the
-            image or layer as one might expect. You just use the handles to do
-            the  transformation that want to see happen on the image or layer
-            on the grid. When you then execute the transformation the image or
-            layer is transformed to the shape and position you put the grid
-            into.
+          <para>
+            <guilabel>Direction</guilabel> sets which way or direction a
+            layer is transformed:
+          </para>
+          <para>
+            The <quote>Normal (Forward)</quote> mode will transform the
+            image or layer as one might expect. You just use the handles to
+            perform the  transformation you want. If you use a grid (see
+            below), the image or layer is transformed according to the
+            shape and position you put the grid into.
           </para>
           <para>
-            Corrective Rotation is primarily used to repair digital images
-            that have some geometric errors. To do so, you just have to align
-            the grid to show the same error as the image or layer. If you then
-            execute the transformation the grid and the image or layer wit it
-            are transformed <quote>backwards</quote> until the grid is again
-            in the rectangular and straight shape it was when you started.
+            <quote>Corrective (Backward)</quote> inverts the direction.
+            Primarily used with the Rotation tool to repair digital images
+            that have some geometric errors (a horizon not horizontal, a wall
+            not vertical...). See <xref linkend="gimp-tool-rotate" />.
           </para>
         </listitem>
       </varlistentry>
@@ -230,21 +220,33 @@
                       <imagedata fileref="images/toolbox/clip-3.png" format="PNG"/>
                     </imageobject>
                     <caption>
-                      <para>Crop to result</para>
+                      <para>Rotation 45° with Crop to result</para>
+                    </caption>
+                  </mediaobject>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="images/toolbox/clip-3b.png"
+                                 format="PNG"/>
+                    </imageobject>
+                    <caption>
+                      <para>
+                        The crop limit is marked with red. No transparent
+                        area is included.
+                      </para>
                     </caption>
                   </mediaobject>
                 </figure>
                 <para>
-                  If this option is selected, any border with no content that
-                  might occur after applying a transform operation to a layer
-                  will be removed.
+                  If this option is selected, the image is cropped so that
+                  the transparent area, created by the transform operation
+                  in corners, will not be included in the resulting image.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term>Crop with aspect</term>
               <listitem>
-                <figure>
+<!--                <figure>
                   <title>Example for Crop with aspect</title>
                   <mediaobject>
                     <imageobject>
@@ -255,6 +257,7 @@
                     </caption>
                   </mediaobject>
                 </figure>
+Commented until somebody finds a valid example-->
                 <para>
                   This option works like the one described before, but makes
                   sure, that the aspect ratio is maintained.
diff --git a/src/toolbox/tool-zoom.xml b/src/toolbox/tool-zoom.xml
index 184ba26..e7e42be 100644
--- a/src/toolbox/tool-zoom.xml
+++ b/src/toolbox/tool-zoom.xml
@@ -1,7 +1,7 @@
 <?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";>
 <!-- section history:
-  2009 j.h: review for v2.6. No change
+  2009-04-04 j.h: review for v2.6. Magnify -> Zoom
   2008-02-28 j.h: added Ctrl+mouse wheel en;fr
   2007-12-21 j.h: updated to v2.4. One option is deprecated
   2007-06-05 kost: added 'no'
@@ -14,23 +14,16 @@
   050818 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-zoom">
-  <title>Magnify</title>
+  <title>Zoom</title>
   <indexterm>
     <primary>Tools</primary>
-    <secondary>Magnify</secondary>
-  </indexterm>
-  <indexterm>
-    <primary>Magnify</primary>
+    <secondary>Zoom</secondary>
   </indexterm>
   <indexterm>
     <primary>Zoom</primary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>
-        The <quote>Zoom</quote> tool in Toolbox
-      </phrase>
-    </title>
+    <title>The <quote>Zoom</quote> tool in Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-zoom.png" format="PNG"/>
@@ -38,7 +31,7 @@
     </mediaobject>
   </figure>
   <para>
-    The Magnify Tool is used to change the zoom level of your working image.
+    The Zoom Tool is used to change the zoom level of your working image.
     If you only click on the image, the zoom is applied to the whole image.
     But you can also click-and-drag the mouse pointer to create a zoom
     rectangle. Then, the action of this rectangle is better understood if the
@@ -48,17 +41,16 @@
     dimension of the image window (if the biggest dimension of the rectangle
     is width, then it will fit the width of the image window).
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can get to the Magnify Tool from the image-menu through :
+          You can get to the Tool Tool from the image-menu through :
           <menuchoice>
             <guimenu>Tools</guimenu>
-            <guisubmenu>Magnify</guisubmenu>
+            <guisubmenu>Zoom</guisubmenu>
           </menuchoice>,
         </para>
       </listitem>
@@ -66,18 +58,15 @@
         <para>
           or by clicking the tool icon:
           <guiicon>
-            <inlinemediaobject>
-              <imageobject>
-                <imagedata
+            <inlinegraphic
                   fileref="images/toolbox/stock-tool-zoom-22.png"/>
-              </imageobject>
-            </inlinemediaobject>
           </guiicon>
           in Toolbox.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -105,21 +94,18 @@
         </term>
         <listitem>
           <para>
-            Spinning the mouse wheel, without clicking, while pressing Ctrl,
-            varies the zoom.
+            Spinning the mouse wheel, while pressing Ctrl, varies the zoom
+            level.
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Zoom tool options</phrase>
-      </title>
+      <title>Zoom tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-zoom.png" format="PNG"/>
@@ -128,16 +114,6 @@
     </figure>
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for Magnify can be accessed by double
-            clicking the Magnify tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-zoom-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Auto-resize window</term>
         <listitem>
           <para>
@@ -157,12 +133,11 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Zoom menu</phrase>
-    </title>
+    <title>Zoom menu</title>
     <para>
-      Using the Magnify tool is not the only way to zoom an image.
+      Using the Zoom tool is not the only way to zoom an image.
       The <link linkend="gimp-view-zoom">Zoom menu</link> provides
       access to several functions for changing the image magnification
       level. For example, you can easily choose an exact magnification
diff --git a/src/toolbox/toolbox-color-area.xml b/src/toolbox/toolbox-color-area.xml
index 79072fb..0d9236d 100644
--- a/src/toolbox/toolbox-color-area.xml
+++ b/src/toolbox/toolbox-color-area.xml
@@ -13,7 +13,7 @@
 <!--  <sect1info>
     <revhistory>
       <revision>
-        <revnumber>$Revision$</revnumber>
+        <revnumber>$Revision: 2728 $</revnumber>
         <date>2007-11-15</date>
         <authorinitials>j.h</authorinitials>
       </revision>
diff --git a/src/toolbox/tools-painting.xml b/src/toolbox/tools-painting.xml
index e65222e..20db35c 100644
--- a/src/toolbox/tools-painting.xml
+++ b/src/toolbox/tools-painting.xml
@@ -9,18 +9,14 @@
   2007-01-13 lexa: enhanced docbook compliance
 -->
 <sect2 id="gimp-tool-painting">
-  <title>
-    <phrase>Painting Tools (Pencil, Paintbrush, Airbrush)</phrase>
-  </title>
+  <title>Painting Tools (Pencil, Paintbrush, Airbrush)</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Painting Tools</secondary>
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Painting example</phrase>
-    </title>
+    <title>Painting example</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/painting-examples.png" format="PNG"/>
@@ -58,9 +54,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Key modifiers</phrase>
-    </title>
+    <title>Key modifiers</title>
     <variablelist>
       <varlistentry>
         <term>



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