gimp-help-2 r2760 - in trunk: images/C/dialogs images/C/toolbox images/C/using images/fr/dialogs images/fr/using src src/concepts src/using



Author: jhardlin
Date: Sun Feb 22 07:12:23 2009
New Revision: 2760
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2760&view=rev

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

        * src/using/getting-unstuck.xml
        * src/using/animated-brushes.xml
        * src/using/shortcuts.xml
        * src/using/layers.xml
        * src/using/grid-and-guides.xml
        * src/using/simpleobjects.xml
        * src/using/photography.xml
        * src/using/selections.xml
        * src/using/customize-splashscreen.xml
        * src/using/fileformats.xml
        * src/using/brushes.xml
        * src/using/fonts-and-text.xml
        * src/using/web.xml
        * src/using/variable-size-brush.xml
        * src/using/paths.xml
        * src/concepts/gradients.xml
        * src/concepts/images-loading.xml
        * src/concepts/plugins.xml
        * src/concepts/layer-modes.xml
        * src/concepts/palettes.xml
        * src/concepts/image-types.xml
        * src/concepts/selection.xml
        * src/concepts/toolbox.xml
        * src/concepts/color-management.xml
        * src/concepts/intro.xml
        * src/concepts/layers.xml
        * src/concepts/setup.xml
        * src/concepts/patterns.xml
        * src/concepts/docks.xml
        * src/concepts/grid-and-guides.xml
        * src/concepts/images.xml
        * src/concepts/undo.xml
        * src/concepts/imagewindow.xml
        * src/concepts/fonts-and-text.xml
        * src/concepts/brushes.xml
        * src/concepts/qmask.xml
        * src/concepts/basic-setup.xml: revised files for v2.6

        * src/gimp.xml

        * src/using/docks.xml: file deleted

        * images/C/dialogs/link-visibility.png
        * images/C/using/pattern-create.png
        * images/C/using/dialog-highlight-handle.png
        * images/C/toolbox/toolbox-lasso-ex2.png
        * images/fr/dialogs/link-visibility.png
        * images/fr/using/dialog-highlight-handle.png
        * images/fr/using/pattern-create.png: updated

        * images/C/using/dock-tab.png
        * images/C/using/dock-attached.png
        * images/fr/using/dock-tab.png
        * images/fr/using/dock-attached.png: images added


Added:
   trunk/images/C/using/dock-attached.png   (contents, props changed)
   trunk/images/C/using/dock-tab.png   (contents, props changed)
   trunk/images/fr/using/dock-attached.png   (contents, props changed)
   trunk/images/fr/using/dock-tab.png   (contents, props changed)
Removed:
   trunk/src/using/docks.xml
Modified:
   trunk/images/C/dialogs/link-visibility.png
   trunk/images/C/toolbox/toolbox-lasso-ex2.png
   trunk/images/C/using/dialog-highlight-handle.png
   trunk/images/C/using/pattern-create.png
   trunk/images/fr/dialogs/link-visibility.png
   trunk/images/fr/using/dialog-highlight-handle.png
   trunk/images/fr/using/pattern-create.png
   trunk/src/concepts/basic-setup.xml
   trunk/src/concepts/brushes.xml
   trunk/src/concepts/color-management.xml
   trunk/src/concepts/docks.xml
   trunk/src/concepts/fonts-and-text.xml
   trunk/src/concepts/gradients.xml
   trunk/src/concepts/grid-and-guides.xml
   trunk/src/concepts/image-types.xml
   trunk/src/concepts/images-loading.xml
   trunk/src/concepts/images.xml
   trunk/src/concepts/imagewindow.xml
   trunk/src/concepts/intro.xml
   trunk/src/concepts/layer-modes.xml
   trunk/src/concepts/layers.xml
   trunk/src/concepts/palettes.xml
   trunk/src/concepts/patterns.xml
   trunk/src/concepts/plugins.xml
   trunk/src/concepts/qmask.xml
   trunk/src/concepts/selection.xml
   trunk/src/concepts/setup.xml
   trunk/src/concepts/toolbox.xml
   trunk/src/concepts/undo.xml
   trunk/src/gimp.xml
   trunk/src/using/animated-brushes.xml
   trunk/src/using/brushes.xml
   trunk/src/using/customize-splashscreen.xml
   trunk/src/using/fileformats.xml
   trunk/src/using/fonts-and-text.xml
   trunk/src/using/getting-unstuck.xml
   trunk/src/using/grid-and-guides.xml
   trunk/src/using/layers.xml
   trunk/src/using/paths.xml
   trunk/src/using/photography.xml
   trunk/src/using/selections.xml
   trunk/src/using/shortcuts.xml
   trunk/src/using/simpleobjects.xml
   trunk/src/using/variable-size-brush.xml
   trunk/src/using/web.xml

Modified: trunk/images/C/dialogs/link-visibility.png
==============================================================================
Binary files. No diff available.

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

Modified: trunk/images/C/using/dialog-highlight-handle.png
==============================================================================
Binary files. No diff available.

Added: trunk/images/C/using/dock-attached.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/C/using/dock-tab.png
==============================================================================
Binary file. No diff available.

Modified: trunk/images/C/using/pattern-create.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/fr/dialogs/link-visibility.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/fr/using/dialog-highlight-handle.png
==============================================================================
Binary files. No diff available.

Added: trunk/images/fr/using/dock-attached.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/fr/using/dock-tab.png
==============================================================================
Binary file. No diff available.

Modified: trunk/images/fr/using/pattern-create.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/concepts/basic-setup.xml
==============================================================================
--- trunk/src/concepts/basic-setup.xml	(original)
+++ trunk/src/concepts/basic-setup.xml	Sun Feb 22 07:12:23 2009
@@ -11,15 +11,6 @@
   2006-02-27 added norwegian by kolbjÃrn
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-concepts-usage">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-10</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Main Windows</phrase>
   </title>
@@ -59,12 +50,12 @@
     </listitem>
     <listitem>
       <para><emphasis>An image window:</emphasis>
-        Each image open in GIMP is displayed in a separate window. Many images
-	can be open at the same time, only limited by the system resources.
-	Before you can do anything useful in GIMP, you need to have at least
-	one image window open.  The image window holds the Menu of the main
-	commands of GIMP (File, Edit, Select...), which you can also get by
-	right-clicking on the window.
+        Each image open in GIMP is displayed in a separate window. A lot of
+        images can be open at the same time, only limited by the system
+        resources. Before you can do anything useful in GIMP, you need to
+        have at least	one image window open.  The image window holds the
+        Menu of the main commands of GIMP (File, Edit, Select...), which you
+        can also get by right-clicking on the window.
       </para>
     </listitem>
     <listitem>
@@ -107,9 +98,15 @@
     <para>
       If your GIMP layout gets trashed, fortunately your arrangement
       is pretty easy to recover by using
-      <menuchoice><guimenu>Windows</guimenu><guisubmenu>Recently Closed Docks</guisubmenu></menuchoice>
+      <menuchoice>
+        <guimenu>Windows</guimenu>
+        <guisubmenu>Recently Closed Docks</guisubmenu>
+      </menuchoice>
       To add, close or detach a tab from a dock, click on
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/using/tab-icon.png"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject><imageobject><imagedata
+        fileref="images/using/tab-icon.png"/></imageobject></inlinemediaobject>
+      </guiicon>
       in the upper right corner of a dialog. This opens the Tab menu. Select
       <guimenuitem>Add Tab</guimenuitem>,<guimenuitem> Close Tab
       </guimenuitem> or <guimenuitem>Detach Tab</guimenuitem>.

Modified: trunk/src/concepts/brushes.xml
==============================================================================
--- trunk/src/concepts/brushes.xml	(original)
+++ trunk/src/concepts/brushes.xml	Sun Feb 22 07:12:23 2009
@@ -11,15 +11,6 @@
   2005-11-28 replaced informalfigures by figures by lexa
 -->
 <sect1 id="gimp-concepts-brushes">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2005-11-28</date>
-        <authorinitials>lexa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Brushes</phrase>
   </title>
@@ -27,6 +18,7 @@
     <primary>Brushes</primary>
     <secondary>Introduction</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Brush strokes example</phrase>
@@ -46,19 +38,20 @@
   </figure>
   <para>
     A <emphasis>brush</emphasis>
-    is a pixmap or set of pixmaps used for painting. GIMP includes a set of 10
-    "paint tools", which not only perform operations that you would normally think of
-    as painting, but also operations such as erasing, copying, smudging,
-    lightening or darkening, etc. All of the paint tools, except the ink tool,
-    use the same set of brushes. The brush pixmaps represent the marks that
-    are made by single "touches" of the brush to the image. A brush stroke,
-    usually made by moving the pointer across the image with the mouse button
-    held down, produces a series of marks spaced along the trajectory, in a
-    way specified by the characteristics of the brush and the paint tool being
-    used.
+    is a pixmap or set of pixmaps used for painting. GIMP includes a set of
+    10 <quote>paint tools</quote>, which not only perform operations that you
+    would normally think of as painting, but also operations such as erasing,
+    copying, smudging, lightening or darkening, etc. All of the paint tools,
+    except the ink tool, use the same set of brushes. The brush pixmaps
+    represent the marks that are made by single <quote>touches</quote> of the
+    brush to the image. A brush stroke, usually made by moving the pointer
+    across the image with the mouse button held down, produces a series of
+    marks spaced along the trajectory, in a  way specified by the
+    characteristics of the brush and the paint tool being used.
   </para>
   <para>
-    Brushes can be selected by clicking on an icon in the <link linkend="gimp-brush-dialog">Brushes dialog</link>.  GIMP's
+    Brushes can be selected by clicking on an icon in the
+    <link linkend="gimp-brush-dialog">Brushes dialog</link>.  GIMP's
     <emphasis>current brush</emphasis> is shown in the
     Brush/Pattern/Gradient area of the Toolbox.  Clicking on the brush
     symbol there is one way of activating the Brushes dialog.

Modified: trunk/src/concepts/color-management.xml
==============================================================================
--- trunk/src/concepts/color-management.xml	(original)
+++ trunk/src/concepts/color-management.xml	Sun Feb 22 07:12:23 2009
@@ -5,17 +5,7 @@
   2008-04-05 Mr.Dust : added 'ko' contents
   2007-12-26 lexa: initial version for en and de
 -->
-<!--Remeber to ad your lang code in gimp.xml under  "II.6  Doing Color Management with GIMP" -->
 <sect1 id="gimp-concepts-color-management">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-26</date>
-        <authorinitials>lexa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Color Management in GIMP</phrase>
   </title>
@@ -31,6 +21,7 @@
   <indexterm>
     <primary>ICC profile</primary>
   </indexterm>
+
   <para>
     Many devices you use in your design or photography workflow, like digital
     photo cameras, scanners, displays, printers etc., have their own color
@@ -44,7 +35,8 @@
     </title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/using/colormanagement-workflow1.png" format="PNG"/>
+        <imagedata format="PNG"
+                   fileref="images/using/colormanagement-workflow1.png"/>
       </imageobject>
       <caption>
         <para>Workflow without Color management</para>
@@ -52,13 +44,15 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/using/colormanagement-workflow2.png" format="PNG"/>
+        <imagedata format="PNG"
+                   fileref="images/using/colormanagement-workflow2.png"/>
       </imageobject>
       <caption>
         <para>Process with Color management</para>
       </caption>
     </mediaobject>
   </figure>
+
   <sect2>
     <title>
       <phrase>Problems of a non Color Managed Workflow</phrase>
@@ -103,6 +97,7 @@
       are stored to files and embedded into images.
     </para>
   </sect2>
+
   <sect2 id="plug-in-icc-profile-set">
     <title>
       <phrase>Introduction to a Color Managed Workflow</phrase>
@@ -146,6 +141,7 @@
         manually assign it to that image.
       </para>
     </sect3>
+
     <sect3 id="gimp-concepts-cm-display">
       <title>
         <phrase>Display</phrase>
@@ -206,6 +202,7 @@
         </para>
       </sect4>
     </sect3>
+
     <sect3>
       <title>
         <phrase>Print Simulation</phrase>

Modified: trunk/src/concepts/docks.xml
==============================================================================
--- trunk/src/concepts/docks.xml	(original)
+++ trunk/src/concepts/docks.xml	Sun Feb 22 07:12:23 2009
@@ -24,7 +24,7 @@
   </indexterm>
   <sect3 id="gimp-dock-separator">
     <title>
-      <phrase>Docking Bars</phrase>
+      <phrase>Docking areas</phrase>
     </title>
     <para>
       GIMP offers a lot of flexibility about the arrangement
@@ -36,27 +36,68 @@
       separate window. They also can't hold non-persistent dialogs, such as
       the Preferences dialog or the New Image dialog.
     </para>
+    <para>
+      <acronym>GIMP</acronym> is now supplied with two docks:
+      <itemizedlist>
+        <listitem>
+          <para>
+            The Layers, Channels and Paths dock
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The Brushes, Patterns and Gradients dock
+          </para>
+        </listitem>
+      </itemizedlist>
+      In these docks, every window is in its own tab.
+    </para>
+    <para>
+      The Toolbox is now also a <emphasis>utility window</emphasis>. The
+      Tool Options window is normally attached under the Toolbox and displays
+      the options of the selected tool.
+    </para>
+    <para>
+      A list of dockable windows is available in
+      <menuchoice>
+        <guimenu>Windows</guimenu>
+        <guisubmenu>Dockable Windows</guisubmenu>
+      </menuchoice>.
+      Click on the name of one of them to open it as an independent window.
+    </para>
+    <para>
+      Every dockable window has two types of docking areas: the dock bars and
+      the docking-tab area.
+    </para>
     <figure id="figure-dock">
       <title>
