gimp-help-2 r2762 - in trunk: . images/C/tool-options images/C/toolbox src/toolbox



Author: jhardlin
Date: Mon Feb 23 13:46:54 2009
New Revision: 2762
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2762&view=rev

Log:
2009-02-23 Julien hardelin <jm hard wanadoo fr>

        * src/toolbox/tool-move.xml
        * src/toolbox/tool-pencil.xml
        * src/toolbox/tool-airbrush.xml
        * src/toolbox/tool-ink.xml
        * src/toolbox/tool-eraser.xml
        * src/toolbox/about-common-options-display.xml
        * src/toolbox/tool-brush.xml
        * src/toolbox/tool-blend.xml
        * src/toolbox/tool-smudge.xml
        * src/toolbox/tool-perspective.xml
        * src/toolbox/tool-convolve.xml
        * src/toolbox/tool-clone.xml
        * src/toolbox/tool-bucket-fill.xml
        * src/toolbox/tool-crop.xml
        * src/toolbox/tool-heal.xml
        * src/toolbox/tool-transform.xml
        * src/toolbox/tool-paintbrush.xml
        * src/toolbox/tool-dodge-burn.xml
        * src/toolbox/tool-perspective-clone.xml
        * src/toolbox/tool-scale.xml
        * src/toolbox/tool-flip.xml
        * src/toolbox/tool-align.xml
        * src/toolbox/tools-painting.xml
        * src/toolbox/tool-rotate.xml
        * src/toolbox/tool-shear.xml

        * images/C/toolbox/brush-dynamics.png: added
        * images/C/tool-options/ink-type-circle.png
        * images/C/toolbox/tool-options-shear.png
        * images/C/toolbox/tool-options-heal.png
        * images/C/toolbox/perspective-clone-options.png
        * images/C/toolbox/tool-options-rotate.png
        * images/C/toolbox/toolbox-pen.png
        * images/C/toolbox/toolbox-perspective-clone.png
        * images/C/toolbox/toolbox-scale.png
        * images/C/toolbox/toolbox-gradient.png
        * images/C/toolbox/toolbox-shear.png
        * images/C/toolbox/tool-options-smudge.png
        * images/C/toolbox/tool-options-fill.png
        * images/C/toolbox/toolbox-heal.png
        * images/C/toolbox/tool-options-align.png
        * images/C/toolbox/toolbox-brush.png
        * images/C/toolbox/tool-options-crop.png
        * images/C/toolbox/brush-tools.png
        * images/C/toolbox/toolbox-rotate.png
        * images/C/toolbox/toolbox-smudge.png
        * images/C/toolbox/toolbox-fill.png
        * images/C/toolbox/toolbox-align.png
        * images/C/toolbox/tool-options-eraser.png
        * images/C/toolbox/toolbox-crop.png
        * images/C/toolbox/transform-tools-common-options.png
        * images/C/toolbox/tool-options-convolve.png
        * images/C/toolbox/tool-options-brushcommon.png
        * images/C/toolbox/tool-options-paintbrush.png
        * images/C/toolbox/tool-options-dodge.png
        * images/C/toolbox/tool-options-perspective.png
        * images/C/toolbox/tool-options-flip.png
        * images/C/toolbox/tool-options-clone.png
        * images/C/toolbox/toolbox-eraser.png
        * images/C/toolbox/transform-tools.png
        * images/C/toolbox/tool-options-move.png
        * images/C/toolbox/tool-options-paint-gradient.png
        * images/C/toolbox/tool-options-pencil.png
        * images/C/toolbox/tool-options-airbrush.png
        * images/C/toolbox/toolbox-dodge.png
        * images/C/toolbox/toolbox-perspective.png
        * images/C/toolbox/toolbox-flip.png
        * images/C/toolbox/toolbox-clone.png
        * images/C/toolbox/tool-options-ink.png
        * images/C/toolbox/blend-tool-options.png
        * images/C/toolbox/toolbox-blur.png
        * images/C/toolbox/toolbox-move.png
        * images/C/toolbox/toolbox-pencil.png
        * images/C/toolbox/toolbox-airbrush.png
        * images/C/toolbox/tool-options-scale.png: applied patch from JPL who
          updated files to v2.6


Added:
   trunk/images/C/toolbox/brush-dynamics.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/images/C/tool-options/ink-type-circle.png
   trunk/images/C/toolbox/blend-tool-options.png
   trunk/images/C/toolbox/brush-tools.png
   trunk/images/C/toolbox/perspective-clone-options.png
   trunk/images/C/toolbox/tool-options-airbrush.png
   trunk/images/C/toolbox/tool-options-align.png
   trunk/images/C/toolbox/tool-options-brushcommon.png
   trunk/images/C/toolbox/tool-options-clone.png
   trunk/images/C/toolbox/tool-options-convolve.png
   trunk/images/C/toolbox/tool-options-crop.png
   trunk/images/C/toolbox/tool-options-dodge.png
   trunk/images/C/toolbox/tool-options-eraser.png
   trunk/images/C/toolbox/tool-options-fill.png
   trunk/images/C/toolbox/tool-options-flip.png
   trunk/images/C/toolbox/tool-options-heal.png
   trunk/images/C/toolbox/tool-options-ink.png
   trunk/images/C/toolbox/tool-options-move.png
   trunk/images/C/toolbox/tool-options-paint-gradient.png
   trunk/images/C/toolbox/tool-options-paintbrush.png
   trunk/images/C/toolbox/tool-options-pencil.png
   trunk/images/C/toolbox/tool-options-perspective.png
   trunk/images/C/toolbox/tool-options-rotate.png
   trunk/images/C/toolbox/tool-options-scale.png
   trunk/images/C/toolbox/tool-options-shear.png
   trunk/images/C/toolbox/tool-options-smudge.png
   trunk/images/C/toolbox/toolbox-airbrush.png
   trunk/images/C/toolbox/toolbox-align.png
   trunk/images/C/toolbox/toolbox-blur.png
   trunk/images/C/toolbox/toolbox-brush.png
   trunk/images/C/toolbox/toolbox-clone.png
   trunk/images/C/toolbox/toolbox-crop.png
   trunk/images/C/toolbox/toolbox-dodge.png
   trunk/images/C/toolbox/toolbox-eraser.png
   trunk/images/C/toolbox/toolbox-fill.png
   trunk/images/C/toolbox/toolbox-flip.png
   trunk/images/C/toolbox/toolbox-gradient.png
   trunk/images/C/toolbox/toolbox-heal.png
   trunk/images/C/toolbox/toolbox-move.png
   trunk/images/C/toolbox/toolbox-pen.png
   trunk/images/C/toolbox/toolbox-pencil.png
   trunk/images/C/toolbox/toolbox-perspective-clone.png
   trunk/images/C/toolbox/toolbox-perspective.png
   trunk/images/C/toolbox/toolbox-rotate.png
   trunk/images/C/toolbox/toolbox-scale.png
   trunk/images/C/toolbox/toolbox-shear.png
   trunk/images/C/toolbox/toolbox-smudge.png
   trunk/images/C/toolbox/transform-tools-common-options.png
   trunk/images/C/toolbox/transform-tools.png
   trunk/src/toolbox/about-common-options-display.xml
   trunk/src/toolbox/tool-airbrush.xml
   trunk/src/toolbox/tool-align.xml
   trunk/src/toolbox/tool-blend.xml
   trunk/src/toolbox/tool-brush.xml
   trunk/src/toolbox/tool-bucket-fill.xml
   trunk/src/toolbox/tool-clone.xml
   trunk/src/toolbox/tool-convolve.xml
   trunk/src/toolbox/tool-crop.xml
   trunk/src/toolbox/tool-dodge-burn.xml
   trunk/src/toolbox/tool-eraser.xml
   trunk/src/toolbox/tool-flip.xml
   trunk/src/toolbox/tool-heal.xml
   trunk/src/toolbox/tool-ink.xml
   trunk/src/toolbox/tool-move.xml
   trunk/src/toolbox/tool-paintbrush.xml
   trunk/src/toolbox/tool-pencil.xml
   trunk/src/toolbox/tool-perspective-clone.xml
   trunk/src/toolbox/tool-perspective.xml
   trunk/src/toolbox/tool-rotate.xml
   trunk/src/toolbox/tool-scale.xml
   trunk/src/toolbox/tool-shear.xml
   trunk/src/toolbox/tool-smudge.xml
   trunk/src/toolbox/tool-transform.xml
   trunk/src/toolbox/tools-painting.xml

Modified: trunk/images/C/tool-options/ink-type-circle.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/blend-tool-options.png
==============================================================================
Binary files. No diff available.

Added: trunk/images/C/toolbox/brush-dynamics.png
==============================================================================
Binary file. No diff available.

Modified: trunk/images/C/toolbox/brush-tools.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/perspective-clone-options.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-airbrush.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-align.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-brushcommon.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-clone.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-convolve.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-crop.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-dodge.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-eraser.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-fill.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-flip.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-heal.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-ink.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-move.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-paint-gradient.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-paintbrush.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-pencil.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-perspective.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-rotate.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-scale.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-shear.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-smudge.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-airbrush.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-align.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-blur.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-brush.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-clone.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-crop.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-dodge.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-eraser.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-fill.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-flip.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-gradient.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-heal.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-move.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-pen.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-pencil.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-perspective-clone.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-perspective.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-rotate.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-scale.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-shear.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-smudge.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/transform-tools-common-options.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/transform-tools.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/toolbox/about-common-options-display.xml
==============================================================================
--- trunk/src/toolbox/about-common-options-display.xml	(original)
+++ trunk/src/toolbox/about-common-options-display.xml	Mon Feb 23 13:46:54 2009
@@ -6,7 +6,7 @@
       src/toolbox/tool-{rect,ellipse,fuzzy,by-color,iscissors}-select.xml.
 -->
 
-<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
@@ -17,4 +17,4 @@
       <guimenuitem>Tool Options</guimenuitem>
     </menuchoice> which opens the option window of the selected tool.
   </para>
-</note>
+

Modified: trunk/src/toolbox/tool-airbrush.xml
==============================================================================
--- trunk/src/toolbox/tool-airbrush.xml	(original)
+++ trunk/src/toolbox/tool-airbrush.xml	Mon Feb 23 13:46:54 2009
@@ -11,15 +11,6 @@
   050522 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-airbrush">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-05</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Airbrush Tool</phrase>
   </title>
@@ -30,6 +21,7 @@
     <primary>Tools</primary>
     <secondary>Airbrush</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Airbrush tool in Toolbox</phrase>
@@ -40,6 +32,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The Airbrush tool emulates a traditional airbrush. This tool is suitable
     for painting soft areas of color.
@@ -53,7 +46,11 @@
       <listitem>
         <para>
           From the image-menu, through :
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Airbrush</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>PaintTools</guisubmenu>
+            <guimenuitem>Airbrush</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
@@ -70,6 +67,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -100,6 +98,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -114,13 +113,20 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by double-clicking the
-      airbrush Tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-airbrush-22.png"/></imageobject></inlinemediaobject></guiicon>
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
+        <term>
+          Mode; Opacity; Brush; Scale; Brush Dynamics; Fade out;
+          Apply Jitter; Use color from gradient
+        </term>
+        <listitem>
+          <xi:include href="about-common-brush-options.xml"/>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Rate</term>
         <listitem>
           <para>

Modified: trunk/src/toolbox/tool-align.xml
==============================================================================
--- trunk/src/toolbox/tool-align.xml	(original)
+++ trunk/src/toolbox/tool-align.xml	Mon Feb 23 13:46:54 2009
@@ -10,15 +10,6 @@
   2007-08-14 ciampix: align tool stub page created
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-align">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-08-27</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Align</phrase>
   </title>
@@ -29,6 +20,7 @@
     <primary>Tools</primary>
     <secondary>Align</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Align tool in the toolbox</phrase>
@@ -51,22 +43,33 @@
     selection, path...) the selected layer will be aligned on. This
     object is called <emphasis>target</emphasis>.
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>You can activate the Align tool in several ways :</para>
     <itemizedlist>
       <listitem>
         <para>
           From the image-menu, through:
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Align</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Align</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking on the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-align-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-align-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in the toolbox.
         </para>
       </listitem>
@@ -77,6 +80,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -109,32 +113,27 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>Options</phrase>
+      <phrase>Tool Options</phrase>
     </title>
     <figure>
       <title>
-        <phrase>Align options</phrase>
+        <phrase>Tool Options for the Align tool</phrase>
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-align.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/tool-options-align.png"/>
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options can be accessed by (double)-clicking the
-            align Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-align-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Align</term>
         <listitem>
           <variablelist>
@@ -164,8 +163,7 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Selection</guilabel>: the minimal rectangular
-                      region covering the active selection.
+                    <para><guilabel>Active layer</guilabel>:
                     </para>
                   </listitem>
                   <listitem>
@@ -173,8 +171,7 @@
                     </para>
                   </listitem>
                   <listitem>
-                    <para><guilabel>Active Path</guilabel>: This option is not yet
-                      handled.
+                    <para><guilabel>Active Path</guilabel>:
                     </para>
                   </listitem>
                 </itemizedlist>
@@ -315,7 +312,9 @@
           <para>
             We chose <quote>Selection</quote> as a target and we clicked
             on the
-            <guiicon><inlinegraphic fileref="images/tool-options/stock-gravity-east-24.png"/></guiicon> button (Related to). The red layer is aligned with
+            <guiicon><inlinegraphic
+              fileref="images/tool-options/stock-gravity-east-24.png"/>
+            </guiicon> button (Related to). The red layer is aligned with
             the right side of the selection.
           </para>
         </caption>
@@ -333,7 +332,9 @@
           <para>
             We set Offset to -5, we chose <quote>Active layer</quote> as a
             target and we clicked on the
-            <guiicon><inlinegraphic fileref="images/tool-options/stock-gravity-east-24.png"/></guiicon> button (Distribution).
+            <guiicon><inlinegraphic
+              fileref="images/tool-options/stock-gravity-east-24.png"/>
+            </guiicon> button (Distribution).
             The layer is aligned 5 pixels before the right side of the
             yellow active layer.
           </para>
@@ -364,7 +365,9 @@
           <para>
             Again, <guilabel>Selection</guilabel> is the target. After a click
             on the
-            <guiicon><inlinegraphic fileref="images/tool-options/stock-gravity-west-24.png"/></guiicon>
+            <guiicon><inlinegraphic
+              fileref="images/tool-options/stock-gravity-west-24.png"/>
+            </guiicon>
             button, both layers are aligned with the left side of the
             selection.
           </para>

Modified: trunk/src/toolbox/tool-blend.xml
==============================================================================
--- trunk/src/toolbox/tool-blend.xml	(original)
+++ trunk/src/toolbox/tool-blend.xml	Mon Feb 23 13:46:54 2009
@@ -17,15 +17,6 @@
      050817 de reviewed by axel.wernicke
      -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-blend">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-17</date>
-        <authorinitials>alex falappa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Blend</phrase>
   </title>
@@ -40,6 +31,7 @@
     <primary>Tools</primary>
     <secondary>Blend</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Blend tool in Toolbox.</phrase>
@@ -50,6 +42,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     This tool fills the selected area with a gradient blend of the foreground
     and background colors by default, but there are many options. To make a
@@ -58,7 +51,7 @@
     size of your blend. The softness of the blend depends on how far you drag
     the cursor. The shorter the drag distance, the sharper it will be.
   </para>
-  <para><!-- 2007-04-11 lexa: added gradient refs -->
+  <para>
     There are an astonishing number of things you can do with this tool, and
     the possibilities may seem a bit overwhelming at first. The two most
     important options you have are the Gradient and the Shape. Clicking the
@@ -88,6 +81,7 @@
       patterns, changing and adding every time you drag the cursor.
     </para>
   </tip>
+
   <sect3>
     <title>
       <phrase>Activate the Tool</phrase>
@@ -99,7 +93,11 @@
       <listitem>
         <para>
           From the image-menu:
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Blend</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Blend</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -115,6 +113,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -148,11 +147,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by double clicking the
-      Gradient Tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-blend-22.png"/></imageobject></inlinemediaobject></guiicon>
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>Mode; Opacity</term>

Modified: trunk/src/toolbox/tool-brush.xml
==============================================================================
--- trunk/src/toolbox/tool-brush.xml	(original)
+++ trunk/src/toolbox/tool-brush.xml	Mon Feb 23 13:46:54 2009
@@ -25,6 +25,7 @@
     <primary>Toolbox</primary>
     <secondary>Brush Tools</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Paint Tools (Tools menu)</phrase>
@@ -35,6 +36,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The GIMP Toolbox includes thirteen <quote>brush tools</quote>,
     all grouped together at the bottom (in the default arrangement).
@@ -53,6 +55,7 @@
     The feature they all have in common is that all of them are used by moving
     the pointer across the image display, creating brush-strokes. Four of them
   </para>
+
   <itemizedlist>
     <listitem>
       <para>
@@ -75,6 +78,7 @@
       </para>
     </listitem>
   </itemizedlist>
+
   <para>
     behave like the intuitive notion of "painting" with a brush. The others
     use a brush to modify an image in some way rather than paint on it:
@@ -133,6 +137,7 @@
       </para>
     </listitem>
   </itemizedlist>