-        <phrase>A dock, with docking bars highlighted</phrase>
+        <phrase>Docking bars</phrase>
       </title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/using/dialog-highlight-dockbar.png" format="PNG"/>
         </imageobject>
+        <caption>
+          <para>
+            A window with <emphasis>docking bars</emphasis> highlighted.
+            These arethin gray bars, very unobtrusive and easy not to
+            notice: most people don't realize that they exist until they are
+            specifically pointed out.
+          </para>
+        </caption>
       </mediaobject>
     </figure>
+    <para>
+      In an isolated window, the <emphasis>docking-tab area</emphasis> is
+      the same as the drag handle area (see below). In a dock, the
+      docking-tab area covers all the window.
+    </para>
     <indexterm>
       <primary>Docks</primary>
-      <secondary>Docking bar</secondary>
+      <secondary>Docking areas</secondary>
     </indexterm>
-    <para>
-      Each dock has a set of <emphasis>docking bars</emphasis>,
-      as highlighted in the adjoining figure. These are thin gray bars, very
-      unobtrusive and easy not to notice: most people don't realize that they
-      exist until they are specifically pointed out.
-    </para>
   </sect3>
+
   <sect3 id="gimp-dockable-drag-area">
     <title>
       <phrase>Docking Drag Handles</phrase>
@@ -66,18 +107,29 @@
       <secondary>Docking drag handle</secondary>
     </indexterm>
     <para>
-      Each dockable dialog has a <emphasis>drag handle area</emphasis>,
-      as highlighted in the figure on the right. You can recognize this by
+      Each dockable window has a <emphasis>drag handle area</emphasis>,
+      as highlighted in the figure below. You can recognize this by
       the fact that the cursor changes to a hand shape when the pointer is
       over the drag handle area. To dock a dialog, you simply click on its
-      drag handle area, and drag it onto one of the docking bars in a dock:
-      the dialog will be added to the aimed window. If you drag it onto the
-      aimed window itself, it will be added as a tab.
+      drag handle area, and drag it onto
+      <itemizedlist>
+        <listitem>
+          <para>
+            either one of the docking bars in a window: the dialog will be
+            attached under this window,
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            or the docking-tab area: the dialog will be added as a tab.
+          </para>
+        </listitem>
+      </itemizedlist>
     </para>
     <figure id="figure-docked-dialogs">
       <title>
         <phrase>
-          A dialog in a dock, with the drag handle area highlighted.
+          A dockable window, with the drag handle area highlighted.
         </phrase>
       </title>
       <mediaobject>
@@ -86,19 +138,59 @@
         </imageobject>
         <caption>
           <para>
-            This screenshot shows the area that can be used to take a dialog off
-            the dock.
+            This screenshot shows the area that can be used to drag a
+            dialog window onto a dock. It can also be used to take a dialog
+            off the dock.
           </para>
         </caption>
       </mediaobject>
     </figure>
+    <figure id="figure-docking-types">
+      <title>
+        <phrase>
+          The two docking types.
+        </phrase>
+      </title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/using/dock-attached.png"
+                     format="PNG"/>
+        </imageobject>
+        <caption>
+          <para>
+            The dockable window has been docked onto a dock bar.
+          </para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/using/dock-tab.png"
+                     format="PNG"/>
+        </imageobject>
+        <caption>
+          <para>
+            The dockable window has been docked onto the docking-tab area.
+            A new tab has been created.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
+
     <para>
       You can drag more than one dialog onto the same docking bar. If you do,
       they will turn into tabs, represented by iconic symbols at the top.
       Clicking on the tab handle will bring a tab to the front, so that you
       can interact with it.
     </para>
+
+    <note>
+      <para>
+        You can also add a new tab in a window, detach it, delete it by using
+        the Tab menu. Please see below.
+      </para>
+    </note>
   </sect3>
+
   <sect3 id="gimp-dock-image-menu">
     <title>
       <phrase>Image Menu</phrase>
@@ -136,6 +228,7 @@
       cannot add an Image Menu to the dock that contains the Toolbox.)
     </para>
   </sect3>
+
   <sect3 id="gimp-dockable-menu">
     <title>
       <phrase>Tab Menu</phrase>
@@ -193,6 +286,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Add Tab</term>
         <listitem>
@@ -217,6 +311,7 @@
           </figure>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Close Tab</term>
         <listitem>
@@ -232,6 +327,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Detach Tab</term>
         <listitem>
@@ -248,6 +344,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Preview Size</term>
         <listitem>
@@ -286,6 +383,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Tab Style</term>
         <listitem>
@@ -365,6 +463,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>View as List; View as Grid</term>
         <listitem>
@@ -387,6 +486,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Show Image Menu</term>
         <listitem>
@@ -398,10 +498,11 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Auto Follow Active Image</term>
         <listitem>
-          <para><!--Changed 2007-05-28-->
+          <para>
             If this option is checked, the related dialog will be that of the
             current image and will change if you select another image. For
             example, if you have two images and the Histogram dialog on your

Modified: trunk/src/concepts/fonts-and-text.xml
==============================================================================
--- trunk/src/concepts/fonts-and-text.xml	(original)
+++ trunk/src/concepts/fonts-and-text.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6
   2007-01-28 added Spanish translation by manuq
   2006-08-13 added norwegian translation by KoSt
   2006-07-24 added italian translation by ciampix
@@ -36,6 +37,7 @@
     </mediaobject>
   </figure>
   <para>
+    The Text tool is progressively improved.
     One of the greatest improvements of GIMP 2.0 over GIMP 1.2 is in the
     handling of text. In GIMP 2.0 and 2.2, each text item goes in a separate
     Text layer, and you can come back later to the layer and edit the text in
@@ -44,6 +46,12 @@
     control justification, indentation, and line spacing.
   </para>
   <para>
+    With GIMP-2.6, you can draw a bounding box (a rectangular frame) for the
+    text on your image and you can adjust this rectangle in the same way as a
+    rectangular selection. The text goes on being edited in the Text Editor,
+    but it is automatically wrapped within this box.
+  </para>
+  <para>
     Actually, you can operate on a text layer in the same ways as any other
     layer, but doing so often means giving up the ability to edit the text
     without losing the results of your work.

Modified: trunk/src/concepts/gradients.xml
==============================================================================
--- trunk/src/concepts/gradients.xml	(original)
+++ trunk/src/concepts/gradients.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6. No change
   2008-04-04 Mr.Dust : reviewed and added 'ko'
   2006-05-08 added Korean translation by Dust
   2006-04-30 HdJ: added dutch translation.
@@ -168,7 +169,7 @@
   <para>A few useful things to know about GIMP's gradients:</para>
   <itemizedlist>
     <listitem>
-      <para><!--Changed 050515-->
+      <para>
         The first four gradients in the list are special:  they use the
         Foreground and Background colors from the Toolbox Color Area,
         instead of being fixed. <guilabel>FG to BG (RGB)</guilabel> is the

Modified: trunk/src/concepts/grid-and-guides.xml
==============================================================================
--- trunk/src/concepts/grid-and-guides.xml	(original)
+++ trunk/src/concepts/grid-and-guides.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6
   2006-09-17 added norwegian translation by KoSt
   2006-05-02 added Korean translation by Dust
   2006-02-28 Added italian translation and fixed 'Shift' key meaning for
@@ -11,15 +12,6 @@
   2005-11-28 replaced informalfigures by figures by lexa
 -->
 <sect1 id="gimp-concepts-image-grid">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-03-31</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Grids and Guides</phrase>
   </title>
@@ -35,6 +27,7 @@
     <primary>Guides</primary>
     <secondary>Overview</secondary>
   </indexterm>
+
   <para>
     You will probably have it happen many times that you need to place
     something in an image very precisely, and find that it is not easy to do
@@ -54,6 +47,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <sect2>
     <title>
       <phrase>The Image Grid</phrase>
@@ -71,7 +65,10 @@
     <para>
       Each image has a grid. It is always present, but by default it is not
       visible until you activate it by toggling
-      <menuchoice><guimenu>View</guimenu><guimenuitem>Show Grid</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>View</guimenu>
+        <guimenuitem>Show Grid</guimenuitem>
+      </menuchoice>
       in the image menu. If you want grids to be present more often than not,
       you can change the default behavior by checking "Show grid" in the
       <link linkend="gimp-prefs-image-window-appearance">
@@ -88,7 +85,10 @@
       <link linkend="gimp-prefs-default-grid">Default Image Grid</link>
       page of the Preferences dialog. If you only want to change the grid
       appearance for the current image, you can do so by choosing
-      <menuchoice><guimenu>Image</guimenu><guimenuitem>Configure Grid</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Image</guimenu>
+        <guimenuitem>Configure Grid</guimenuitem>
+      </menuchoice>
       from the image menu: this brings up the
       <link linkend="gimp-configure-grid-dialog">Configure Grid</link> dialog.
     </para>
@@ -106,7 +106,10 @@
       Not only can a grid be helpful for judging distances and spatial
       relationships, it can also permit you to align things exactly with
       the grid, if you toggle
-      <menuchoice><guimenu>View</guimenu><guimenuitem>Snap to Grid</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>View</guimenu>
+        <guimenuitem>Snap to Grid</guimenuitem>
+      </menuchoice>
       in the image menu:  this causes the pointer to "warp" perfectly to
       any grid line located within a certain distance.  You can
       customize the snap distance threshold by setting "Snap distance"
@@ -117,6 +120,7 @@
       isn't easy to imagine why you might want to do this, though.)
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Guides</phrase>
@@ -146,11 +150,17 @@
     <para>
       As with the grid, you can cause the pointer to snap to nearby
       guides, by toggling
-      <menuchoice><guimenu>View</guimenu><guimenuitem>Snap to Guides</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>View</guimenu>
+        <guimenuitem>Snap to Guides</guimenuitem>
+      </menuchoice>
       in the image menu.  If you have a number of guides and they are
       making it difficult for you to judge the image properly, you can
       hide them by toggling
-      <menuchoice><guimenu>View</guimenu><guimenuitem>Show Guides</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>View</guimenu>
+        <guimenuitem>Show Guides</guimenuitem>
+      </menuchoice>.
       It is suggested that you only do this momentarily, otherwise you
       may get confused the next time you try to create a guide and
       don't see anything happening.

Modified: trunk/src/concepts/image-types.xml
==============================================================================
--- trunk/src/concepts/image-types.xml	(original)
+++ trunk/src/concepts/image-types.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
-<!-- section history:
+<!-- section history
+  2009-02-19 j.h:revised for v2.6. No change
   2007-03-26 reviewed Korean translation by Dust
   2006-08-28 added norwegian translation by KoSt
   2006-05-02 added Korean translation by Dust
@@ -25,7 +26,7 @@
     look at all of the components of an image, and the things you can
     do with them.
   </para>
-  <para><!--changed 041006-->
+  <para>
     The most basic property of an image is its
     <emphasis>mode</emphasis>.  There are three possible modes: RGB,
     grayscale, and indexed. RGB stands

Modified: trunk/src/concepts/images-loading.xml
==============================================================================
--- trunk/src/concepts/images-loading.xml	(original)
+++ trunk/src/concepts/images-loading.xml	Sun Feb 22 07:12:23 2009
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6
   2007-03-14 lexa: split out from another file
 -->
 <sect1 id="gimp-using-fileformats-opening">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-03-14</date>
-        <authorinitials>lexa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Opening Files</phrase>
   </title>
@@ -30,12 +22,15 @@
     </title>
     <para>
       The most obvious is to open it using a menu, by choosing
-      <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>
-      from either the Toolbox menu or an image menu. This brings up a File
-      Chooser dialog, allowing you to navigate to the file and click on its
-      name. This method works well if you know the name of the file you want
-      to open, and where it is located. It is not so convenient if you want to
-      find the file on the basis of a thumbnail.
+      <menuchoice>
+        <guimenu>File</guimenu>
+        <guimenuitem>Open</guimenuitem>
+      </menuchoice>
+      from an image menu. This brings up a File Browser dialog, allowing you
+      to navigate to the file and click on its name. This method works well
+      if you know the name of the file you want to open, and where it is
+      located. It is not so convenient if you want to find the file on the
+      basis of a thumbnail.
     </para>
     <note>
       <para>
@@ -92,12 +87,10 @@
       down the Ctrl key and clicking in the Preview area.
     </para>
     <para>
-      One thing that strikes many people when they first see the File Open
-      dialog is that there is no way to enter the name of the file using the
-      keyboard. Actually this can be done, but the feature is a bit hidden: if
-      you type <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo>
-      with the dialog focused, an "Open Location" dialog pops up, with a space
-      to type the file name. This dialog is described in more detail below.
+      By default, a <guilabel>Location</guilabel> text box is present in the
+      File Open dialog. It may be absent: the
+      <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo> key
+      combination toggles this text box.
     </para>
     <note>
       <para>
@@ -115,6 +108,7 @@
       </para>
     </note>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Open Location</phrase>
@@ -123,10 +117,12 @@
       If instead of a file name, you have a <acronym>URI</acronym>
       (i.e., a web address) for the image, you can open it using the
       menu, by choosing
-      <menuchoice><guimenu>File</guimenu><guimenuitem>Open Locationâ</guimenuitem></menuchoice>
-      from either the Toolbox menu or an image menu.  This brings up a
-      small dialog that allows you to enter (or paste) the
-      <acronym>URI</acronym>.
+      <menuchoice>
+        <guimenu>File</guimenu>
+        <guimenuitem>Open Locationâ</guimenuitem>
+      </menuchoice>
+      from an image menu.  This brings up a small dialog that allows you to
+      enter (or paste) the <acronym>URI</acronym>.
     </para>
     <figure>
       <title>
@@ -146,6 +142,7 @@
       </mediaobject>
     </figure>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Open Recent</phrase>