+
   <para>
     The advantages of using GIMP with a tablet instead of a mouse
     probably show up more clearly for brush tools than anywhere else:
@@ -148,6 +153,7 @@
     such as the Eraser, Smudge tool, etc., and any options you set for
     the tool will be applied.  See the section on <link linkend="gimp-selection-stroke">Stroking</link> for more information.
   </para>
+
   <sect3 id="gimp-tools-brush-modifiers">
     <title>
       <phrase>Key modifiers</phrase>
@@ -161,7 +167,7 @@
           <para>
             Holding down the <keycap>Ctrl</keycap> key has a special effect
             on every brush tool <!--except the ink tool-->. For the Pencil,
-            Paintbrush, Airbrush, Ink Tool, Eraser, and Smudge tools, it
+            Paintbrush, Airbrush, Ink Tool, and Eraser tools, it
             switches them into <quote>color picker</quote> mode, so that
             clicking on an image pixel causes GIMP's foreground to be set
             to the active layer's color at that point (or, for the Eraser,
@@ -169,11 +175,12 @@
             <keycap>Ctrl</keycap> key switches it into a mode where
             clicking sets the reference point for copying. For the Convolve
             tool, the <keycap>Ctrl</keycap> key switches between blur and
-            sharpen modes; the the Dodge/Burn tool, it switches between
+            sharpen modes; for the Dodge/Burn tool, it switches between
             dodging and burning.
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>
           <keycap>Shift</keycap>
@@ -196,6 +203,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>
           <keycombo>
@@ -216,6 +224,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3 id="gimp-tool-brush-options">
     <title>
       <phrase>Tool Options</phrase>
@@ -230,9 +239,10 @@
         </imageobject>
       </mediaobject>
     </figure>
+
     <para>
       Many tool options are shared by several brush tools: these are described
-      here. Options that apply only to one specific tool, or to a small number
+      here. Options that apply onltool-options-brushcommony to one specific tool, or to a small number
       of tools, are described in the sections devoted to those tools.
     </para>
     <variablelist id="gimp-tool-painting-modes">
@@ -457,6 +467,7 @@
           </itemizedlist>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Opacity</term>
         <listitem>
@@ -501,6 +512,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Scale</term>
         <listitem>
@@ -514,9 +526,40 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
-        <term>Pressure Sensitivity</term>
+        <term>Brush Dynamics</term>
         <listitem>
+          <figure>
+            <title>
+              <phrase>
+                The Brush Dynamics check box.
+              </phrase>
+            </title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/brush-dynamics.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+          <para>
+            Brush dynamics let you map different brush parameters, commonly at
+            least size and opacity, to one or more of three input dynamics:
+            pressure, velocity and random. They are mostly used with tablets,
+            but Velocity and Random are also usable with a mouse. The
+            Ink tool, that supported velocity before, has been overhauled and
+            now handles velocity-dependent painting much better.
+          </para>
+          <para>
+            A new option has been added in stroking paths. Stoke Path and
+            Stroke Selection have now a check box for emulating brush
+            dynamics when you stroke using a paint tool. That means that when
+            you stoke, brush pressure and velocity are varying along the length
+            of the stroke. Pressure starts with zero, ramps up to full pressure
+            and then ramps down again to no pressure. Velocity starts from
+            zero and ramps up to full speed by the end of the stroke.
+          </para>
           <para>
             The Pressure Sensitivity section is only meaningful if you are
             using a tablet:  it allows you to decide which aspects of the
@@ -583,6 +626,7 @@
           </variablelist>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Fade Out</term>
         <listitem>
@@ -626,6 +670,7 @@
           </figure>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Incremental</term>
         <listitem>
@@ -643,6 +688,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry id="gimp-tool-painting-gradient">
         <term>Color from Gradient</term>
         <listitem>
@@ -747,14 +793,31 @@
                 <para>
                   This option determines what happens if a brushstroke extends
                   farther than the Length specified above. There are three
-                  possibilities: "None" means that the color from the end of
-                  the gradient will be used throughout the remainder of the
-                  stroke; "Sawtooth wave" means that the gradient will be
-                  restarted from the beginning, which will often produce a
-                  color discontinuity; "Triangular wave" means that the
-                  gradient will be traversed in reverse, afterwards bouncing
-                  back and forth until the end of the brushstroke.
+                  possibilities:
                 </para>
+                <itemizedlist>
+                  <listitem>
+                    <para>
+                      <guilabel>None</guilabel> means that the color from the end of
+                      the gradient will be used throughout the remainder of the
+                      stroke;
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Sawtooth wave</guilabel> means that the gradient will be
+                      restarted from the beginning, which will often produce a
+                      color discontinuity;
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Triangular wave</guilabel> means that the
+                      gradient will be traversed in reverse, afterwards bouncing
+                      back and forth until the end of the brushstroke.
+                    </para>
+                  </listitem>
+                </itemizedlist>
               </listitem>
             </varlistentry>
           </variablelist>
@@ -763,6 +826,7 @@
     </variablelist>
   </sect3>
   <sect3>
+
     <title>
       <phrase>Further Information</phrase>
     </title>

Modified: trunk/src/toolbox/tool-bucket-fill.xml
==============================================================================
--- trunk/src/toolbox/tool-bucket-fill.xml	(original)
+++ trunk/src/toolbox/tool-bucket-fill.xml	Mon Feb 23 13:46:54 2009
@@ -10,16 +10,7 @@
   2005-11-30 informalfigure replaced by figure by lexa
   050815 de reviewed by axel.wernicke
 -->
-<sect2 id="gimp-tool-bucket-fill">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-02-20</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-bucket-fill">
   <title>
     <phrase>Bucket Fill</phrase>
   </title>
@@ -30,6 +21,7 @@
   <indexterm>
     <primary>Bucket Fill</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Toolbox Fill</phrase>
@@ -40,6 +32,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     This tool fills a selection with the current foreground color. If you
     Ctrl+click and use the Bucket tool, it will use the background color
@@ -63,12 +56,13 @@
     the bucket tool won't fill semi-transparent pixels, and they will stand
     out against the fill because they have kept their original color.
   </para>
-  <para><!--TODO es;pl;ru v2.4: option name and description have changed-->
+  <para>
     If you want to fill areas that are totally transparent, you have to make
     sure that the <quote>Lock</quote> option (in the Layers dialog) is
     unchecked. If this option is checked, only the non-transparent parts of
     the layer will be filled.
   </para>
+
   <sect3>
     <title>
       <phrase>Activate tool</phrase>
@@ -77,10 +71,11 @@
       <listitem>
         <para>
           You can find the Bucket Fill tool from the image-menu through:
-          <guimenuitem><accel>T</accel>ools</guimenuitem>/
-          <guimenuitem><accel>P</accel>aint
-            Tools</guimenuitem>/<guimenuitem><accel>B</accel>ucket
-            Fill.</guimenuitem>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Bucket Fill</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
@@ -98,6 +93,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -115,6 +111,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -129,14 +126,12 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options for the Fill Tool can be accessed by double
-      clicking the Fill Tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-bucket-fill-22.png"/></imageobject></inlinemediaobject></guiicon>
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Mode</term>
+        <term>Mode; Opacity</term>
         <listitem>
           <para>
             See <link linkend="gimp-tool-brush">Paint Tools</link>
@@ -146,6 +141,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Fill Type</term>
         <listitem>
@@ -188,6 +184,7 @@
           </variablelist>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Affected Area</term>
         <listitem>
@@ -217,6 +214,7 @@
           </variablelist>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Finding Similar Colors</term>
         <listitem>
@@ -356,6 +354,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Fill a feathered selection</phrase>

Modified: trunk/src/toolbox/tool-clone.xml
==============================================================================
--- trunk/src/toolbox/tool-clone.xml	(original)
+++ trunk/src/toolbox/tool-clone.xml	Mon Feb 23 13:46:54 2009
@@ -27,6 +27,7 @@
   <indexterm>
     <primary>Clone</primary>
   </indexterm>
+  
   <figure>
     <title>
       <phrase>Clone tool icon in the Toolbox</phrase>
@@ -37,6 +38,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+  
   <para>
     The Clone tool uses the current brush to copy from an image or pattern.
     It has many uses: one of the most important is to repair problem areas in
@@ -50,13 +52,19 @@
   <para>
     If you want to clone from an image, instead of a pattern, you must tell
     GIMP which image you want to copy from. You do this by holding down the
-    Ctrl key and clicking in the desired source image. Until you have set the
-    source in this way, you will not be able to paint with the Clone tool:
-    the tool cursor tells you this by showing
-    <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/clone-bad.png"/></imageobject></inlinemediaobject></guiicon>.
+    <keycap>Ctrl</keycap> key and clicking in the desired source image.
+    Until you have set the source in this way, you will not be able to paint
+    with the Clone tool: the tool cursor tells you this by showing
+    <guiicon>
+      <inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/clone-bad.png"/>
+        </imageobject>
+      </inlinemediaobject>
+    </guiicon>.
   </para>
   <para>
-    If you clone from a pattern, the pattern is <emphasis>tiled</emphasis>;
+    If you clone from a pattern, the pattern is <emphasis>tiled</emphasis>; 
     that is, when the point you are copying from moves past one of the
     edges, it jumps to the opposite edge and continues, as though the pattern
     were repeated side-by-side, indefinitely. When you clone from an image
@@ -71,6 +79,7 @@
     layer to an Indexed layer or a layer mask), then the colors will be
     converted to the closest possible approximations.
   </para>
+  
   <sect3>
     <title>
       <phrase>How to Activate</phrase>
@@ -91,20 +100,22 @@
       </listitem>
       <listitem>
         <para>
-          By pressing the <keycap>c</keycap> keyboard shortcut.
+          By pressing the <keycap>C</keycap> keyboard shortcut.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+  
   <sect3>
     <title>
       <phrase>Key modifiers</phrase>
     </title>
     <para>
-      See the <link linkend="gimp-tools-brush-modifiers">brush tools key
+      See the <link linkend="gimp-tools-brush-modifiers">Brush tools key
       modifiers</link> for a description of key modifiers that have the same
       effect on all brush tools.
     </para>
+    
     <variablelist>
       <varlistentry>
         <term>
@@ -112,13 +123,13 @@
         </term>
         <listitem>
           <para>
-            The Ctrl key is used to select the source, if you are cloning
-            from an image: it has no effect if you are cloning from a
-            pattern. You can clone from any layer of any image, by clicking
-            on the image display, with the Ctrl key held down, while the
-            layer is active (as shown in the Layers dialog). If Alignment is
-            set to <quote>None</quote>, <quote>Aligned</quote>, or
-            <quote>Fixed</quote> in tool options, then the point you click on
+            The <keycap>Ctrl</keycap> key is used to select the source, if you
+            are cloning from an image: it has no effect if you are cloning
+            from a pattern. You can clone from any layer of any image, by
+            clicking on the image display, with the Ctrl key held down, while
+            the layer is active (as shown in the Layers dialog). If Alignment
+            is set to <keycap>None</keycap>, <keycap>Aligned</keycap>, or
+            <keycap>Fixed</keycap> in tool options, then the point you click on
             becomes the origin for cloning: the image data at that point will
             be used when you first begin painting with the Clone tool. In
             source-selection mode, the cursor changes to a reticle cross
@@ -129,6 +140,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+  
   <sect3>
     <title>
       <phrase>Tool Options</phrase>
@@ -146,7 +158,7 @@
     <variablelist>
       <varlistentry>
         <term>
-          Mode; Opacity; Brush; Pressure Sensitivity, Fade out, Apply Jitter,
+          Mode; Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter;
           Hard Edges
         </term>
         <listitem>
@@ -170,10 +182,18 @@
               <term>Image</term>
               <listitem>
                 <para>
-                  If you choose <quote>Image source</quote>,
+                  If you choose <keycap>Image source</keycap>,
                   you must tell GIMP which layer to use as the source, by
                   Ctrl-clicking on it, before you can paint with the tool.
                 </para>
+                <para>
+                  If you check <keycap>Sample merged</keycap> it's what you 
+                  <quote>see</quote> (color made with all the layers of a 
+                  multi-layer image) that's cloned. If it's unchecked, only 
+                  the selected layer is cloned. For more information see the 
+                  glossary entry 
+                  <link linkend="glossary-samplemerge">Sample Merge</link>
+                </para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -369,6 +389,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+  
   <sect3 id="filter-and-history-brushes">
     <title>
       <phrase>Further Information</phrase>

Modified: trunk/src/toolbox/tool-convolve.xml
==============================================================================
--- trunk/src/toolbox/tool-convolve.xml	(original)
+++ trunk/src/toolbox/tool-convolve.xml	Mon Feb 23 13:46:54 2009
@@ -11,15 +11,6 @@
   050523 de reviewed by axel.wernicke
   -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-convolve">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-02-27</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Convolve (Blur/Sharpen)</phrase>
   </title>
@@ -30,6 +21,7 @@
   <indexterm>
     <primary>Convolve</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Convolve tool icon in the Toolbox</phrase>
@@ -52,10 +44,12 @@
   <para>
     In <quote>Sharpen</quote> mode, the tool works by increasing the contrast
     where the brush is applied.  A little bit of this may be useful, but
-    over-application will produce noise.  Some of the <link linkend="filters-enhance">Enhancement Filters</link>, particularly
+    over-application will produce noise.  Some of the
+    <link linkend="filters-enhance">Enhancement Filters</link>, particularly
     the <link linkend="plug-in-unsharp-mask">Unsharp Mask</link>, do a
     much cleaner job of sharpening areas of a layer.
   </para>
+
   <tip>
     <para>
       You can create a more sophisticated sharpening brush using the Clone
@@ -69,6 +63,7 @@
       version with the unsharpened version.
     </para>
   </tip>
+
   <para>
     Both blurring and sharpening work incrementally: moving the brush
     repeatedly over an area will increase the effect with each additional
@@ -77,19 +72,43 @@
     limit the amount of blurring that can be produced by a single brushstroke,
     regardless of how many passes are made with it.
   </para>
+
   <sect3>
     <title>
-      <phrase>How to Activate</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
-    <para><!--TODO es;pl;ru Shortcut has changed-->
-      The Convolve tool can be activated from an image menu as
-      <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Convolve</guimenuitem></menuchoice>;
-      from the Toolbox by clicking on the tool icon
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-blur-22.png"/></imageobject></inlinemediaobject></guiicon>;
-      or from the keyboard using the shortcut <keycombo><keycap>Shift
-      </keycap><keycap>U</keycap></keycombo>.
+    <para>
+      There are different possibilities to activate the tool:
     </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          From the image-menu:
+          <menuchoice><guimenu>Tools</guimenu>
+            <guisubmenu>Paint tools</guisubmenu>
+            <guimenuitem>Convolve</guimenuitem>
+          </menuchoice>,
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The Tool can also be called by clicking the tool icon:
+          <guiicon>
+            <inlinemediaobject><imageobject><imagedata
+              fileref="images/toolbox/stock-tool-blur-22.png"/></imageobject>
+            </inlinemediaobject>
+          </guiicon>
+          in the Toolbox.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          By using the keyboard shortcut <keycap>Shift</keycap><keycap>U</keycap>.
+        </para>
+      </listitem>
+    </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers</phrase>
@@ -108,6 +127,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Tool Options</phrase>
@@ -122,11 +142,14 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>
-          Opacity; Brush; Scale; Pressure Sensitivity; Fade Out;
-          Apply Jitter; Hard Edges
+          Opacity; Brush; Scale; Brush Dynamics; Fade Out; Apply Jitter;
+          Hard Edges
         </term>
         <listitem>
           <xi:include href="about-common-brush-options.xml"/>

Modified: trunk/src/toolbox/tool-crop.xml
==============================================================================
--- trunk/src/toolbox/tool-crop.xml	(original)
+++ trunk/src/toolbox/tool-crop.xml	Mon Feb 23 13:46:54 2009
@@ -12,16 +12,7 @@
   2005-12-01 informalfigure replaced by figure by lexa
   0506609 de reviewed by axel.wernicke
   -->
-<sect2 id="gimp-tool-crop">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-11</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
+<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-crop">
   <title>
     <phrase>Crop</phrase>
   </title>
@@ -37,6 +28,7 @@
     <secondary>Crop</secondary>
     <tertiary>Crop tool</tertiary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Crop tool</phrase>
@@ -54,7 +46,7 @@
     more focused working area. It is also useful if you need a specific image
     size that does not match the original dimensions of your image.
   </para>
-  <para><!--TODO es;it;pl v2.4-->
+  <para>
     Just like the selection tools, the new crop tool has been enhanced with
     the v2.4 release. The resize handles actually resize the crop rectangle
     instead of providing both resize and move functionality. The tool behaves
@@ -73,41 +65,50 @@
   </para>
   <para>
     You can use Guides to position the crop area. Make sure that the
-    <menuchoice><guimenu>View</guimenu><guimenuitem>Snap to Guides</guimenuitem></menuchoice>
+    <menuchoice>
+      <guimenu>View</guimenu>
+      <guimenuitem>Snap to Guides</guimenuitem>
+    </menuchoice>
     option is checked.
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
+    <para>
+      You can access to the Selection Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this tool from the image-menu through:
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform tools</guisubmenu><guimenuitem>Crop</guimenuitem></menuchoice>.
+          From the image menu bar
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform tools</guisubmenu>
+            <guimenuitem>Crop</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
         <para>