@@ -154,13 +151,17 @@
       If the image is one that you previously created using
       <acronym>GIMP</acronym>,
       perhaps the easiest way to open it is from the menu, using
-      <menuchoice><guimenu>File</guimenu><guimenuitem>Open Recent</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>File</guimenu>
+        <guimenuitem>Open Recent</guimenuitem>
+      </menuchoice>.
       This gives you a scrollable list of the images you
       have most recently worked on in, with icons beside them.
       You need only select the one you want, and it will be
       opened.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>File Browser</phrase>
@@ -168,14 +169,15 @@
     <para>
       If you have associated the file type of the image with
       <acronym>GIMP</acronym>,
-      either when you installed <acronym>GIMP</acronym> or later, then you can
-      navigate to the file using a file manager (such as Nautilus
-      in Linux, or Windows Explorer in Windows), and once you have
-      found it, double-click on the icon.  If things are set up
+      either when you installed <acronym>GIMP</acronym> or later, then you
+      can navigate to the file using a file manager (such as Nautilus or
+      Konqueror in Linux, or Windows Explorer in Windows), and once you
+      have found it, double-click on the icon.  If things are set up
       properly, this will cause the image to open in
       <acronym>GIMP</acronym>.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Drag and Drop</phrase>
@@ -194,6 +196,7 @@
       toolbox.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Copy and Paste</phrase>
@@ -204,12 +207,16 @@
       <keycap>Print Screen</keycap> key lets you copy the screen into
       the clipboard), you can then open
       the image in <acronym>GIMP</acronym> by choosing
-      <menuchoice><guimenu>File</guimenu><guisubmenu>Acquire</guisubmenu><guimenuitem>Paste as New</guimenuitem></menuchoice>
-      from the Toolbox menu.  Support for this is somewhat
+      <menuchoice>
+        <guimenu>Edit</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guimenuitem>From Clipboard</guimenuitem></menuchoice>
+      from the image menu.  Support for this is somewhat
       variable, however, so your best bet is to try it and see
       whether it works.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Image Browser</phrase>

Modified: trunk/src/concepts/images.xml
==============================================================================
--- trunk/src/concepts/images.xml	(original)
+++ trunk/src/concepts/images.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6
   2007-03-28 reviewed Korean translation by Dust
   2006-08-28 added norwegian translation by KoSt
   2006-05-02 added Korean translation by Dust
@@ -21,7 +22,10 @@
   <para>
     You can create new files in <acronym>GIMP</acronym> by using the
     following menuitem:
-    <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice>.
+    <menuchoice>
+      <guimenu>File</guimenu>
+      <guimenuitem>New</guimenuitem>
+    </menuchoice>.
     This opens the <guilabel>Create a new image</guilabel> dialog,
     where you can modify the initial width and height of the file or
     using the standard values. More information about this dialog can

Modified: trunk/src/concepts/imagewindow.xml
==============================================================================
--- trunk/src/concepts/imagewindow.xml	(original)
+++ trunk/src/concepts/imagewindow.xml	Sun Feb 22 07:12:23 2009
@@ -154,7 +154,7 @@
         for more information.
       </para>
     </listitem>
-    <listitem><!--Changed 2008-12-27-->
+    <listitem>
       <!--8-->
       <anchor id="gimp-image-window-zoom"/>
       <para><emphasis>Zoom button:</emphasis>
@@ -186,7 +186,7 @@
         </para>
       </note>
     </listitem>
-    <listitem><!--Changed 2008-12-27-->
+    <listitem>
       <!--10-->
       <para><emphasis>Cancel Button:</emphasis>
         At the lower right corner of the window the Cancel button appears

Modified: trunk/src/concepts/intro.xml
==============================================================================
--- trunk/src/concepts/intro.xml	(original)
+++ trunk/src/concepts/intro.xml	Sun Feb 22 07:12:23 2009
@@ -54,6 +54,7 @@
       <xref linkend="bibliography-online-gimp-dev"/>.
     </para>
   </sect2>
+
   <sect2 id="gimp-concepts-running-language">
     <title>Language</title>
     <indexterm>
@@ -131,6 +132,7 @@
       </varlistentry>
     </variablelist>
   </sect2>
+
   <sect2 id="gimp-concepts-running-command-line">
     <title>Command Line Arguments</title>
     <indexterm>

Modified: trunk/src/concepts/layer-modes.xml
==============================================================================
--- trunk/src/concepts/layer-modes.xml	(original)
+++ trunk/src/concepts/layer-modes.xml	Sun Feb 22 07:12:23 2009
@@ -2,6 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Section History
+  2009-02-21 j.h: revised for v2.6
   2008-04-06 Mr.Dust : reviewed and added 'ko'
   2008-01-05 jpl: added example to 'dissolve'
   2007-09-23 AntI: Added 'es'
@@ -15,15 +16,6 @@
   2006-09-06 scb: thorough review and/or rewrite of English
 -->
 <sect1 id="gimp-concepts-layer-modes">
-  <!--sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-05</date>
-        <authorinitials>jpl</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info-->
   <title>
     <phrase>Layer Modes</phrase>
   </title>
@@ -67,6 +59,7 @@
     <quote>Saturation</quote>, the underlying visible layers will appear in
     shades of gray.
   </para>
+
   <figure>
     <title>
       <phrase>Images (masks) for layer mode examples</phrase>
@@ -88,6 +81,7 @@
       </caption>
     </mediaobject>
   </figure>
+
   <figure>
     <title>
       <phrase>Images (backgrounds) for layer mode examples</phrase>
@@ -109,6 +103,7 @@
       </caption>
     </mediaobject>
   </figure>
+
   <para>
     In the descriptions of the layer modes below, the equations are also
     shown. This is for those who are curious about the mathematics of the
@@ -148,6 +143,7 @@
     modified (by being blurred, moved, rotated, scaled, color-inverted, etc.)
     and seeing what happens with the layer modes.
   </para>
+
   <variablelist>
     <varlistentry>
       <term>Normal</term>
@@ -202,6 +198,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Dissolve</term>
       <listitem>
@@ -279,6 +276,7 @@
         </figure>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Multiply</term>
       <listitem>
@@ -338,6 +336,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Divide</term>
       <listitem>
@@ -394,6 +393,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Screen</term>
       <listitem>
@@ -459,6 +459,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry id="layer-mode-overlay">
       <term>Overlay</term>
       <listitem>
@@ -528,6 +529,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Dodge</term>
       <listitem>
@@ -570,7 +572,7 @@
           divides that by the inverse of the pixel value of the top layer. The
           resulting image is usually lighter, but some colors may be inverted.
         </para>
-        <para><!--TODO es;it;ko;no : increase -> decrease-->
+        <para>
           In photography, dodging is a technique used in a darkroom to
           decrease the exposure in particular areas of the image. This brings
           out details in the shadows. When used for this purpose, dodge may
@@ -589,6 +591,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Burn</term>
       <listitem>
@@ -652,6 +655,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Hard light</term>
       <listitem>
@@ -724,6 +728,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Soft light</term>
       <listitem>
@@ -795,6 +800,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Grain extract</term>
       <listitem>
@@ -851,6 +857,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Grain merge</term>
       <listitem>
@@ -862,10 +869,10 @@
           <primary>Grain merge</primary>
         </indexterm>
         <para>
-      There are two more layer modes, but these are available only for
-      painting tools. See <xref linkend="gimp-tool-painting-modes"/>
-      for detailed information.
-    </para>
+          There are two more layer modes, but these are available only for
+          painting tools. See <xref linkend="gimp-tool-painting-modes"/>
+          for detailed information.
+        </para>
         <figure>
           <title>
             <phrase>
@@ -912,6 +919,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Difference</term>
       <listitem>
@@ -970,6 +978,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Addition</term>
       <listitem>
@@ -1028,6 +1037,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Subtract</term>
       <listitem>
@@ -1084,6 +1094,7 @@
         </equation>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Darken only</term>
       <listitem>
@@ -1142,6 +1153,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Lighten only</term>
       <listitem>
@@ -1200,6 +1212,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Hue</term>
       <listitem>
@@ -1245,6 +1258,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Saturation</term>
       <listitem>
@@ -1288,6 +1302,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Color</term>
       <listitem>
@@ -1331,6 +1346,7 @@
         </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>Value</term>
       <listitem>
@@ -1377,6 +1393,7 @@
       </listitem>
     </varlistentry>
   </variablelist>
+
   <para>
     Each layer in an image can have a different layer mode. (Of course, the
     layer mode of the bottom layer of an image has no effect.) The effects of

Modified: trunk/src/concepts/layers.xml
==============================================================================
--- trunk/src/concepts/layers.xml	(original)
+++ trunk/src/concepts/layers.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Section History
+  2009-02-21 j.h: revised for v2.6
   2008-04-05 Mr.Dust : reviewed and added 'ko'
   2008-01-14 alex falappa: fixed outstanding TODOs for 'it'
   2008-01-05 jpl: added lock-alpha image 'en;fr'
@@ -36,7 +37,8 @@
     section, but we will touch on some aspects of it here, in relation to the
     layer properties that they display.
   </para>
-  <para><indexterm><primary>Drawable</primary></indexterm>
+  <para>
+    <indexterm><primary>Drawable</primary></indexterm>
     Each open image has at any time a single
     <emphasis>active drawable</emphasis>. A <quote>drawable</quote>
     is a GIMP concept that includes layers, but also several other types of
@@ -54,6 +56,7 @@
     affect the active layer of the image.  The same menu can be
     accessed by right-clicking in the Layers dialog.
   </para>
+
   <sect2 id="gimp-layer-properties">
     <title>
       <phrase>Layer Properties</phrase>
@@ -75,6 +78,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Presence or absence of an alpha channel</term>
         <listitem>
@@ -103,8 +107,7 @@
             the
             <link linkend="gimp-layer-alpha-add">Add an Alpha Channel</link>.
           </para>
-          <para><!--TODO es;it;ko;nl;sv--><!-- do what? should I remove some contents? please, explain..
-            from Mr.Dust -->
+          <para>
             Every layer other than the bottom layer of an image has
             automatically an Alpha channel, but you can't see a grayscale
             representation of the alpha values. See
@@ -214,7 +217,11 @@
                   <caption>
                     <para>
                       We used the
-                      <menuchoice><guimenu>Layer</guimenu><guimenuitem>Transparency</guimenuitem><guisubmenu>Add Alpha Channel</guisubmenu></menuchoice>
+                      <menuchoice>
+                        <guimenu>Layer</guimenu>
+                        <guimenuitem>Transparency</guimenuitem>
+                        <guisubmenu>Add Alpha Channel</guisubmenu>
+                      </menuchoice>
                       command, which is active on the Background layer only.
                       Now, the left part of the image is fully transparent and
                       has the color of the page the image is lying on. The left
@@ -228,6 +235,7 @@
           </formalpara>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Layer type</term>
         <listitem>
@@ -270,6 +278,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>
           <guiicon>
@@ -305,6 +314,7 @@
           </tip>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>
           <guiicon>
@@ -324,7 +334,7 @@
           <indexterm>
             <primary>Chain icon</primary>
           </indexterm>