-          The Tool can also be called by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-crop-22.png"/></imageobject></inlinemediaobject></guiicon>,
+          By clicking the tool icon:
+          <guiicon>
+            <inlinemediaobject><imageobject><imagedata
+              fileref="images/toolbox/stock-tool-crop-22.png"/></imageobject>
+            </inlinemediaobject>
+          </guiicon>in the ToolBox,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by using the
-          <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo> keys.
+          By using the keyboard shortcut
+          <keycombo><keycap>Shift</keycap><keycap>C</keycap></keycombo>.
         </para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>
-        A different and quicker way to crop selections is using the
-        <menuchoice><guimenu><accel>I</accel>mage</guimenu><guimenuitem><accel>C</accel>rop Image</guimenuitem></menuchoice>
-        function in the Image menu.
-      </para>
-    </tip>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -149,13 +150,14 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>Options</phrase>
+      <phrase>Tool Options</phrase>
     </title>
     <figure>
       <title>
-        <phrase><quote>Crop</quote> tool options</phrase>
+        <phrase>Tool Options for the <quote>Crop</quote> tool</phrase>
       </title>
       <mediaobject>
         <imageobject>
@@ -163,18 +165,11 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for Crop can be accessed by double
-            clicking the Crop tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-crop-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Current Layer Only</term>
         <listitem>
           <para>
@@ -329,7 +324,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/toolbox/auto-shrink1.png" format="PNG"/>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/auto-shrink1.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -339,7 +335,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/toolbox/auto-shrink2.png" format="PNG"/>
+                <imagedata format="PNG"
+                           fileref="images/toolbox/auto-shrink2.png"/>
               </imageobject>
               <caption>
                 <para>

Modified: trunk/src/toolbox/tool-dodge-burn.xml
==============================================================================
--- trunk/src/toolbox/tool-dodge-burn.xml	(original)
+++ trunk/src/toolbox/tool-dodge-burn.xml	Mon Feb 23 13:46:54 2009
@@ -9,15 +9,6 @@
   050523 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-dodge-burn">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-09</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Dodge or Burn</phrase>
   </title>
@@ -28,6 +19,7 @@
   <indexterm>
     <primary>Dodge/Burn</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Dodge tool</phrase>
@@ -43,9 +35,10 @@
     colors in your image. The mode will determine which type of pixels are
     affected.
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       There are different possibilities to activate the tool:
@@ -54,13 +47,21 @@
       <listitem>
         <para>
           From the image-menu:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint Tools</guisubmenu><guimenuitem>Dod<accel>g</accel>e / Burn</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Dodge / Burn</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
         <para>
           The Tool can also be called by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-dodge-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon><inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-dodge-22.png"/>
+              </imageobject></inlinemediaobject>
+          </guiicon>
         </para>
       </listitem>
       <listitem>
@@ -72,6 +73,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -104,9 +106,10 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>Options</phrase>
+      <phrase>Tool Options</phrase>
     </title>
     <figure>
       <title>
@@ -119,20 +122,13 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Dodge or Burn Tool can be
-            accessed by double clicking the Dodge or Burn Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-dodge-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>
-          Opacity; Brush; Scale; Pressure sensibility; Fade out; Apply
+          Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply
           Jitter, Hard edges
         </term>
         <listitem>
@@ -147,7 +143,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Mode</term>
+        <term>Range</term>
         <listitem>
           <para>There are three modes:</para>
           <itemizedlist>

Modified: trunk/src/toolbox/tool-eraser.xml
==============================================================================
--- trunk/src/toolbox/tool-eraser.xml	(original)
+++ trunk/src/toolbox/tool-eraser.xml	Mon Feb 23 13:46:54 2009
@@ -13,15 +13,6 @@
      050521 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-eraser">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-06-04</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Eraser</phrase>
   </title>
@@ -36,6 +27,7 @@
     <primary>Transparency</primary>
     <secondary>Eraser tool</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Eraser tool icon in the Toolbox</phrase>
@@ -46,7 +38,8 @@
       </imageobject>
     </mediaobject>
   </figure>
-  <para><!-- Changed 070210 -->
+
+  <para>
     The Eraser is used to remove areas of color from the current layer or from
     a selection of this layer. If the Eraser is used on something that does
     not support transparency (a selection mask channel, a layer mask, or the
@@ -64,6 +57,7 @@
     erasure at the edges of the brush-stroke, even if you use a hard-edged
     brush.
   </para>
+
   <tip>
     <para>
       If you use GIMP with a tablet, you may find it convenient to treat the
@@ -75,6 +69,7 @@
       select a different tool with it.
     </para>
   </tip>
+
   <sect3>
     <title>
       <phrase>How to Activate</phrase>
@@ -84,7 +79,11 @@
       <listitem>
         <para>
           From the image menu through
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Paint Tools</guisubmenu><guimenuitem>Eraser</guimenuitem></menuchoice>;
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Eraser</guimenuitem>
+          </menuchoice>;
         </para>
       </listitem>
       <listitem>
@@ -101,6 +100,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers</phrase>
@@ -144,6 +144,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Tool Options</phrase>
@@ -158,6 +159,9 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>
@@ -201,7 +205,7 @@
               still there, you simply can't see it. Anti-erasing increases the
               alpha value so that you can see the RGB data once again.
             </para>
-            <para><!--added 060604-->
+            <para>
               An annoying feature: on a layer you have created with a
               transparent background, using anti-erasing on non-painted areas
               paints with black!

Modified: trunk/src/toolbox/tool-flip.xml
==============================================================================
--- trunk/src/toolbox/tool-flip.xml	(original)
+++ trunk/src/toolbox/tool-flip.xml	Mon Feb 23 13:46:54 2009
@@ -11,15 +11,6 @@
   050806 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-flip">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-14</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Flip</phrase>
   </title>
@@ -30,6 +21,7 @@
   <indexterm>
     <primary>Flip</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Flip tool</phrase>
@@ -46,36 +38,45 @@
     a Floating Selection is created. You can use this tool to create
     reflections.
   </para>
+
   <sect3>
     <title>
       <phrase>Activating the Tool</phrase>
     </title>
-    <para>You can get to the Flip tool in several ways :</para>
+    <para>
+      You can access to the Selection Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          In the the image-menu through:
-          <guimenuitem><accel>T</accel>ools</guimenuitem>/
-          <guimenuitem><accel>T</accel>ransform
-            Tools</guimenuitem>/<guimenuitem><accel>F</accel>lip
-          </guimenuitem>,
+          From the image menu bar
+          <guimenuitem>Tools</guimenuitem>/
+          <guimenuitem>Transform Tools</guimenuitem>
+          <guimenuitem>Flip</guimenuitem>,
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-flip-22.png"/></imageobject></inlinemediaobject></guiicon> in Toolbox,
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-flip-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon> in Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by using the
+          By using the
           <keycombo><keycap>Shift</keycap><keycap>F</keycap></keycombo> key
           combination.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -102,6 +103,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -116,18 +118,11 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Flip Tool can be accessed by
-            double clicking the Flip Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-flip-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Affect</term>
         <listitem>
           <xi:include href="about-common-transform-options.xml"/>

Modified: trunk/src/toolbox/tool-heal.xml
==============================================================================
--- trunk/src/toolbox/tool-heal.xml	(original)
+++ trunk/src/toolbox/tool-heal.xml	Mon Feb 23 13:46:54 2009
@@ -8,15 +8,6 @@
   2007-10-27 j.h: created
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-heal">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-27</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Heal</phrase>
   </title>
@@ -27,6 +18,7 @@
   <indexterm>
     <primary>Heal</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The <quote>Heal tool</quote> in the Toolbox</phrase>
@@ -56,9 +48,10 @@
     different from its surrounding, it will be corrected as soon. Else, you
     can correct it with repeated clicks, but with a risk of daubing
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       There are different possibilities to activate the tool:
@@ -67,13 +60,23 @@
       <listitem>
         <para>
           From the image-menu:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint tools</guisubmenu><guimenuitem><accel>H</accel>eal</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+              <guisubmenu>Paint tools</guisubmenu>
+              <guimenuitem>Heal</guimenuitem>
+            </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           The Tool can also be called by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-heal-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-heal-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in the Toolbox,
         </para>
       </listitem>
@@ -84,6 +87,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -112,11 +116,7 @@
           <keycap>Shift</keycap>
         </term>
         <listitem>
-          <para><!--Once the source is set, pressing this key allows you to draw a
-            line which will be <quote>healed</quote>.--><!--
-              I've adapted the relevant text from
-              "src/toolbox/tool-brush.xml" (see id="gimp-tools-brush-modifiers")
-            -->
+          <para>
             Once the source is set, if you press this key, you will see a
             thin line connecting the previously clicked point with the current
             pointer location. If you click again, while going on holding
@@ -127,6 +127,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -141,12 +142,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by double clicking the
-      Heal tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-heal-22.png"/></imageobject></inlinemediaobject></guiicon>
-      in the Toolbox.
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <para>
       The options of this tool are common with the other painting tools
       and are described in <link linkend="gimp-tool-painting">Common options
@@ -156,7 +154,7 @@
     <variablelist>
       <varlistentry>
         <term>
-          Mode; Opacity; Brush; Pressure Sensitivity, Fade out, Apply Jitter,
+          Mode; Opacity; Brush; Scale; Brush Dynamics, Fade out, Apply Jitter,
           Hard Edges
         </term>
         <listitem>
@@ -183,6 +181,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Healing is not cloning</phrase>
@@ -194,7 +193,7 @@
     <figure>
       <title>
         <phrase>
-         Comparing <quote>Heal</quote> and <quote>Clone</quote>
+         Comparing <quote>Clone</quote> and <quote>Heal</quote>
        </phrase>
       </title>
       <mediaobject>

Modified: trunk/src/toolbox/tool-ink.xml
==============================================================================
--- trunk/src/toolbox/tool-ink.xml	(original)
+++ trunk/src/toolbox/tool-ink.xml	Mon Feb 23 13:46:54 2009
@@ -11,15 +11,6 @@
   050522 de reviewed by axel.wernicke
   -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-ink">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-09</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Ink</phrase>
   </title>
@@ -30,6 +21,7 @@
   <indexterm>
     <primary>Ink</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>
@@ -42,11 +34,13 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The Ink tool uses a simulation of an ink pen with a controllable nib to
     paint solid brush strokes with an antialiased edge. The size, shape and
     angle of the nib can be set to determine how the strokes will be rendered.
   </para>
+
   <sect3>
     <title>
       <phrase>Activate the Tool</phrase>
@@ -56,7 +50,11 @@
       <listitem>
         <para>
           In the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint Tools</guisubmenu><guimenuitem>In<accel>k</accel></guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Ink</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -72,12 +70,14 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
     </title>
     <para>This tool has no special modifier keys.</para>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -92,12 +92,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      You can find tool options by double clicking on the
-      ink tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-ink-22.png"/></imageobject></inlinemediaobject></guiicon>
-      in Toolbox.
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>Mode; Opacity</term>
@@ -176,8 +173,8 @@
               <term>Type</term>
               <listitem>
                 <para>
-                  There are three nib shapes to choose from: circle, diamond,
-                  and square.
+                  There are three nib shapes to choose from: circle, square,
+                  and diamond.
                 </para>
               </listitem>
             </varlistentry>

Modified: trunk/src/toolbox/tool-move.xml
==============================================================================
--- trunk/src/toolbox/tool-move.xml	(original)
+++ trunk/src/toolbox/tool-move.xml	Mon Feb 23 13:46:54 2009
@@ -21,6 +21,7 @@
   <indexterm>
     <primary>Move</primary>
   </indexterm>
+  
   <figure>
     <title>The Move tool in Toolbox</title>
     <mediaobject>
@@ -33,25 +34,28 @@
     The Move Tool is used to move layers, selections, paths or guides. It
     works also on texts.
   </para>
+  
   <sect3>
-    <title>Activate the Tool</title>
+    <title>
+      <phrase>Activate the Tool</phrase>
+    </title>
+    <para>
+      You can access to the Move Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          You can find this tool from the image menu through:
+          From the image menu bar
           <menuchoice>
-            <shortcut>
-              <keycap>M</keycap>
-            </shortcut>
-            <guimenu><accel>T</accel>ools</guimenu>
-            <guisubmenu><accel>T</accel>ransform Tools</guisubmenu>
-            <guimenuitem><accel>M</accel>ove</guimenuitem>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Move</guimenuitem>
           </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by clicking the tool icon:
+          By clicking the tool icon:
           <guiicon>
             <inlinemediaobject>
               <imageobject>
@@ -63,6 +67,11 @@
       </listitem>
       <listitem>
         <para>
+          By using the keyboard shortcut <keycap>M</keycap>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           The Move tool is automatically activated when you create a
           guide.
         </para>
@@ -88,6 +97,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+  
   <sect3>
     <title>Options</title>
     <figure>
@@ -99,24 +109,11 @@
         </imageobject>
       </mediaobject>
     </figure>
+    
+    <xi:include href="about-common-options-display.xml"/>
+    
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for Move can be found by double
-            clicking the Move Tool icon.
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="images/toolbox/stock-tool-move-22.png"/>
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>Move</term>
         <listitem>
           <xi:include href="about-common-transform-options.xml"/>
@@ -127,7 +124,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Tool toggle</term>
+        <term>Tool toggle (Shift)</term>
         <listitem>
           <para>If Move is on <guiicon>Layer</guiicon>:</para>
           <itemizedlist>
@@ -179,6 +176,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+  
   <sect3>
     <title>Summary of Move tool actions</title>
     <variablelist>

Modified: trunk/src/toolbox/tool-paintbrush.xml
==============================================================================
--- trunk/src/toolbox/tool-paintbrush.xml	(original)
+++ trunk/src/toolbox/tool-paintbrush.xml	Mon Feb 23 13:46:54 2009
@@ -7,15 +7,6 @@
      2007-06-17 kost: added norwegian
      -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-paintbrush">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-10</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Paintbrush</phrase>
   </title>
@@ -26,6 +17,7 @@
   <indexterm>
     <primary>Paintbrush</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Paintbrush</phrase>
@@ -36,10 +28,12 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The paintbrush tool paints fuzzy brush strokes. All strokes are rendered
     using the current brush.
   </para>
+
   <sect3>
     <title>
       <phrase>Activating the Tool</phrase>
@@ -49,7 +43,11 @@
         <para>
           You can call the Paintbrush Tool in the following
           order, from the image-menu:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint Tools</guisubmenu><guimenuitem><accel>P</accel>aintbrush</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Paintbrush</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -65,6 +63,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -97,6 +96,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -111,11 +111,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by double clicking the
-      Paintbrush Tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-paintbrush-22.png"/></imageobject></inlinemediaobject></guiicon>
-    </para>
+
+    <!--<xi:include href="about-common-options-display.xml"/>-->
+
     <variablelist>
       <varlistentry>
         <term>

Modified: trunk/src/toolbox/tool-pencil.xml
==============================================================================
--- trunk/src/toolbox/tool-pencil.xml	(original)
+++ trunk/src/toolbox/tool-pencil.xml	Mon Feb 23 13:46:54 2009
@@ -9,15 +9,6 @@
      2007-01-06 lexa: enhanced docbook compliance
      -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-pencil">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-15</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Pencil</phrase>
   </title>
@@ -28,6 +19,7 @@
   <indexterm>
     <primary>Pencil</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Pencil tool</phrase>
@@ -38,6 +30,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The Pencil tool is used to draw free hand lines with a hard edge. The
     pencil and paintbrush are similar tools. The main difference between the
@@ -52,6 +45,7 @@
     right. With the pencil tool, you can be confident that every pixel within
     the brush outline will be changed in exactly the way you expect.
   </para>
+
   <tip>
     <para>
       If you want to draw straight lines with the Pencil (or any of several
@@ -59,6 +53,7 @@
       <keycap>Shift</keycap> and click at the ending point.
     </para>
   </tip>
+
   <sect3>
     <title>
       <phrase>Activating the Tool</phrase>
@@ -68,7 +63,11 @@
         <para>
           The Pencil Tool can be called in the following
           order, from the image-menu:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint Tools</guisubmenu><guimenuitem>Pe<accel>n</accel>cil</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Pencil</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
@@ -84,6 +83,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -116,13 +116,14 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
     </title>
     <figure>
       <title>
-        <phrase>Pencil Tool options</phrase>
+        <phrase><quote>Pencil</quote> Tool options</phrase>
       </title>
       <mediaobject>
         <imageobject>
@@ -130,11 +131,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by double clicking the
-      Pencil Tool icon.
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-pencil-22.png"/></imageobject></inlinemediaobject></guiicon>
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>

Modified: trunk/src/toolbox/tool-perspective-clone.xml
==============================================================================
--- trunk/src/toolbox/tool-perspective-clone.xml	(original)
+++ trunk/src/toolbox/tool-perspective-clone.xml	Mon Feb 23 13:46:54 2009
@@ -8,15 +8,6 @@
   2007-11-01 j.h: created
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-perspective-clone">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-01</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Perspective Clone</phrase>
   </title>
@@ -27,6 +18,7 @@
   <indexterm>
     <primary>Perspective Clone</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>
@@ -35,27 +27,23 @@
     </title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/toolbox-perspective-clone.png" format="PNG"/>
+        <imagedata format="PNG"
+                   fileref="images/toolbox/toolbox-perspective-clone.png"/>
       </imageobject>
     </mediaobject>
   </figure>
-  <para><!-- CHECK en fr it pl: tried to realize KoSt's recommendation - ude 29-03-08 -->
+
+  <para>
     This tool allows you to clone according to the perspective you want.
     First, set the wanted vanishing lines in the same way as with the
     <link linkend="gimp-tool-perspective">Perspective</link> tool. Then
     copy the source area in the same way as with the
     <link linkend="gimp-tool-clone">Clone</link> tool.
-    <!--
-    First, set the wanted vanishing lines by checking the <guilabel>Modify
-    Perspective Plane</guilabel> option, working in the same way as with the
-    <link linkend="gimp-tool-perspective">Perspective</link> tool. Then check
-    the <guilabel>Perspective Clone</guilabel> option and work in the same
-    way as with the <link linkend="gimp-tool-clone">Clone</link> tool.
-    -->
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       There are different possibilities to activate the tool:
@@ -64,18 +52,29 @@
       <listitem>
         <para>
           From the image-menu:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint tools</guisubmenu><guimenuitem><accel>P</accel>erspective Clone</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint tools</guisubmenu>
+            <guimenuitem>Perspective Clone</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           The Tool can also be called by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-perspective-clone-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-perspective-clone-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in the Toolbox.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -87,7 +86,7 @@
         </term>
         <listitem>
           <para>
-            Ctrl-click allows you to select a new clone source.
+            <keycap>Ctrl</keycap>-click allows you to select a new clone source.
           </para>
         </listitem>
       </varlistentry>
@@ -107,6 +106,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -121,10 +121,9 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <para>
-      The available tool options can be accessed by clicking on the tool icon
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-perspective-clone-22.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> in the Toolbox.
-    </para>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>
@@ -136,13 +135,14 @@
             <guilabel>Modify Perspective</guilabel>. This works like the tool
             <link linkend="gimp-tool-perspective">perspective</link>.
             Then you choose <guilabel>Perspective Clone</guilabel> and use
-            this in the same way as the <link linkend="gimp-tool-clone">Clone</link> tool.
+            this in the same way as the
+            <link linkend="gimp-tool-clone">Clone</link> tool.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          Mode, Opacity, Brush, Pressure Sensitivity, Fade out, Apply Jitter,
+          Mode, Opacity, Brush, Scale, Brush Dynamics, Fade out, Apply Jitter,
           Hard Edges
         </term>
         <listitem>
@@ -155,12 +155,14 @@
         </term>
         <listitem>
           <para>
-            This are the same as in the tool <link linkend="gimp-tool-clone">Clone</link>.
+            This are the same as in the tool
+            <link linkend="gimp-tool-clone">Clone</link>.
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Example</phrase>
@@ -171,7 +173,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/perspective-clone-ex1.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/perspective-clone-ex1.png"/>
         </imageobject>
         <caption>
           <para>
@@ -182,7 +185,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/perspective-clone-ex2.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/perspective-clone-ex2.png"/>
         </imageobject>
         <caption>
           <para>

Modified: trunk/src/toolbox/tool-perspective.xml
==============================================================================
--- trunk/src/toolbox/tool-perspective.xml	(original)
+++ trunk/src/toolbox/tool-perspective.xml	Mon Feb 23 13:46:54 2009
@@ -30,6 +30,7 @@
   <indexterm>
     <primary>Perspective</primary>
   </indexterm>
+  
   <figure>
     <title>
       <phrase>Perspective tool</phrase>
@@ -52,27 +53,28 @@
     the center of the element, a circle lets you move the element by
     click-and-drag.
   </para>
+  
   <note>
     <para>
       This tool is not actually a perspective tool, as it doesn't impose
       perspective rules. It is better described as a distort tool.
     </para>
   </note>
+  
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
-      You can get to the Perspective tool in several ways :
+      You can access to the Perspective tool in different ways:
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          In the the image-menu through:
-          <guimenuitem><accel>T</accel>ools</guimenuitem>/
-          <guimenuitem><accel>T</accel>ransform
-            Tools</guimenuitem>/<guimenuitem><accel>P</accel>erspective
-          </guimenuitem>,
+          From the image menu bar
+          <guimenuitem>Tools</guimenuitem>/
+          <guimenuitem>Transform Tools</guimenuitem>
+          <guimenuitem>Perspective</guimenuitem>,
         </para>
       </listitem>
       <listitem>
@@ -84,13 +86,14 @@
       </listitem>
       <listitem>
         <para>
-          or by using the
+          By using the
           <keycombo><keycap>Shift</keycap><keycap>P</keycap></keycombo> key
           combination.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+  
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -106,18 +109,11 @@
         </imageobject>
       </mediaobject>
     </figure>
+    
+    <xi:include href="about-common-options-display.xml"/>
+    
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Perspective Tool can be
-            accessed by double clicking the Perspective Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-perspective-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>
           Transform; Interpolation; Direction; Clipping; Preview
         </term>
@@ -127,6 +123,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+  
   <sect3>
     <title>
       <phrase>

Modified: trunk/src/toolbox/tool-rotate.xml
==============================================================================
--- trunk/src/toolbox/tool-rotate.xml	(original)
+++ trunk/src/toolbox/tool-rotate.xml	Mon Feb 23 13:46:54 2009
@@ -12,15 +12,6 @@
   050529 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-rotate">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-13</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Rotate</phrase>
   </title>
@@ -31,6 +22,7 @@
   <indexterm>
     <primary>Rotate</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Rotate tool in Toolbox</phrase>
@@ -41,6 +33,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <sect3>
     <title>
       <phrase>Overview</phrase>
@@ -54,32 +47,46 @@
       the image or the rotation point.
     </para>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
+    <para>
+      You can access to the Selection Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          You can can access the Rotate tool from the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</accel>ransform Tools</guisubmenu><guimenuitem><accel>R</accel>otate</guimenuitem></menuchoice>,
+          From the image menu bar
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Rotate</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-rotate-22.png"/></imageobject></inlinemediaobject></guiicon> in the Toolbox.
+          By clicking the tool icon:
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-rotate-22.png"/>
+              </imageobject></inlinemediaobject>
+          </guiicon> in the Toolbox.
         </para>
       </listitem>
       <listitem>
         <para>
-          or by using the
+          By using the
           <keycombo><keycap>Shift</keycap><keycap>R</keycap></keycombo>
           key combination.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -98,6 +105,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -108,22 +116,16 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-rotate.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/tool-options-rotate.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 Rotate Tool can be
-            accessed by double clicking the Rotate Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-rotate-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>
           Transform; Direction, Interpolation; Clipping; Preview
         </term>
@@ -155,13 +157,14 @@
       <varlistentry>
         <term>Constraints</term>
         <listitem>
-          <para><guilabel>15 Degrees</guilabel> will constrain the rotation
+          <para><guilabel>15 Degrees (Ctrl)</guilabel> will constrain the rotation
             to angles divisible by 15 degrees.
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>The Rotation Information window</phrase>
@@ -172,7 +175,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-dialog-rotate.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/tool-dialog-rotate.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -202,7 +206,11 @@
     <note>
       <para>
         You can also rotate layers with
-        <menuchoice><guimenu>Layer</guimenu><guisubmenu>Transform</guisubmenu><guimenuitem>Rotate 90Â, 180Â, Arbitrary</guimenuitem></menuchoice>
+        <menuchoice>
+          <guimenu>Layer</guimenu>
+          <guisubmenu>Transform</guisubmenu>
+          <guimenuitem>Arbitrary Rotation...</guimenuitem>
+        </menuchoice>
       </para>
     </note>
   </sect3>

Modified: trunk/src/toolbox/tool-scale.xml
==============================================================================
--- trunk/src/toolbox/tool-scale.xml	(original)
+++ trunk/src/toolbox/tool-scale.xml	Mon Feb 23 13:46:54 2009
@@ -11,15 +11,6 @@
   050530 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-scale">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-18</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Scale</phrase>
   </title>
@@ -30,6 +21,7 @@
   <indexterm>
     <primary>Scale Layer, selection contour or path</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Scale tool in Toolbox</phrase>
@@ -40,6 +32,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <sect3>
     <title>
       <phrase>Overview</phrase>
@@ -58,32 +51,46 @@
       appears at center of the Preview allowing to move this preview.
     </para>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
+    <para>
+      You can access to the Scale Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          You can access the Scale tool from the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>T</accel>ransform Tools</guisubmenu><guimenuitem><accel>S</accel>cale</guimenuitem></menuchoice>,
+          From the image menu bar
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Scale</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
         <para>
-          or by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-scale-22.png"/></imageobject></inlinemediaobject></guiicon> in the Toolbox,
+          By clicking the tool icon:
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-scale-22.png"/>
+              </imageobject></inlinemediaobject>
+          </guiicon> in the Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by using the
+          By using the
           <keycombo><keycap>Shift</keycap><keycap>T</keycap></keycombo>
           key combination.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -103,12 +110,13 @@
     </variablelist>
   </sect3>
   <sect3>
+
     <title>
-      <phrase>Options</phrase>
+      <phrase>Tool Options</phrase>
     </title>
     <figure>
       <title>
-        <phrase>Scale tool options</phrase>
+        <phrase>Tool options for the Scale tool</phrase>
       </title>
       <mediaobject>
         <imageobject>
@@ -116,19 +124,11 @@
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
-        <term>Overview</term>
-        <listitem>
-          <para>
-            The available tool options for the Scale Tool can be accessed by
-            double clicking the Scale Tool icon
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-scale-22.png"/></imageobject></inlinemediaobject></guiicon>
-            in Toolbox.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>
           Transform; Interpolation; Direction; Clipping; Preview
         </term>
@@ -136,14 +136,15 @@
           <note>
             <para>
               The Transform mode works on the active layer only. To work on
-              all layers of the image, use <link linkend="gimp-image-scale">Scale image</link>.
+              all layers of the image, use
+              <link linkend="gimp-image-scale">Scale image</link>.
             </para>
           </note>
           <xi:include href="about-common-transform-options.xml"/>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Keep Aspect</term>
+        <term>Keep Aspect (Ctrl)</term>
         <listitem>
           <para><guilabel>Keep Aspect</guilabel>: when you move a corner of
             the selection frame, this option will constrain the scale such as
@@ -155,6 +156,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>The Scaling Information dialog window</phrase>

Modified: trunk/src/toolbox/tool-shear.xml
==============================================================================
--- trunk/src/toolbox/tool-shear.xml	(original)
+++ trunk/src/toolbox/tool-shear.xml	Mon Feb 23 13:46:54 2009
@@ -10,15 +10,6 @@
   050606 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-shear">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-03-02</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Shear</phrase>
   </title>
@@ -29,6 +20,7 @@
   <indexterm>
     <primary>Shear</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Shear tool in Toolbox</phrase>
@@ -51,6 +43,7 @@
     the the direction given to the pointer. When you are satisfied, click on
     the <guilabel>Shear</guilabel> button in the info dialog to validate.
   </para>
+
   <figure>
     <title>
       <phrase>Shear example</phrase>
@@ -61,6 +54,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <note>
     <para>
       You can't shear both ways at the same time, you have to use the
@@ -69,26 +63,37 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
-    <para>You can get to Shear tool in several ways :</para>
+    <para>
+      You can access to the Selection Tool in different ways:
+    </para>
     <itemizedlist>
       <listitem>
         <para>
-          In the the image-menu through:
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Transform Tools</guisubmenu><guimenuitem>Shear</guimenuitem></menuchoice>,
+          From the image menu bar
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Shear</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
-          By clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-shear-22.png"/></imageobject></inlinemediaobject></guiicon>
+          By clicking on the tool icon:
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-shear-22.png"/>
+              </imageobject></inlinemediaobject>
+          </guiicon>
           in Toolbox,
         </para>
       </listitem>
       <listitem>
         <para>
-          or by using the
+          By using the
           <keycombo><keycap>Shift</keycap><keycap>S</keycap></keycombo> key
           combination.
         </para>
@@ -96,6 +101,7 @@
     </itemizedlist>
   </sect3>
   <sect3>
+
     <title>
       <phrase>Options</phrase>
     </title>
@@ -105,24 +111,18 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-shear.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/tool-options-shear.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 Shear Tool can be accessed by
-            double clicking the Shear Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-shear-22.png"/></imageobject></inlinemediaobject></guiicon>
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term>
-          Affect; Interpolation; Transform Direction; Clip Result; Preview
+          Transform Direction; Interpolation; Clippping; Preview
         </term>
         <listitem>
           <xi:include href="about-common-transform-options.xml"/>
@@ -130,6 +130,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Shearing Information</phrase>

Modified: trunk/src/toolbox/tool-smudge.xml
==============================================================================
--- trunk/src/toolbox/tool-smudge.xml	(original)
+++ trunk/src/toolbox/tool-smudge.xml	Mon Feb 23 13:46:54 2009
@@ -10,15 +10,6 @@
   050523 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-smudge">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-06</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Smudge</phrase>
   </title>
@@ -29,6 +20,7 @@
   <indexterm>
     <primary>Smudge</primary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Smudge tool</phrase>
@@ -44,9 +36,10 @@
     layer or a selection. It takes color in passing and uses it to mix it to
     the next colors it meets, on a distance you can set.
   </para>
+
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       You can find the Smudge tool in various ways :
@@ -55,14 +48,23 @@
       <listitem>
         <para>
           Through
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>P</accel>aint Tools</guisubmenu><guimenuitem><accel>S</accel>mudge.</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Paint Tools</guisubmenu>
+            <guimenuitem>Smudge.</guimenuitem>
+          </menuchoice>
           in the image menu.
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking on the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-smudge-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject><imagedata
+                fileref="images/toolbox/stock-tool-smudge-22.png"/>
+              </imageobject></inlinemediaobject>
+          </guiicon>
           in Toolbox.
         </para>
       </listitem>
@@ -73,6 +75,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Key modifiers (Defaults)</phrase>
@@ -106,6 +109,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -116,10 +120,14 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-smudge.png" format="PNG"/>
+          <imagedata format="PNG"
+                     fileref="images/toolbox/tool-options-smudge.png"/>
         </imageobject>
       </mediaobject>
     </figure>
+
+    <xi:include href="about-common-options-display.xml"/>
+
     <variablelist>
       <varlistentry>
         <term>Overview</term>
@@ -127,13 +135,18 @@
           <para>
             The available tool options for the Smudge Tool can be accessed by
             double clicking the Smudge Tool icon.
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-smudge-22.png"/></imageobject></inlinemediaobject></guiicon>
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject><imagedata
+                  fileref="images/toolbox/stock-tool-smudge-22.png"/>
+                </imageobject></inlinemediaobject>
+            </guiicon>
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          Opacity; Brush; Pressure sensibility; Fade out; Apply Jitter; Hard
+          Opacity; Brush; Scale; Brush Dynamics; Fade out; Apply Jitter; Hard
           edges; Rate
         </term>
         <listitem>

Modified: trunk/src/toolbox/tool-transform.xml
==============================================================================
--- trunk/src/toolbox/tool-transform.xml	(original)
+++ trunk/src/toolbox/tool-transform.xml	Mon Feb 23 13:46:54 2009
@@ -96,11 +96,11 @@
       <varlistentry>
         <term>Direction</term>
         <listitem>
-          <para><quote>Direction</quote> 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
+          <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>
@@ -177,8 +177,8 @@
                   With Adjust: the layer is enlarged to contain all the
                   rotated layer. The new layer border is visible; the whole
                   layer becomes visible by using the
-                  <menuchoice><guimenu>Image</guimenu><guimenuitem>Adjust Canvas to Layers</guimenuitem></menuchoice>
-                  command (on the right).
+                  <menuchoice><guimenu>Image</guimenu><guimenuitem>Fit Canvas to Layers</guimenuitem></menuchoice>
+                  command.
                 </para>
               </listitem>
             </varlistentry>

Modified: trunk/src/toolbox/tools-painting.xml
==============================================================================
--- trunk/src/toolbox/tools-painting.xml	(original)
+++ trunk/src/toolbox/tools-painting.xml	Mon Feb 23 13:46:54 2009
@@ -9,15 +9,6 @@
   2007-01-13 lexa: enhanced docbook compliance
 -->
 <sect2 id="gimp-tool-painting">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-18</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>Painting Tools (Pencil, Paintbrush, Airbrush)</phrase>
   </title>
@@ -25,6 +16,7 @@
     <primary>Tools</primary>
     <secondary>Painting Tools</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Painting example</phrase>
@@ -42,6 +34,7 @@
       </caption>
     </mediaobject>
   </figure>
+
   <para>
     The tools in this group are GIMP's basic painting tools, and they have
     enough features in common to be worth discussing together in this section.
@@ -63,6 +56,7 @@
     choosing colors, either from the basic palette or from a gradient. All are
     capable of painting in a wide variety of modes.
   </para>
+
   <sect3>
     <title>
       <phrase>Key modifiers</phrase>



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