-          <para><!--added 041022-->
+          <para>
             If you click between the eye icon and the layer thumbnail, you get
             a chain icon, which enables you to group layers for operations on
             multiple layers (for example with the Move tool or a transform
@@ -340,13 +350,14 @@
               </imageobject>
               <caption>
                 <para>
-                    Red: Linkage to others layers. Yellow: Visibility.
+                    Red: Linkage to others layers. Green: Visibility.
                   </para>
               </caption>
             </mediaobject>
           </figure>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Size and boundaries</term>
         <listitem>
@@ -385,6 +396,7 @@
           </note>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Opacity</term>
         <listitem>
@@ -396,10 +408,11 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Mode</term>
         <listitem>
-          <para><!--changed 041022-->
+          <para>
             The Mode of a layer determines how colors from the layer are
             combined with colors from the underlying layers to produce a
             visible result. This is a sufficiently complex, and sufficiently
@@ -408,6 +421,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Layer mask</term>
         <listitem>
@@ -428,6 +442,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term><quote>Lock alpha channel</quote> setting</term>
         <listitem>

Modified: trunk/src/concepts/palettes.xml
==============================================================================
--- trunk/src/concepts/palettes.xml	(original)
+++ trunk/src/concepts/palettes.xml	Sun Feb 22 07:12:23 2009
@@ -12,15 +12,6 @@
   2005-05-09 nn: added french translation
 -->
 <sect1 id="gimp-concepts-palettes">
-  <!--<sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-05</date>
-        <authorinitials>jpl</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Palettes</phrase>
   </title>
@@ -35,6 +26,7 @@
   <indexterm>
     <primary>Indexed palette</primary>
   </indexterm>
+
   <para>
     A <emphasis>palette</emphasis> is a set of discrete colors. In GIMP,
     palettes are used mainly for two purposes:
@@ -54,6 +46,7 @@
       </para>
     </listitem>
   </itemizedlist>
+
   <para>
     Actually neither of these functions fall very much into the mainstream of
     GIMP usage: it is possible to do rather sophisticated things in GIMP
@@ -62,6 +55,7 @@
     think about them in some situations, as for example when working with GIF
     files.
   </para>
+
   <figure>
     <title>
       <phrase>The Palettes dialog</phrase>
@@ -82,6 +76,7 @@
     <link linkend="gimp-palette-dialog">Palettes dialog</link>.
     This is also the starting point if you want to create a new palette.
   </para>
+
   <figure>
     <title>
       <phrase>The Palette Editor</phrase>
@@ -126,6 +121,7 @@
     GIMP, it probably won't be very hard to convert them: just take a look at
     any <filename>.gpl</filename> and you will see what to do.
   </para>
+
   <sect2>
     <title>
       <phrase>Colormap</phrase>

Modified: trunk/src/concepts/patterns.xml
==============================================================================
--- trunk/src/concepts/patterns.xml	(original)
+++ trunk/src/concepts/patterns.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-17 j.h: revised for v2.6
   2008-04-05 Mr.Dust : reviewed and added 'ko'
   2007-09-15 AntI: Added 'es'
   2006-09-06 added norwegian translation by KoSt
@@ -12,15 +13,6 @@
   2005-05-09 nn: added french translation
 -->
 <sect1 id="gimp-concepts-patterns">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-05</date>
-        <authorinitials>jpl</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Patterns</phrase>
   </title>
@@ -28,6 +20,7 @@
     <primary>Patterns</primary>
     <secondary>Introduction</secondary>
   </indexterm>
+
   <para>
     A <emphasis>pattern</emphasis> is an image, usually small, used
     for filling regions by <emphasis>tiling</emphasis>, that is, by
@@ -125,6 +118,7 @@
     included in GIMP's pattern search path. There are several file formats you
     can use for patterns:
   </para>
+
   <variablelist>
     <varlistentry>
       <term>PAT</term>
@@ -143,7 +137,7 @@
       <term>PNG, JPEG, BMP, GIF, TIFF</term>
       <listitem>
         <para>
-          New in GIMP 2.2 is the ability to use
+          Since GIMP 2.2 you can use
           <filename>.png</filename>,  <filename>.jpg</filename>,
           <filename>.bmp</filename>, <filename>.gif</filename>, or
           <filename>.tiff</filename> files as patterns.
@@ -151,6 +145,7 @@
       </listitem>
     </varlistentry>
   </variablelist>
+
   <para>
     To make a pattern available, you place it in one of the folders in GIMP's
     pattern search path. By default, the pattern search path includes two
@@ -193,8 +188,12 @@
   </figure>
   <para>
     Also of interest are a set of pattern-generating scripts that come with
-    GIMP: you can find them in the Toolbox menu, under
-    <menuchoice><guimenu>Xtns</guimenu><guisubmenu>Patterns</guisubmenu></menuchoice>.
+    GIMP: you can find them in the menu bar, through
+    <menuchoice>
+      <guimenu>File</guimenu>
+      <guisubmenu>Create</guisubmenu>
+      <guimenuitem>Patterns</guimenuitem>
+    </menuchoice>.
     Each of the scripts creates a new image filled with a particular type of
     pattern: a dialog pops up that allows you to set parameters controlling
     the details of the appearance. Some of these patterns are most useful for

Modified: trunk/src/concepts/plugins.xml
==============================================================================
--- trunk/src/concepts/plugins.xml	(original)
+++ trunk/src/concepts/plugins.xml	Sun Feb 22 07:12:23 2009
@@ -96,6 +96,7 @@
       </para>
     </caution>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Using Plugins</phrase>
@@ -151,6 +152,7 @@
       won't even be able to recover from your foolishness.
     </para>
   </sect2>
+
   <sect2 id="gimp-plugins-install">
     <title>
       <phrase>Installing New Plugins</phrase>
@@ -223,6 +225,7 @@
         <acronym>GIMP</acronym>. This is probably a situation best avoided.
       </para>
     </sect3>
+
     <sect3>
       <title>Windows</title>
       <para>
@@ -256,6 +259,7 @@
         to date by adding advice based on your own experiences.
       </para>
     </sect3>
+
     <sect3>
       <title>
         <phrase>Apple Mac OS X</phrase>
@@ -281,6 +285,7 @@
       </para>
     </sect3>
   </sect2>
+
   <sect2 id="plugins-write">
     <title>
       <phrase>Writing Plugins</phrase>

Modified: trunk/src/concepts/qmask.xml
==============================================================================
--- trunk/src/concepts/qmask.xml	(original)
+++ trunk/src/concepts/qmask.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Section History
+  2009-02-21 j.h: revised for v2.6. No change
   2006-09-06: added norwegian translation by KoSt
   2006-02-17: added italian translation by ciampix
   2006-01-07: Small revisions in the dutch text by HdJ
@@ -78,11 +79,14 @@
       most effective way to delicately manipulate it.
     </para>
     <tip>
-      <para><!-- updated by ciampix: 2008-08-28 -->
+      <para>
         To save the selection done by the Quickmask to a new channel; Make
         sure that there is a selection and that Quickmask is not active in
         the image window. Select in the image menu
-        <menuchoice><guimenu>Select</guimenu><guimenuitem>Save to Channel</guimenuitem></menuchoice>.
+        <menuchoice>
+          <guimenu>Select</guimenu>
+          <guimenuitem>Save to Channel</guimenuitem>
+        </menuchoice>.
         This will create a new channel in the channel dialog called
         <quote>SelectionMask copy</quote> (if you repeat this command you
         will create a <quote>..copy#1</quote>, <quote>...copy#2</quote> and
@@ -97,11 +101,12 @@
       </para>
     </tip>
     <para>
-      You can learn more on <link linkend="gimp-qmask">Quickmask</link> and
+      You can learn more on
       <link linkend="dialogs-selection-masks">Selection masks</link> in the
       section dedicated to the channel dialog.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Properties</phrase>

Modified: trunk/src/concepts/selection.xml
==============================================================================
--- trunk/src/concepts/selection.xml	(original)
+++ trunk/src/concepts/selection.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-21 j.h: revised for v2.6
   2008-04-03 Mr.Dust : added 'ko'
   2007-05-14 j.h added "Make a solid BG transparent"
   2007-04-04 alex falappa: fixes in italian language
@@ -13,15 +14,6 @@
   050905: Added Making a selection semi-transparente
 -->
 <sect1 id="gimp-concepts-selection">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>The Selection</phrase>
   </title>
@@ -37,6 +29,7 @@
     <primary>Transparency</primary>
     <secondary>Making a selection transparent</secondary>
   </indexterm>
+
   <para>
     Often when you operate on an image, you only want part of it to be
     affected. In GIMP, you make this happen by <emphasis>selecting</emphasis>
@@ -137,6 +130,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <sect2>
     <title>
       <phrase>Feathering</phrase>
@@ -166,11 +160,17 @@
       Actually, it is possible to feather a selection at any time, even if it
       was originally created as a sharp selection. You can do this from the
       image menu, by choosing
-      <menuchoice><guimenu>Select</guimenu><guimenuitem>Feather</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Select</guimenu>
+        <guimenuitem>Feather</guimenuitem>
+      </menuchoice>.
       This brings up a dialog that allows you to set the feather radius. You
       can do the opposite--sharpen a graduated selection into an
       all-or-nothing selection--by choosing
-      <menuchoice><guimenu>Select</guimenu><guimenuitem>Sharpen</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Select</guimenu>
+        <guimenuitem>Sharpen</guimenuitem>
+      </menuchoice>.
     </para>
     <note>
       <para>
@@ -180,6 +180,7 @@
       </para>
     </note>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Making a Selection Partially Transparent</phrase>
@@ -196,9 +197,12 @@
         </para>
       </listitem>
       <listitem>
-        <para><!--Changed 060331-->
+        <para>
           For complex selections: use the command
-          <menuchoice><guimenu>Selection</guimenu><guimenuitem>Floating</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Selection</guimenu>
+            <guimenuitem>Floating</guimenuitem>
+          </menuchoice>
           to create a floating selection. This creates a new layer called
           <quote>Floating Selection</quote>.
 
@@ -213,17 +217,27 @@
         </para>
         <para>
           And, if you use this function frequently:
-          <keycombo action="press"><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> to copy the selection,
-          <keycombo action="press"><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> to paste it, creating so a floating selection,
-          adapt the opacity then make Layer/New Layer that pastes the floating
-          selection into the new layer. You can also create a shortcut for the
-          New Layer command to use keys only.
+          <keycombo action="press">
+            <keycap>Ctrl</keycap>
+            <keycap>C</keycap>
+          </keycombo> to copy the selection,
+          <keycombo action="press">
+            <keycap>Ctrl</keycap>
+            <keycap>V</keycap>
+          </keycombo> to paste it, creating so a floating selection, adapt
+          the opacity then make Layer/New Layer that pastes the floating
+          selection into the new layer. You can also create a shortcut for
+          the New Layer command to use keys only.
         </para>
       </listitem>
       <listitem>
         <para>
           Another way:
-          <menuchoice><guimenu>Layer</guimenu><guisubmenu>Mask</guisubmenu><guimenuitem>Layer mask</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Layer</guimenu>
+            <guisubmenu>Mask</guisubmenu>
+            <guimenuitem>Layer mask</guimenuitem>
+          </menuchoice>
           to add a layer mask to the layer with the
           selection, initializing it with the selection. Then use a brush with
           the wanted opacity to paint the selection with black, i-e paint it
@@ -244,9 +258,12 @@
         </para>
         <para>
           The simplest method is the
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Erase</guimenuitem></menuchoice>
-          command, which gives complete transparency and doesn't allow to
-          enjoy the Opacity setting of the Fill tool.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Erase</guimenuitem>
+          </menuchoice>
+          command, which gives complete transparency to a selection and
+          doesn't allow to enjoy the Opacity setting of the Fill tool.
         </para>
       </listitem>
     </itemizedlist>

Modified: trunk/src/concepts/setup.xml
==============================================================================
--- trunk/src/concepts/setup.xml	(original)
+++ trunk/src/concepts/setup.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2099-02-21 j.h: revised for v2.6
   2007-09-30 lexa: threw away all content that is not valid for 2.4 anymore
   2006-09-06 added norwegian translation by KoSt
   2006-05-02 added Korean translation by Dust
@@ -19,18 +20,19 @@
   <para>
     The first time you run GIMP, it goes through a series of steps to set up
     options and directories. This process creates a subdirectory of your home
-    directory called <filename class="directory">.gimp-2.4</filename>.
+    directory called <filename class="directory">.gimp-2.6</filename>.
     All of the information about the choices you make here goes into that
     directory. If you later remove that directory, or rename it as something
-    like <filename class="directory">.gimp-2.4.bak</filename>,
+    like <filename class="directory">.gimp-2.6.bak</filename>,
     then the next time you start GIMP, it will go through the whole setup
     sequence again, creating a new
-    <filename class="directory">.gimp-2.4</filename>
+    <filename class="directory">.gimp-2.6</filename>
     directory. You can exploit this if you want to explore the effect of
     different choices without destroying your existing installation, or if you
     have screwed things up so badly that your existing installation needs to
     be nuked.
   </para>
+
   <sect2>
     <title>
       <phrase>Finally . . .</phrase>
@@ -43,7 +45,10 @@
       distracting to look at them each time you start, you can disable them;
       but please go through them when you have the chance: for your
       convenience, you can read them at any time using the menu command
-      <menuchoice><guimenu>Help</guimenu><guimenuitem>Tips</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Help</guimenu>
+        <guimenuitem>Tips</guimenuitem>
+      </menuchoice>.
       Second, if at some point you are trying to do something, and GIMP
       seems to have suddenly stopped functioning, the section
       <link linkend="gimp-using-getting-unstuck">Getting Unstuck</link>

Modified: trunk/src/concepts/toolbox.xml
==============================================================================
--- trunk/src/concepts/toolbox.xml	(original)
+++ trunk/src/concepts/toolbox.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Version History:
+  2009-02-19 j.h: added tip for Removing Wilber's eyes
   2008-12-10 JPL: updated to v2.6
   2008-06-04 prokoudine: fixes to Russian translation
   2008-01-04 ude: replaced calloutlist with orderedlist
@@ -11,15 +12,6 @@
   2005-09-03: Addition en;fr at file end
 -->
 <sect2 id="gimp-concepts-toolbox">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-10</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <phrase>The Main Toolbox</phrase>
   </title>
@@ -27,6 +19,7 @@
     <primary>Toolbox</primary>
     <secondary>Introduction</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>Screenshot of the Toolbox</phrase>
@@ -113,4 +106,13 @@
         Devices</link>.
     </para>
   </note>
+  <tip>
+    <para>
+      You can get rid of the "Wilber's eyes" (replacing the old Toolbox
+      menu) from the Toolbox by adding the following line to your gimprc
+      file: <function>(toolbox-wilber no)</function>.
+      It only affects the toolbox. The eyes in the Image window are only
+      visible when you do not have an open image.
+    </para>
+  </tip>
 </sect2>

Modified: trunk/src/concepts/undo.xml
==============================================================================
--- trunk/src/concepts/undo.xml	(original)
+++ trunk/src/concepts/undo.xml	Sun Feb 22 07:12:23 2009
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-21 j.h: revised for v2.6
   2008-03-23 reviewed 'ko' by Mr.Dust
   2006-09-06 added norwegian translation by KoSt
   2006-05-02 Dust: added Korean translation
   2006-02-25 lexa: added translation for de and made file docbook compliant
 -->
 <sect1 id="gimp-concepts-undo">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Undoing</phrase>
   </title>
   <indexterm>
     <primary>Undo</primary>
   </indexterm>
+
   <para>
     Almost anything you do to an image in GIMP can be undone.  You can
     undo the most recent action by choosing
-    <menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice>
+    <menuchoice>
+      <guimenu>Edit</guimenu>
+      <guimenuitem>Undo</guimenuitem>
+    </menuchoice>
     from the image menu, but this is done so frequently that you
     really should memorize the keyboard shortcut,
     <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>.
@@ -33,7 +29,10 @@
   <para>
     Undoing can itself be undone. After having undone an action, you
     can <emphasis>redo</emphasis> it by choosing
-    <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice>
+    <menuchoice>
+      <guimenu>Edit</guimenu>
+      <guimenuitem>Redo</guimenuitem>
+    </menuchoice>
     from the image menu, or use the keyboard shortcut,
     <keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>.
     It is often helpful to judge the effect of an action by repeatedly

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Sun Feb 22 07:12:23 2009
@@ -2,6 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
+  2009-02-21 j.h: removed using/docks.xml
   2009-02-15 ude: removed menu-xtns.xml
   2008-12-28 j.h: added menus-windows.xml
   2008-01-21 ude: removed filters_color.xml (moved to Colors menu)
@@ -137,7 +138,7 @@
       <xi:include href="using/grid-and-guides.xml"/>
       <xi:include href="using/setup.xml"/>
       <xi:include href="using/shortcuts.xml"/>
-      <xi:include href="using/docks.xml"/>
+      <!--<xi:include href="using/docks.xml"/>-->
       <xi:include href="using/customize-splashscreen.xml"/>
     </chapter>
     <chapter id="gimp-scripting">

Modified: trunk/src/using/animated-brushes.xml
==============================================================================
--- trunk/src/using/animated-brushes.xml	(original)
+++ trunk/src/using/animated-brushes.xml	Sun Feb 22 07:12:23 2009
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-17 j.h: reviewed for v2.6
   2007-05-08 Added Spanish translation by AntI
 -->
 <sect1 id="gimp-using-animated-brushes">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>The GIH Dialog Box</phrase>
   </title>
@@ -20,14 +12,19 @@
     <primary>Animation</primary>
     <secondary>Creating an animated brush</secondary>
   </indexterm>
+
   <para>
     When your new animated brush is created, it is displayed within the image
     window and you would like save it into a gih format. You select
-    <menuchoice><guimenu>File</guimenu><guimenuitem>Save as...</guimenuitem></menuchoice>
+    <menuchoice>
+      <guimenu>File</guimenu>
+      <guimenuitem>Save as...</guimenuitem>
+    </menuchoice>
     menu, name your work with the gih extension in the new window relevant
     field and as soon as you pressed the Save button, the following window is
     displayed:
   </para>
+
   <figure>
     <title>
       <phrase>The dialog to describe the animated brush.</phrase>
@@ -43,6 +40,7 @@
       </caption>
     </mediaobject>
   </figure>
+
   <para>
     This dialog box has several options not easy to understand. They allow you
     to determine the way your brush is animated.
@@ -137,13 +135,21 @@
           In computer science an array has a "myarray(x,y,z)" form for a 3
           dimensions array (3D). It's easy to imagine a 2D array: on a paper
           it's an array with rows and columns
-          <mediaobject><imageobject><imagedata fileref="images/using/array2D.png" format="PNG"/></imageobject></mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/using/array2D.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
           With a 3d array we don't talk rows and columns but
           <guilabel>Dimensions</guilabel> and
           <guilabel>Ranks</guilabel>.
           The first dimension is along x axis, the second dimension along y
           axis, the third along z axis. Each dimension has ranks of cells.
-          <mediaobject><imageobject><imagedata fileref="images/using/array3D.png" format="PNG"/></imageobject></mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/using/array3D.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
         </para>
         <para>
           To fill up this array, GIMP starts retrieving cells from the top of
@@ -156,18 +162,26 @@
         </para>
         <para>
           Besides the rank number that you can give to each dimension, you can
-          also give them a
-          <guilabel>Selection</guilabel>
-          mode. You have several modes that will be applied when drawing:
-          <itemizedlist><listitem><para><emphasis>Incremental</emphasis>
+          also give them a <guilabel>Selection</guilabel> mode. You have
+          several modes that will be applied when drawing:
+          <itemizedlist>
+            <listitem>
+              <para><emphasis>Incremental</emphasis>
                 : GIMP selects a rank from the concerned dimension according
                 to the order ranks have in that dimension
-              </para></listitem><listitem><para><emphasis>Random</emphasis>
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis>Random</emphasis>
                 : GIMP selects a rank at random from the concerned dimension.
-              </para></listitem><listitem><para><emphasis>Angular</emphasis>
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis>Angular</emphasis>
                 : GIMP selects a rank in the concerned dimension according to
                 the moving angle of the brush.
-              </para><para>
+              </para>
+              <para>
                 The first rank is for the direction 0Â, upwards. The other
                 ranks are affected, counter clockwise, to an angle whose value
                 is 360/number of ranks. So, with 4 ranks in the concerned
@@ -175,14 +189,20 @@
                 direction change: second rank will be affected to 270Â (-90Â)
                 (leftwards), third rank to 180Â (downwards) and fourth rank to
                 90Â (rightwards).
-              </para></listitem><listitem><para><emphasis>Speed</emphasis>, <emphasis>Pressure</emphasis>,
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis>Speed</emphasis>, <emphasis>Pressure</emphasis>,
                 <emphasis>x tilt</emphasis> and <emphasis>y tilt</emphasis>
                 are options for sophisticated drawing tablets.
-              </para></listitem></itemizedlist>
+              </para>
+            </listitem>
+          </itemizedlist>
         </para>
       </listitem>
     </varlistentry>
   </variablelist>
+
   <variablelist>
     <title>
       <phrase>Examples</phrase>
@@ -195,24 +215,39 @@
         examples. You can actually place in each dimension cases that will
         give your brush a particular action.
       </para>
-        <para>
+      <para>
         Let us start with a 1D brush which will allow us to study selection
         modes action. We can imagine it like this:
-        <mediaobject><imageobject><imagedata fileref="images/using/array1D.png" format="PNG"/></imageobject></mediaobject>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/using/array1D.png" format="PNG"/>
+          </imageobject>
+        </mediaobject>
         Follow these steps:
-        <orderedlist><listitem><para>
+        <orderedlist>
+          <listitem>
+            <para>
               Open a new 30x30 pixels image, RGB with Transparent fill type.
               Using the Text tool create 4 layers "1", "2", "3", "4". Delete
               the "background" layer.
-            </para></listitem><listitem><para>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
               Save this image first with .xcf extension to keep its properties
               then save it as .gih.
-            </para></listitem><listitem><para><!--TODO es;it;ko;ru : 4 ranks -->
+            </para>
+          </listitem>
+          <listitem>
+            <para>
               The Save As Dialog is opened: select a destination for your
               image. OK. The GIH dialog is opened: Choose Spacing 100, give a
               name in Description box, 30x30 for Cell Size, 1 dimension,
               4 ranks and choose "Incremental" in Selection box. OK.
-            </para></listitem><listitem><para>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
               You may have difficulties to save directly in the GIMP Brush
               directory. In that case, save the <filename>.gih</filename>
               file manually into the
@@ -221,20 +256,41 @@
               icon to open the Brush Dialog then click on "Refresh". Your new
               brush appears in the Brush window. Select it. Select pencil tool
               for instance and click and hold with it on a new image
-              <mediaobject><imageobject><imagedata fileref="images/using/1234incr.png" format="PNG"/></imageobject></mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="images/using/1234incr.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
               You see 1, 2, 3, 4 digits following one another in order.
-            </para></listitem><listitem><para>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
               Take your .xcf image file back and save it as .gih setting
               Selection to "Random": digits will be displayed at random
               order:
-              <mediaobject><imageobject><imagedata fileref="images/using/1234rand.png" format="PNG"/></imageobject></mediaobject>
-            </para></listitem><listitem><para>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="images/using/1234rand.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
               Now select "Angular" Selection:
-              <mediaobject><imageobject><imagedata fileref="images/using/1234angl.png" format="PNG"/></imageobject></mediaobject>
-            </para></listitem></orderedlist>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="images/using/1234angl.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
+            </para>
+          </listitem>
+        </orderedlist>
       </para>
       </listitem>
     </varlistentry>
+
     <varlistentry>
       <term>A 3 dimensions image hose</term>
       <listitem>
@@ -250,14 +306,19 @@
           direction (4 directions). The second dimension (y) is for Left/Right
           alternation and the third dimension (z) for color variation. Such a
           brush is represented in a 3D array "myarray(4,2,2)":
-          <mediaobject><imageobject><imagedata fileref="images/using/3Dnum.png" format="PNG"/></imageobject></mediaobject>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/using/3Dnum.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
           There are 4 ranks in first dimension (x), 2 ranks in second
           dimension (y) and 2 ranks in third dimension (z). We see that there
           are 4x2x2 = 16 cells. We need 16 images.
         </para>
         <orderedlist>
           <listitem>
-            <para><emphasis>Creating images of dimension 1 (x)</emphasis>:
+            <para>
+              <emphasis>Creating images of dimension 1 (x)</emphasis>:
               Open a new 30x30 pixels image, RGB with Transparent Fill Type.
               Using the zoom draw a left hand with fingers upwards. Save it as
               handL0k.xcf (hand Left OÂ Black).
@@ -276,7 +337,8 @@
             </para>
           </listitem>
           <listitem>
-            <para><emphasis>Creating images of dimension 2 (y)</emphasis>:
+            <para>
+              <emphasis>Creating images of dimension 2 (y)</emphasis>:
               This dimension in our example has two ranks, one for left hand
               and the other for right hand. The left hand rank exists yet. We
               shall build right hand images by flipping it horizontally.
@@ -296,7 +358,8 @@
             </para>
           </listitem>
           <listitem>
-            <para><emphasis>Creating images of dimension 3 (z)</emphasis>:
+            <para>
+              <emphasis>Creating images of dimension 3 (z)</emphasis>:
               The third dimension has two ranks, one for black color and the
               other for blue color. The first rank, black, exists yet. We well
               see that images of dimension 3 will be a copy, in blue, of the
@@ -330,7 +393,8 @@
             </para>
           </listitem>
           <listitem>
-            <para><emphasis>Set layers in order</emphasis>: Layers must be set in
+            <para>
+              <emphasis>Set layers in order</emphasis>: Layers must be set in
               order so that GIMP can find the required image at some point
               of using the brush. Our layers are yet in order but we must
               understand more generally how to have them in order.There are
@@ -346,16 +410,25 @@
             <para>
               The other method is visual, by using the array representation.
               Correlation between two methods is represented in next image:
-              <mediaobject><imageobject><imagedata fileref="images/using/correlation.png" format="PNG"/></imageobject></mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="images/using/correlation.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
             </para>
-            <para><!--Added 06-05-16--><emphasis>How will GIMP read this array?</emphasis>: GIMP
+            <para>
+              <emphasis>How will GIMP read this array?</emphasis>: GIMP
               starts with the first dimension which is programmed for
               <quote>angular</quote>, for instance -90Â. In this -90Â
               rank, in yellow, in the second dimension, it selects a L/R
               alternation, in an <quote>incremental</quote> way. Then,
               in the third dimension, in a random way, it chooses a color.
               Finely, our layers must be in the following order:
-              <mediaobject><imageobject><imagedata fileref="images/using/hands_gih.png" format="PNG"/></imageobject></mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="images/using/hands_gih.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
             </para>
           </listitem>
           <listitem>

Modified: trunk/src/using/brushes.xml
==============================================================================
--- trunk/src/using/brushes.xml	(original)
+++ trunk/src/using/brushes.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-17 j.h: reviewed for v2.6
   2008-04-04 Mr.Dust : reviewed and added 'ko'
   2006-12-19 lexa: minor enhancements
 -->
@@ -12,6 +13,7 @@
     <primary>Brushes</primary>
     <secondary>Add New</secondary>
   </indexterm>
+
   <para>
     To add a new brush, after either creating or downloading it, you need to
     save it in a format GIMP can use. The brush file needs to be placed in the
@@ -20,6 +22,7 @@
     button, which reindexes the brush directory. GIMP uses three file formats
     for brushes:
   </para>
+
   <variablelist id="brushes-file-formats">
     <indexterm>
       <primary>Brushes</primary>
@@ -70,7 +73,7 @@
           <primary>Formats</primary>
           <secondary>GIH</secondary>
         </indexterm>
-        <para><!--changed 040927-->
+        <para>
           The <filename>.gih</filename> ("<emphasis>g</emphasis>imp
           <emphasis>i</emphasis>mage <emphasis>h</emphasis>ose") format
           is used for animated brushes.  These brushes are constructed

Modified: trunk/src/using/customize-splashscreen.xml
==============================================================================
--- trunk/src/using/customize-splashscreen.xml	(original)
+++ trunk/src/using/customize-splashscreen.xml	Sun Feb 22 07:12:23 2009
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-17 j.h: reviewed for v2.6
   2008-07-20 KoSt: added 'no'
   2007-06-21 Added Spanish translation by AntI
   2007-05-16: ude: German translation
   2007-05-10: created by j.h
 -->
 <sect1 id="using-customize-splashscreen">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Customize Splash-Screen</phrase>
   </title>
@@ -26,13 +18,14 @@
   <indexterm>
     <primary>Splash-screen</primary>
   </indexterm>
+
   <para>
     Open your file browser and check the option <quote>Show Hidden
     Files</quote>.
   </para>
   <para>
-    Under Linux, go to /home/user_name/.gimp-2.4. Under Windows, go to
-    c:\Documents and Settings\user_name\.gimp-2.4\.
+    Under Linux, go to /home/user_name/.gimp-2.6. Under Windows, go to
+    c:\Documents and Settings\user_name\.gimp-2.6\.
   </para>
   <para>
     If the <quote>splashes</quote> directory doesn't exist, create it.

Modified: trunk/src/using/fileformats.xml
==============================================================================
--- trunk/src/using/fileformats.xml	(original)
+++ trunk/src/using/fileformats.xml	Sun Feb 22 07:12:23 2009
@@ -12,15 +12,6 @@
   2006-02-25 fixed invalid image reference
 -->
 <sect1 id="gimp-using-fileformats">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-06</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Files</phrase>
   </title>
@@ -39,6 +30,7 @@
     documentation should help you understand the advantages and disadvantages
     of each type.
   </para>
+
   <sect2>
     <title>
       <phrase>Saving Images</phrase>
@@ -62,6 +54,7 @@
       in a more widely used format, such as JPEG, PNG, TIFF, etc.
     </para>
   </sect2>
+
   <sect2 id="gimp-using-fileformats-export-dialog">
     <title>
       <phrase>Saving Files</phrase>
@@ -111,6 +104,7 @@
         does not represent all of the information from the image.
       </para>
     </note>
+
     <sect3 id="file-gif-save">
       <title>
         <phrase>Saving as GIF</phrase>
@@ -240,6 +234,7 @@
         </varlistentry>
       </variablelist>
     </sect3>
+
     <sect3 id="file-jpeg-save">
       <title>
         <phrase>Saving as JPEG</phrase>
@@ -547,6 +542,7 @@
         </varlistentry>
       </variablelist>
     </sect3>
+
     <sect3 id="file-png-save">
       <title>
         <phrase>Saving as PNG</phrase>
@@ -637,14 +633,15 @@
           <term>Save comment</term>
           <listitem>
             <para>
-              You can read this comment in the <link linkend="gimp-image-properties">Image Properties</link>.
+              You can read this comment in the
+              <link linkend="gimp-image-properties">Image Properties</link>.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Save color values from transparent pixels</term>
           <listitem>
-            <para><!-- modified 2007-05-01 -->
+            <para>
               With this option is checked, the color values are saved even if the
               pixels are completely transparent.
             </para>
@@ -696,6 +693,7 @@
         </para>
       </note>
     </sect3>
+
     <sect3 id="file-tiff-save">
       <title>
         <phrase>Saving as TIFF</phrase>
@@ -748,13 +746,14 @@
                   introduced the PackBits format with the release of
                   MacPaint on the Macintosh computer. A PackBits data
                   stream consists of packets of one byte of header followed
-                  by data. (Source: <xref linkend="bibliography-online-wkpd-packbits"/>)
+                  by data. (Source:
+                  <xref linkend="bibliography-online-wkpd-packbits"/>)
                 </para>
               </listitem>
               <listitem>
                 <para><guilabel>Deflate</guilabel>: It is a lossless data
                   compression algorithm that uses a combination of the LZ77
-                  algorithm and Huffman coding. It is also used in Zip, 
+                  algorithm and Huffman coding. It is also used in Zip,
                   Gzip and PNG file formats. Source: <ulink url="http://en.wikipedia.org/wiki/Deflate";>Wikipedia</ulink>.
                 </para>
               </listitem>
@@ -779,7 +778,7 @@
         <varlistentry>
           <term>Save color values from transparent pixels</term>
           <listitem>
-            <para><!-- added 2007-07-01 -->
+            <para>
               With this option the color values are saved even if the pixels
               are completely transparent.
             </para>

Modified: trunk/src/using/fonts-and-text.xml
==============================================================================
--- trunk/src/using/fonts-and-text.xml	(original)
+++ trunk/src/using/fonts-and-text.xml	Sun Feb 22 07:12:23 2009
@@ -47,8 +47,12 @@
       converting a text item to a selection or a path, you can fill it, stroke
       the outlines, transform it, or generally apply the whole panoply of
       GIMP tools to get interesting effects. As a demonstration of some of the
-      possibilities, try out the "logo" scripts in the Toolbox menu, at
-      <menuchoice><guimenu>Xtns</guimenu><guisubmenu>Script-Fu</guisubmenu><guisubmenu>Logos</guisubmenu></menuchoice>.
+      possibilities, try out the "logo" scripts at
+      <menuchoice>
+        <guimenu>File</guimenu>
+        <guisubmenu>Create</guisubmenu>
+        <guisubmenu>Logos</guisubmenu>
+      </menuchoice>.
       Each of these scripts allows you to enter some text, and then creates
       a new image showing a logo constructed out of that text. If you would
       like to modify one of these scripts, or construct a logo script of your

Modified: trunk/src/using/getting-unstuck.xml
==============================================================================
--- trunk/src/using/getting-unstuck.xml	(original)
+++ trunk/src/using/getting-unstuck.xml	Sun Feb 22 07:12:23 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-19 j.h: revised for v2.6
   2007-08-27 lexa: replaced list by sect3
   2007-04-24 Added Spanish translation by AntI
   2007-02-21 lexa: changed top level from chapter to sect1
@@ -14,15 +14,17 @@
   2005-11-30 replaced informalfigure by axel.wernicke
 -->
 <sect1 id="gimp-using-getting-unstuck">
-  <title>Getting Unstuck</title>
-
+  <title>
+    <phrase>Getting Unstuck</phrase>
+  </title>
   <indexterm>
     <primary>GIMP</primary>
     <secondary>Getting Unstuck</secondary>
   </indexterm>
-
   <sect2 id="gimp-using-getting-unstuck-general">
-    <title>Stuck!</title>
+    <title>
+      <phrase>Stuck!</phrase>
+    </title>
     <para>
       All right, okay: you're stuck. You're trying to use one of the tools on
       an image, and nothing is happening, and nothing you try makes any
@@ -39,41 +41,51 @@
   </sect2>
 
   <sect2 id="gimp-using-getting-unstuck-common-causes">
-    <title>Common Causes of GIMP Non-Responsiveness</title>
-
+    <title>
+      <phrase>Common Causes of GIMP Non-Responsiveness</phrase>
+    </title>
     <sect3>
-      <title>There is a floating selection</title>
+      <title>
+        <phrase>There is a floating selection</phrase>
+      </title>
       <figure>
-        <title>Layers dialog showing a floating selection</title>
+        <title>
+          <phrase>
+            Layers dialog showing a floating selection.
+          </phrase>
+        </title>
         <mediaobject>
           <imageobject>
-            <imagedata format="PNG"
-              fileref="images/using/unstuck-floating-sel.png"/>
+            <imagedata fileref="images/using/unstuck-floating-sel.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </figure>
       <para><emphasis>How to tell:</emphasis>
-        If there is a <link linkend="gimp-selection-float">floating
-        selection</link>, many actions are impossible until it is anchored. To
-        check, look at the Layers dialog (making sure it's set to the image
-        you're working on) and see whether the top layer is called
-        <quote>Floating Selection</quote>.
+        If there is a floating selection, many actions are impossible
+        until it is anchored. To check, look at the Layers dialog (making
+        sure it's set to the image you're working on) and see whether the
+        top layer is called <quote>Floating Selection</quote>.
       </para>
       <para><emphasis>How to solve:</emphasis>
         Either anchor the floating selection, or convert it into an
         ordinary (non-floating) layer. If you need help on how to do this,
-        see <link linkend="gimp-layer-anchor">Anchor Layer</link>.
+        see <link linkend="glossary-floatingselection">
+          Floating Selections
+        </link>.
       </para>
     </sect3>
 
     <sect3>
-      <title>The selection is hidden</title>
+      <title>
+        <phrase>The selection is hidden</phrase>
+      </title>
       <figure>
-        <title>Unstuck show selection menu</title>
+        <title>
+          <phrase>Unstuck show selection menu</phrase>
+        </title>
         <mediaobject>
           <imageobject>
-            <imagedata format="PNG"
-              fileref="images/using/unstuck-show-selection-menu.png"/>
+            <imagedata fileref="images/using/unstuck-show-selection-menu.png" format="PNG"/>
           </imageobject>
           <caption>
             <para>
@@ -103,13 +115,16 @@
     </sect3>
 
     <sect3>
-      <title>You are acting outside of the selection</title>
+      <title>
+        <phrase>You are acting outside of the selection</phrase>
+      </title>
       <figure>
-        <title>Unstuck select all</title>
+        <title>
+          <phrase>Unstuck select all</phrase>
+        </title>
         <mediaobject>
           <imageobject>
-            <imagedata format="PNG"
-              fileref="images/using/unstuck-select-all.png"/>
+            <imagedata fileref="images/using/unstuck-select-all.png" format="PNG"/>
           </imageobject>
           <caption>
             <para>
@@ -136,13 +151,16 @@
     </sect3>
 
     <sect3>
-      <title>The active drawable is not visible</title>
+      <title>
+        <phrase>The active drawable is not visible</phrase>
+      </title>
       <figure>
-        <title>Unstuck layer invisibility</title>
+        <title>
+          <phrase>Unstuck layer invisibility</phrase>
+        </title>
         <mediaobject>
           <imageobject>
-            <imagedata format="PNG"
-              fileref="images/using/unstuck-layers-dialog-invislayer.png"/>
+            <imagedata fileref="images/using/unstuck-layers-dialog-invislayer.png" format="PNG"/>
           </imageobject>
           <caption>
             <para>
@@ -171,13 +189,16 @@
     </sect3>
 
     <sect3>
-      <title>The active drawable is transparent</title>
+      <title>
+        <phrase>The active drawable is transparent</phrase>
+      </title>
       <figure>
-        <title>Unstuck layer transparency</title>
+        <title>
+          <phrase>Unstuck layer transparency</phrase>
+        </title>
         <mediaobject>
           <imageobject>
-            <imagedata format="PNG"
-              fileref="images/using/unstuck-layers-dialog-transparentlayer.png"/>
+            <imagedata fileref="images/using/unstuck-layers-dialog-transparentlayer.png" format="PNG"/>
           </imageobject>
           <caption>
             <para>
@@ -186,21 +207,25 @@
           </caption>
         </mediaobject>
       </figure>
-      <para><emphasis>How to fix:</emphasis> Move the
-        slider.
+      <para>
+        <emphasis>How to fix:</emphasis> Move the slider.
       </para>
     </sect3>
 
     <sect3>
-      <title>You are trying to act outside the layer</title>
-      <para><emphasis>How to tell:</emphasis>
+      <title>
+        <phrase>You are trying to act outside the layer</phrase>
+      </title>
+      <para>
+        <emphasis>How to tell:</emphasis>
         In GIMP, layers don't need to have the same dimensions as the
         image: they can be larger or smaller. If you try to paint outside
         the borders of a layer, nothing happens. To see if this is
         happening, look for a black-and-yellow dashed rectangle that does
         not enclose the area you're trying to draw at.
       </para>
-      <para><emphasis>How to fix:</emphasis>
+      <para>
+        <emphasis>How to fix:</emphasis>
         You need to enlarge the layer. There are two commands at the bottom of
         the Layer menu that will let you do this: Layer to Image Size, which
         sets the layer bounds to match the image borders; and Layer Boundary
@@ -210,23 +235,26 @@
     </sect3>
 
     <sect3>
-      <title>The image is in indexed color mode</title>
+      <title>
+        <phrase>The image is in indexed color mode.</phrase>
+      </title>
       <para>
-        <emphasis>How to tell:</emphasis>
-        <acronym>GIMP</acronym> can handle three different color modes:
-        <link linkend="glossary-colormodel">RGB(A), Indexed and
-        Grayscale</link>. The indexed colormode uses a colormap, where all
-        used colors on the image are indexed. The
+        <emphasis>How to tell:</emphasis><acronym>GIMP</acronym> can handle
+        three different color modes:
+        <link linkend="glossary-colormodel">RGB(A), Indexed and Grayscale</link>.
+        The indexed colormode uses a colormap,
+        where all used colors on the image are indexed. The
         <link linkend="gimp-tool-color-picker">color picker</link> in
-        <acronym>GIMP</acronym> however, let you choose RGB colors. That
-        means, if you try to paint with a different color than it is indexed
-        in the colormap, you end up in very undetermined results (e.g. it
-        paints with the wrong color or you can't paint).
+        <acronym>GIMP</acronym> however, let you choose RGB colors.
+        That means, if you try to paint with a different color than
+        it is indexed in the colormap, you end up in very
+        undetermined results (e.g. it paints with the wrong color or
+        you can't paint).
       </para>
       <para>
-        <emphasis>How to fix:</emphasis>
-        Always use the RGB Color mode to paint on images. You can verify and
-        select another color mode from the
+        <emphasis>How to fix:</emphasis> Always use the
+        RGB Color mode to paint on images. You can verify and select
+        another color mode from the
         <link linkend="gimp-image-mode">Mode</link> menuitem in the
         <guimenu>Image</guimenu> menu.
       </para>

Modified: trunk/src/using/grid-and-guides.xml
==============================================================================
--- trunk/src/using/grid-and-guides.xml	(original)
+++ trunk/src/using/grid-and-guides.xml	Sun Feb 22 07:12:23 2009
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Version history
+  2009-02-19 j.h: revised for v2.6
   2007-04-12 Added Spanish translation by AntI
   2006-09-19 added norwegian translation by KoSt
   2006-09-03 Added Korean Translation by Mr.Dust
   2006-03-13 Added link to Concepts-grid and guides by j.h
 -->
 <sect1 id="gimp-using-grid">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-03-10</date>
-        <authorinitials>lexa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Rendering a Grid</phrase>
   </title>

Modified: trunk/src/using/layers.xml
==============================================================================
--- trunk/src/using/layers.xml	(original)
+++ trunk/src/using/layers.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+     2009-02-17 j.h: revised for v2.6
 -->
 <sect1 id="gimp-using-layers">
   <title>
@@ -10,6 +11,7 @@
     <primary>Layer</primary>
     <secondary>Creating new layers</secondary>
   </indexterm>
+
   <para>
     There are several ways to create new layers in an image. Here are the most
     important ones:
@@ -18,7 +20,10 @@
     <listitem>
       <para>
         Selecting
-        <menuchoice><guimenu>Layer</guimenu><guimenuitem>New Layer</guimenuitem></menuchoice>
+        <menuchoice>
+          <guimenu>Layer</guimenu>
+          <guimenuitem>New Layer</guimenuitem>
+        </menuchoice>
         in the image menu.  This brings up a dialog that allows you
         to set the basic properties of the new layer; see the <link linkend="gimp-layer-new">New Layer dialog</link>
         section for help with it.
@@ -27,7 +32,10 @@
     <listitem>
       <para>
         Selecting
-        <menuchoice><guimenu>Layer</guimenu><guimenuitem>Duplicate Layer</guimenuitem></menuchoice>
+        <menuchoice>
+          <guimenu>Layer</guimenu>
+          <guimenuitem>Duplicate Layer</guimenuitem>
+        </menuchoice>
         in the image menu. This creates a new layer, that is a perfect
         copy of the currently active layer, just above the active layer.
       </para>
@@ -36,7 +44,11 @@
       <para>
         When you <quote>cut</quote> or <quote>copy</quote> something, and
         then paste it using Ctrl-V or
-        <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice>, the result is a <quote>floating selection</quote>,
+        <menuchoice>
+          <guimenu>Edit</guimenu>
+          <guimenuitem>Paste</guimenuitem>
+        </menuchoice>,
+          the result is a <quote>floating selection</quote>,
           which is a sort of temporary layer.
           Before you can do anything else, you either have to anchor
           the floating selection to an existing layer, or convert it

Modified: trunk/src/using/paths.xml
==============================================================================
--- trunk/src/using/paths.xml	(original)
+++ trunk/src/using/paths.xml	Sun Feb 22 07:12:23 2009
@@ -8,20 +8,7 @@
   2007-01-11 fr modified by Pierre ; 1rst part re-written
   2006-09-10 added norwegian translation by KoSt
 -->
-<!-- FIXME: Caution !  By unknown way a part of this sheet was swept out;
-            it is re-built for the french version : the other translations
-            must be re-written
--->
 <sect1 id="gimp-using-paths">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <anchor id="gimp-concepts-paths" xreflabel="Paths"/>
     <phrase>Paths</phrase>
@@ -34,6 +21,7 @@
     <primary>Image</primary>
     <secondary>Paths</secondary>
   </indexterm>
+
   <para>
     Paths are curves (known as BÃzier-curves). In <acronym>GIMP</acronym> it's
     very easy to learn and to use them. To understand their concepts and
@@ -81,6 +69,7 @@
       </caption>
     </mediaobject>
   </figure>
+
   <sect2 id="gimp-using-paths-creating">
     <title>
       <phrase>Path Creating</phrase>
@@ -94,14 +83,23 @@
     <itemizedlist>
       <listitem>
         <para>
-          In menu click
-          <menuchoice><guimenu>Tools</guimenu><guimenuitem>Path</guimenuitem></menuchoice> in image window
+          In the image menu, click
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guimenuitem>Path</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           or on the relevant icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-path-22.png"/></imageobject></inlinemediaobject></guiicon> in toolbox
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata fileref="images/toolbox/stock-tool-path-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon> in toolbox,
         </para>
       </listitem>
       <listitem>
@@ -217,6 +215,7 @@
       consumes minimal resources in comparison to a typical layer or channel.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Paths and Selections</phrase>
@@ -239,6 +238,7 @@
       be obtained by executing "Sharpen" from the Select menu.
     </para>
   </sect2>
+
   <sect2 id="gimp-using-paths-transforming">
     <title>
       <phrase>Transforming Paths</phrase>
@@ -267,6 +267,7 @@
       follow.
     </para>
   </sect2>
+
   <sect2 id="gimp-using-paths-stroking">
     <title>
       <phrase>Stroking a Path</phrase>
@@ -318,6 +319,7 @@
       unlimited.
     </para>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Paths and Text</phrase>
@@ -374,6 +376,7 @@
       </listitem>
     </itemizedlist>
   </sect2>
+
   <sect2>
     <title>
       <phrase>Paths and <acronym>SVG</acronym> files</phrase>
@@ -409,8 +412,8 @@
       The <acronym>SVG</acronym>
       format handles many other graphical elements than just paths: among
       other things, it handles figures such as squares, rectangles, circles,
-      ellipses, regular polygons, etc. GIMP 2.0 cannot do anything with these
-      entities, but GIMP 2.2 can load them as paths.
+      ellipses, regular polygons, etc. GIMP cannot do anything with these
+      entities, but it can load them as paths.
     </para>
     <note>
       <para>

Modified: trunk/src/using/photography.xml
==============================================================================
--- trunk/src/using/photography.xml	(original)
+++ trunk/src/using/photography.xml	Sun Feb 22 07:12:23 2009
@@ -7,21 +7,13 @@
   2006-12-10 lexa: added de translation provided by ude
 -->
 <sect1 id="gimp-using-photography">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-09</date>
-        <authorinitials>KoSt</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Working with Digital Camera Photos</phrase>
   </title>
   <indexterm>
     <primary>Photography</primary>
   </indexterm>
+
   <sect2 id="gimp-using-photography-introduction">
     <title>
       <phrase>Introduction</phrase>
@@ -51,10 +43,12 @@
       undesirable elements of the image.
     </para>
   </sect2>
+
   <sect2 id="gimp-using-photography-improving">
     <title>
       <phrase>Improving Composition</phrase>
     </title>
+
     <sect3 id="gimp-using-photography-rotating">
       <title>
         <phrase>Rotating an Image</phrase>
@@ -99,7 +93,7 @@
       </para>
       <note>
         <para>
-          Note: New in GIMP 2.2 is the option to preview the results of
+          Since GIMP 2.2, there is an option to preview the results of
           transformations, instead of just seeing a grid. This makes it easier
           to get things right on the first try.
         </para>
@@ -114,6 +108,7 @@
         first place.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-cropping">
       <title>
         <phrase>Cropping</phrase>
@@ -142,10 +137,12 @@
       </para>
     </sect3>
   </sect2>
+
   <sect2 id="gimp-using-photography-colors">
     <title>
       <phrase>Improving Colors</phrase>
     </title>
+
     <sect3 id="gimp-using-photography-automatic">
       <title>
         <phrase>Automated Tools</phrase>
@@ -159,14 +156,17 @@
         give you many parameters of control. We will start with the simplest
         first.
       </para>
-      <para><!-- changed 2008-02-03 -->
+      <para>
         GIMP gives you several automated color correction
         tools. Unfortunately they don't usually give you quite the results
         you are looking for, but they only take a moment to try out, and if
         nothing else they often give you an idea of some of the
         possibilities inherent in the image.  Except for "Auto Levels", you
         can find these tools by following the menu path
-        <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu></menuchoice>
+        <menuchoice>
+          <guimenu>Colors</guimenu>
+          <guisubmenu>Auto</guisubmenu>
+        </menuchoice>
         in the image menu.
       </para>
       <para>Here they are, with a few words about each:</para>
@@ -255,11 +255,17 @@
             <guimenuitem>Auto Levels</guimenuitem>
           </term>
           <listitem>
-            <para><!--updated 2008-01-29-->
+            <para>
               This is done by activating the Levels tool
-              (<menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Levels</guimenuitem></menuchoice>
+              (<menuchoice><guimenu>Tools</guimenu>
+                 <guisubmenu>Color Tools</guisubmenu>
+                 <guimenuitem>Levels</guimenuitem>
+               </menuchoice>
               or
-              <menuchoice><guimenu>Colors</guimenu><guimenuitem>Levels</guimenuitem></menuchoice>
+              <menuchoice>
+                <guimenu>Colors</guimenu>
+                <guimenuitem>Levels</guimenuitem>
+              </menuchoice>
               in the image menu),
               and then pressing the <guibutton>Auto</guibutton> button near
               the center of the dialog. You will see a preview of the result;
@@ -298,6 +304,7 @@
         click on the image (anywhere) to activate it and bring up its dialog.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-exposure">
       <title>
         <phrase>Exposure Problems</phrase>
@@ -412,6 +419,7 @@
         options you have, the harder it is to make a decision.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-hue-saturation">
       <title>
         <phrase>Adjusting Hue and Saturation</phrase>
@@ -471,6 +479,7 @@
       </para>
     </sect3>
   </sect2>
+
   <sect2 id="gimp-using-photography-sharpness">
     <title>
       <phrase>Adjusting Sharpness</phrase>
@@ -532,6 +541,7 @@
         the image, but also amplifies noise.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-graininess">
       <title>
         <phrase>Reducing Graininess</phrase>
@@ -554,6 +564,7 @@
         heroic measures (i.e., retouching with paint tools).
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-softening">
       <title>
         <phrase>Softening</phrase>
@@ -571,6 +582,7 @@
       </para>
     </sect3>
   </sect2>
+
   <sect2 id="gimp-using-photography-retouching">
     <title>
       <phrase>Removing Unwanted Objects from an Image</phrase>
@@ -609,6 +621,7 @@
         use Despeckle on each individually.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-garbage">
       <title>
         <phrase>Garbage Removal</phrase>
@@ -655,6 +668,7 @@
         As with many things, your mileage may vary.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-red-eye">
       <title>
         <phrase>Removing Red-eye</phrase>
@@ -673,7 +687,7 @@
         occurs with animals, but the eyes may show up as other colors, such as
         green.
       </para>
-      <para><!-- Updated  v2.4 (kost.) -->
+      <para>
         From version 2.4, GIMP incorporated a special <link linkend="plug-in-red-eye-removal">remove red eye</link> filter.
         Make a selection with one of the selection tools of the red part of
         the eye and  then choose the <quote>Remove Red Eye</quote> filter.
@@ -682,6 +696,7 @@
       </para>
     </sect3>
   </sect2>
+
   <sect2 id="gimp-using-photography-saving">
     <title>
       <phrase>Saving Your Results</phrase>
@@ -754,6 +769,7 @@
         section for more information.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-printing">
       <title>
         <phrase>Printing Your Photos</phrase>
@@ -762,9 +778,12 @@
         <primary>Printing</primary>
         <secondary>Printing your photos</secondary>
       </indexterm>
-      <para><!-- I propose from the french version  === Pierre 2007-02-10  -->
+      <para>
         As in most softwares, in GIMP, printing needs to go to main menu
-        <menuchoice><guimenu>File</guimenu><guisubmenu>Print</guisubmenu></menuchoice>.
+        <menuchoice>
+          <guimenu>File</guimenu>
+          <guisubmenu>Print</guisubmenu>
+        </menuchoice>.
         However it is very useful to keep in mind some elementary concepts
         to prevent some unpleasant surprises when looking at result, or to
         cure them if that occurs.  You always must remember:
@@ -836,6 +855,7 @@
         especially if you use a special photo paper.
       </para>
     </sect3>
+
     <sect3 id="gimp-using-photography-exif">
       <title>
         <phrase>EXIF Data</phrase>

Modified: trunk/src/using/selections.xml
==============================================================================
--- trunk/src/using/selections.xml	(original)
+++ trunk/src/using/selections.xml	Sun Feb 22 07:12:23 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
+  2009-02-21 j.h: revised for v2.6
   2008-04-04 Mr.Dust : reviewed and added 'ko'
   2008-01-09 ude: updated de (Moving Selection section)
   2007-12-31 j.h: rewrote Moving Selection section
@@ -13,15 +13,17 @@
   2006-06-13 Added para about using arrow keys by j.h
 -->
 <sect1 id="gimp-using-selections">
-  <title>Creating and Using Selections</title>
-
+  <title>
+    <phrase>Creating and Using Selections</phrase>
+  </title>
   <indexterm>
     <primary>Selections</primary>
     <secondary>Using</secondary>
   </indexterm>
-
   <sect2 id="gimp-using-selections-moving">
-    <title>Moving a Selection</title>
+    <title>
+      <phrase>Moving a Selection</phrase>
+    </title>
     <indexterm>
       <primary>Selection</primary>
       <secondary>Move selection</secondary>
@@ -34,14 +36,20 @@
     </para>
 
     <sect3>
-      <title>Moving rectangular and elliptical selections</title>
+      <title>
+        <phrase>
+          Moving rectangular and elliptical selections
+        </phrase>
+      </title>
       <para>
         If you click-and drag the selection in default mode, you move the
         selection outline and you don't move the contents of rectangular or
         elliptic selections.
       </para>
       <figure>
-        <title>Moving selection outline</title>
+        <title>
+          <phrase>Moving selection outline</phrase>
+        </title>
         <mediaobject>
           <imageobject>
             <imagedata fileref="images/using/select-move-1.png" format="PNG"/>
@@ -70,19 +78,15 @@
           </para>
           <figure>
             <title>
-              Click-and-drag with
-              <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo>
+              <phrase>
+                Moving a selection and its content, emptying the original
+                place
+              </phrase>
             </title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/using/select-move-2.png" format="PNG"/>
               </imageobject>
-              <caption>
-                <para>
-                  Moving a selection and its content, emptying the original
-                  place
-                </para>
-              </caption>
             </mediaobject>
           </figure>
         </listitem>
@@ -95,37 +99,33 @@
           </para>
           <figure>
             <title>
-              Click-and-drag with
-              <keycombo><keycap>Shift</keycap><keycap>Alt</keycap></keycombo>
+              <phrase>
+                Moving a selection and its content without emptying the
+                original place
+              </phrase>
             </title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/using/select-move-3.png" format="PNG"/>
               </imageobject>
-              <caption>
-                <para>
-                  Moving a selection and its content without emptying the
-                  original place
-                </para>
-              </caption>
             </mediaobject>
           </figure>
         </listitem>
       </itemizedlist>
       <note>
         <para>
-          On some systems, it's preferable to push first the
-          <keycap>Alt</keycap>, otherwise if you push first the
-          <keycap>Shift</keycap> or <keycap>Ctrl</keycap>,
-          <acronym>GIMP</acronym> fall over add/subtract to the current
-          selection mode and after the <keycap>Alt</keycap> key is
-          ineffective!
+          On some systems, it's preferable to push first the <keycap>Alt</keycap>,
+          otherwise if you push first the <keycap>Alt</keycap> or
+          <keycap>Ctrl</keycap>, GIMP fall over add/subtract to the current
+          selection mode and after the <keycap>Alt</keycap> key is ineffective!
         </para>
       </note>
     </sect3>
 
     <sect3>
-      <title>Moving the other selections</title>
+      <title>
+        <phrase>Moving the other selections</phrase>
+      </title>
       <para>
         The other selections (Lasso, Magic wand, By Color) have no handle.
         Click-and dragging them doesn't move them. To move their contents, as
@@ -139,9 +139,10 @@
         the outline.
       </para>
     </sect3>
-
     <sect3>
-      <title>Other method</title>
+      <title>
+        <phrase>Other method</phrase>
+      </title>
       <note>
         <para>
           You can also use a more roundabout method to move a selection. Make
@@ -154,9 +155,13 @@
   </sect2>
 
   <sect2 id="gimp-using-selections-free-select">
-    <title>Creating a Free Selection</title>
+    <title>
+      <phrase>Enlarging a Free Selection</phrase>
+    </title>
     <figure>
-      <title>Using the Free Selection Tool</title>
+      <title>
+        <phrase>Using the Free Selection Tool</phrase>
+      </title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/toolbox-lasso-ex1.png" format="PNG"/>
@@ -183,10 +188,10 @@
       <keycap>Shift</keycap> or <keycap>Ctrl</keycap> keys while using
       the lasso. Here is how to do it: While pressing
       <keycap>Shift</keycap>, draw the new border with the lasso and
-      close the selection, including a part of the first selection. As
-      soon as you release the mouse button, both selections are added
-      together. You could subtract the extra part of the first selection
-      in a similar way by pressing <keycap>Ctrl</keycap>.
+      close the selection, including a part of the first selection. Press
+      <keycap>Enter</keycap>: both selections are added together. You could
+      subtract the extra part of the first selection in a similar way by
+      pressing <keycap>Ctrl</keycap>.
     </para>
     <note>
       <para>

Modified: trunk/src/using/shortcuts.xml
==============================================================================
--- trunk/src/using/shortcuts.xml	(original)
+++ trunk/src/using/shortcuts.xml	Sun Feb 22 07:12:23 2009
@@ -9,15 +9,6 @@
   2005-11-01 Created by julien hardelin
 -->
 <sect1 id="gimp-concepts-shortcuts">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-06</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Creating Shortcuts to Menu Functions</phrase>
   </title>
@@ -66,7 +57,12 @@
     <step>
       <para>
         It is best to use the
-        <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Key</keycap></keycombo> sequence for your custom shortcuts.
+        <keycombo>
+          <keycap>Ctrl</keycap>
+          <keycap>Alt</keycap>
+          <keycap>Key</keycap>
+        </keycombo>
+        sequence for your custom shortcuts.
       </para>
     </step>
   </procedure>
@@ -112,9 +108,10 @@
   <note>
     <para>
       Custom Keyboard shortcuts are stored in one of Gimp's hidden
-      directory (<filename class="directory">/home/[username]/.gimp-2.4/menurc</filename>)
+      directory (<filename
+class="directory">/home/[username]/.gimp-2.6/menurc</filename>)
       under Linux, and <filename class="directory">
-      C:\DocumentsÂandÂSettings\[Username]\.gimp-2.4\menurc</filename>
+      C:\DocumentsÂandÂSettings\[Username]\.gimp-2.6\menurc</filename>
       under Windows XP.  It is a simple text file that you can transport from
       one computer to another.
     </para>

Modified: trunk/src/using/simpleobjects.xml
==============================================================================
--- trunk/src/using/simpleobjects.xml	(original)
+++ trunk/src/using/simpleobjects.xml	Sun Feb 22 07:12:23 2009
@@ -9,15 +9,6 @@
   2006-07-22 dust: added ko translation
 -->
 <sect1 id="gimp-using-simpleobjects">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-02</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Drawing Simple Objects</phrase>
   </title>
@@ -44,13 +35,15 @@
     huge set of <link linkend="gimp-toolbox-introduction">Tools</link>
     and Shortcuts which most new users get lost in.
   </para>
+
   <sect2 id="gimp-using-line">
     <title>
       <phrase>Drawing a Straight Line</phrase>
     </title>
     <para>
       Let's begin by painting a straight line. The easiest way to create a
-      straight line is by using your favorite <link linkend="gimp-tool-painting">painting tool</link>, the mouse and
+      straight line is by using your favorite
+      <link linkend="gimp-tool-painting">painting tool</link>, the mouse and
       the keyboard.
     </para>
     <procedure>
@@ -72,7 +65,8 @@
         </figure>
         <para>
           Create a <link linkend="gimp-file-new">new image</link>.
-          Select your favorite <link linkend="gimp-tool-painting">painting tool</link> or use the
+          Select your favorite
+          <link linkend="gimp-tool-painting">painting tool</link> or use the
           <link linkend="gimp-tool-pencil">pencil</link>, if in doubt.
           Select a <link linkend="gimp-toolbox-color-area">foreground
           color</link>, but be sure that the foreground and background
@@ -95,7 +89,8 @@
           </mediaobject>
         </figure>
         <para>
-          Create a starting point by clicking on the <link linkend="imagewindow-display">image display</link> area
+          Create a starting point by clicking on the
+          <link linkend="imagewindow-display">image display</link> area
           with the left mouse button. Your canvas should look
           similar to <xref linkend="gimp-using-straightline1"/>.
         </para>
@@ -149,6 +144,7 @@
       </step>
     </procedure>
   </sect2>
+
   <sect2 id="gimp-using-rectangular">
     <title>
       <phrase>Creating a Basic Shape</phrase>
@@ -158,7 +154,8 @@
         <para>
           Drawing shapes is not the main purpose for using
           <acronym>GIMP</acronym>. However, you may create shapes by
-          either painting them using the technique described in <xref linkend="gimp-using-straightline1"/> or by using the
+          either painting them using the technique described in
+          <xref linkend="gimp-using-straightline1"/> or by using the
           selection tools. Of course, there are various other ways to
           paint a shape, but we'll stick to the easiest ones here.  So,
           create a <link linkend="gimp-file-new">new image</link> and
@@ -183,14 +180,17 @@
         </figure>
         <para>
           Basic shapes like rectangles or ellipses, can be
-          created using the <link linkend="gimp-tools-selection">selection tools</link>. This
+          created using the
+          <link linkend="gimp-tools-selection">selection tools</link>. This
           tutorial uses a rectangular selection as an example.  So,
           choose the <link linkend="gimp-tool-rect-select">rectangular
           selection tool</link> and create a new selection: press and
           hold the left mouse button while you move the mouse to another
-          position in the image (illustrated in figure <xref linkend="gimp-using-basicshape1"/>). The selection is created
+          position in the image (illustrated in figure
+          <xref linkend="gimp-using-basicshape1"/>). The selection is created
           when you release the mouse button.  For more
-          information about key modifiers see <link linkend="gimp-tools-selection">selection tools</link>.
+          information about key modifiers see
+          <link linkend="gimp-tools-selection">selection tools</link>.
         </para>
       </step>
       <step>
@@ -210,12 +210,15 @@
         <para>
           After creating the selection, you can either create a filled
           or an outlined shape with the foreground color of your choice.
-          If you go for the first option, choose a <link linkend="gimp-toolbox-color-area">foreground color</link> and
-          fill the selection with the <link linkend="gimp-tool-bucket-fill">bucket fill tool</link>.
+          If you go for the first option, choose a
+          <link linkend="gimp-toolbox-color-area">foreground color</link>
+          and fill the selection with the
+          <link linkend="gimp-tool-bucket-fill">bucket fill tool</link>.
           If you choose the latter option, create an outline by using
           the<link linkend="gimp-selection-stroke">Stroke
           selection</link> menu item from the <guimenu>Edit</guimenu>
-          menu. If you're satisfied with the result, <link linkend="gimp-selection-none">remove the selection</link>.
+          menu. If you're satisfied with the result,
+          <link linkend="gimp-selection-none">remove the selection</link>.
         </para>
       </step>
     </procedure>

Modified: trunk/src/using/variable-size-brush.xml
==============================================================================
--- trunk/src/using/variable-size-brush.xml	(original)
+++ trunk/src/using/variable-size-brush.xml	Sun Feb 22 07:12:23 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Version history
+  2009-02-21 j.h: revised for v2.6
   2008-04-04 Mr.Dust : reviewed and added 'ko'
   2008-01-30 j.h: internationalized create-brush3.png, select-to-brush.png
   2007-12-19 jpl: updated to v2.4
@@ -10,15 +11,6 @@
   2006-04-15 Created by j.h
 -->
 <sect1 id="gimp-using-variable-size-brush">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-19</date>
-        <authorinitials>jpl</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Varying brush size</phrase>
   </title>
@@ -29,6 +21,7 @@
   <para>
     From <acronym>GIMP</acronym>-2.4, all brushes have a variable size.
   </para>
+
   <sect2 id="gimp-using-variable-size-brush-varying">
     <title>
       <phrase>How to vary the height of a brush</phrase>
@@ -39,24 +32,19 @@
     <orderedlist>
       <listitem>
         <para>
-          Using the slider <guilabel>Stretch or Shrink</guilabel> of the tool
+          Using the <guilabel>Scale</guilabel> slider of the tool
           that uses the brush. Pencil, Paintbrush, Eraser, Airbrush,
           Clone, Heal, Perspective Clone, Blur/Sharpen and Dodge/Burn tools
           have a slider to vary brush size.
         </para>
         <figure>
           <title>
-            <phrase>The Stretch or Shrink slider</phrase>
+            <phrase>The Scale slider</phrase>
           </title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/using/stretch-shrink-cursor.png" format="PNG"/>
             </imageobject>
-            <caption>
-              <para>
-                The two possibilities to vary brush size.
-              </para>
-            </caption>
           </mediaobject>
         </figure>
       </listitem>
@@ -66,13 +54,19 @@
           <step>
             <para>
               In the main window of GIMP, click on
-              <menuchoice><guimenu>Files</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
+              <menuchoice>
+                <guimenu>Edit</guimenu>
+                <guimenuitem>Preferences</guimenuitem>
+              </menuchoice>.
             </para>
           </step>
           <step>
             <para>
               In the left column of the new window, select
-              <menuchoice><guimenu>Input Devices</guimenu><guimenuitem>Input Controllers</guimenuitem></menuchoice>.
+              <menuchoice>
+                <guimenu>Input Devices</guimenu>
+                <guimenuitem>Input Controllers</guimenuitem>
+              </menuchoice>.
             </para>
           </step>
           <step>
@@ -194,6 +188,7 @@
       </listitem>
     </orderedlist>
   </sect2>
+
   <sect2 id="gimp-using-variable-size-brush-creating">
     <title>
       <phrase>Creating a brush quickly</phrase>
@@ -243,7 +238,7 @@
         </para>
         <para>
           Save it with a <guilabel>.gbr</guilabel> extension in the directory
-          <guilabel>/home/name_of_user/.gimp-2.4/brushes/</guilabel>.
+          <guilabel>/home/name_of_user/.gimp-2.6/brushes/</guilabel>.
         </para>
         <para>
           In the brushes window, click on the button

Modified: trunk/src/using/web.xml
==============================================================================
--- trunk/src/using/web.xml	(original)
+++ trunk/src/using/web.xml	Sun Feb 22 07:12:23 2009
@@ -10,15 +10,6 @@
   050829 de added by axel.wernicke
 -->
 <sect1 id="gimp-using-web">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
   <title>
     <phrase>Preparing your Images for the Web</phrase>
   </title>
@@ -34,6 +25,7 @@
     you how to achieve a smaller file size with minimal degradation of
     image quality.
   </para>
+
   <sect2 id="gimp-using-web-size-vs-quality">
     <title>
       <phrase>Images with an Optimal Size/Quality Ratio</phrase>
@@ -113,6 +105,7 @@
       </para>
     </note>
   </sect2>
+
   <sect2 id="gimp-using-web-reducing-file-size">
     <title>
       <phrase>Reducing the File Size Even More</phrase>
@@ -144,7 +137,7 @@
     </figure>
     <procedure>
       <step>
-        <para><!-- 2007-03-25 enhanced by lexA -->
+        <para>
           Use the command described in <xref linkend="gimp-image-mode"/>
           to convert your RGB image to indexed mode.
         </para>
@@ -159,6 +152,7 @@
       </step>
     </procedure>
   </sect2>
+
   <sect2 id="gimp-using-web-transparency">
     <title>
       <phrase>Saving Images with Transparency</phrase>
@@ -173,7 +167,8 @@
       and alpha transparency. Simple binary transparency is supported
       in <link linkend="file-gif-save">GIF</link> format. Here, one color
       from the indexed color palette is marked as the transparent color.
-      Alpha transparency is supported in <link linkend="file-png-save-defaults">PNG</link> format.  Here, the
+      Alpha transparency is supported in
+      <link linkend="file-png-save-defaults">PNG</link> format.  Here, the
       transparency information is stored in a separate channel, the
       <link linkend="glossary-alpha">Alpha channel</link>.
     </para>
@@ -213,7 +208,8 @@
           channel. To check if the image has an alpha channel, go to the
           <link linkend="gimp-channel-dialog">channel dialog</link> and
           verify that an entry for <quote>Alpha</quote> exists, besides
-          Red, Green and Blue. If this is not the case, <link linkend="gimp-layer-alpha-add">add a new alpha channel</link>
+          Red, Green and Blue. If this is not the case,
+          <link linkend="gimp-layer-alpha-add">add a new alpha channel</link>
           from the layers menu.
         </para>
       </step>
@@ -244,7 +240,9 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/using/preparing_for_web-alphatransparency.png" format="PNG"/>
+          <imagedata
+            format="PNG"
+            fileref="images/using/preparing_for_web-alphatransparency.png"/>
         </imageobject>
       </mediaobject>
     </figure>



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