gimp-help-2 r2787 - in trunk: . po/de po/de/filters src src/filters src/filters/blur src/filters/enhance src/menus src/toolbox



Author: ulfehlert
Date: Fri Mar 20 19:48:25 2009
New Revision: 2787
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2787&view=rev

Log:
2009-03-20  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* src/menus/menus-filters.xml: added a TODO
	* src/filters/filters_introduction.xml
	* src/filters/filters_blur.xml
	* src/filters/filters_enhance.xml: renamed to ...
	* src/filters/introduction.xml
	* src/filters/blur.xml
	* src/filters/enhance.xml: new names
	* src/gimp.xml: changed accordingly

	* src/filters/enhance/NL_filter.xml: fixed operating mode description

	* src/filters/blur/introduction.xml
	* src/filters/blur/tileable.xml
	* src/filters/enhance/unsharp_mask.xml
	* src/toolbox/intro.xml
	* src/toolbox/tool-threshold.xml
	* src/toolbox/tool-transform.xml: minor changes

	* src/toolbox/tool-convolve.xml: fixed broken link

	* po/de/filters.po
	* po/de/filters/blur.po
	* po/de/filters/enhance.po: updated
	* po/de/gimp.po: some trivial updates


Added:
   trunk/src/filters/blur.xml   (contents, props changed)
      - copied, changed from r2784, /trunk/src/filters/filters_blur.xml
   trunk/src/filters/enhance.xml   (props changed)
      - copied unchanged from r2784, /trunk/src/filters/filters_enhance.xml
   trunk/src/filters/introduction.xml   (contents, props changed)
      - copied, changed from r2784, /trunk/src/filters/filters_introduction.xml
Removed:
   trunk/src/filters/filters_blur.xml
   trunk/src/filters/filters_enhance.xml
   trunk/src/filters/filters_introduction.xml
Modified:
   trunk/ChangeLog
   trunk/po/de/filters.po
   trunk/po/de/filters/blur.po
   trunk/po/de/filters/enhance.po
   trunk/po/de/gimp.po
   trunk/src/filters/blur/introduction.xml
   trunk/src/filters/blur/tileable.xml
   trunk/src/filters/enhance/NL_filter.xml
   trunk/src/filters/enhance/unsharp_mask.xml
   trunk/src/gimp.xml
   trunk/src/menus/menus-filters.xml
   trunk/src/toolbox/intro.xml
   trunk/src/toolbox/tool-convolve.xml
   trunk/src/toolbox/tool-threshold.xml
   trunk/src/toolbox/tool-transform.xml

Copied: trunk/src/filters/blur.xml (from r2784, /trunk/src/filters/filters_blur.xml)
==============================================================================
--- /trunk/src/filters/filters_blur.xml	(original)
+++ trunk/src/filters/blur.xml	Fri Mar 20 19:48:25 2009
@@ -1,12 +1,12 @@
 <?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:
-  050818 de reviewed by axel.wernicke
+  2005-08-18 de reviewed by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-blur">
-  <title>
-    <phrase>Blur Filters</phrase>
-  </title>
+  <title>Blur Filters</title>
+
   <xi:include href="blur/introduction.xml"/>
   <xi:include href="blur/blur.xml"/>
   <xi:include href="blur/gauss.xml"/>

Modified: trunk/src/filters/blur/introduction.xml
==============================================================================
--- trunk/src/filters/blur/introduction.xml	(original)
+++ trunk/src/filters/blur/introduction.xml	Fri Mar 20 19:48:25 2009
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-01 prokoudine: improved Russian content
   2007-03-27 KoSt: added 'no'
   2005-08-18 de reviewed by axel.wernicke
 -->
 <sect2 id="filters-blur-introduction">
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
-    <tertiary>Introduction</tertiary>
   </indexterm>
+
   <figure>
-    <title>
-      <phrase>Original for demo</phrase>
-    </title>
+    <title>Original for demo</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-orig.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-orig.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -34,13 +33,13 @@
     examples:  most of the filters have parameter settings that allow
     you to vary the magnitude or type of blurring.
   </para>
+
   <figure>
-    <title>
-      <phrase>Gaussian blur (radius 10)</phrase>
-    </title>
+    <title>Gaussian blur (radius 10)</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-gauss10.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-gauss10.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -51,13 +50,13 @@
     allows it to create a very blurry blur in a relatively short
     time.
   </para>
+
   <figure>
-    <title>
-      <phrase>Simple blur</phrase>
-    </title>
+    <title>Simple blur</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-blur.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-blur.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -70,13 +69,13 @@
     you want a strong blurring effect, this filter is too slow to be a good 
     choice: use a Gaussian blur instead.
   </para>
+
   <figure>
-    <title>
-      <phrase>Selective blur</phrase>
-    </title>
+    <title>Selective blur</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-selective.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-selective.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -90,13 +89,13 @@
     than a Gaussian blur, though, so you should not use it unless you
     really need the selectivity.
   </para>
+
   <figure>
-    <title>
-      <phrase>Pixelize</phrase>
-    </title>
+    <title>Pixelize</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-pixelize.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-pixelize.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -116,13 +115,13 @@
       when looking at it from a distance.
     </para>
   </note>
+
   <figure>
-    <title>
-      <phrase>Motion blur</phrase>
-    </title>
+    <title>Motion blur</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/filters/examples/blur-demo-mblur.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/filters/examples/blur-demo-mblur.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -131,6 +130,7 @@
     allows you to create a sense of motion: either linear, radial, or
     rotational.
   </para>
+
   <para>
     Finally, the Tileable Blur filter is really the same thing as a Gaussian
     blur, except that it wraps around the edges of an image to help you reduce

Modified: trunk/src/filters/blur/tileable.xml
==============================================================================
--- trunk/src/filters/blur/tileable.xml	(original)
+++ trunk/src/filters/blur/tileable.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-03 prokoudine: improved Russian content, added localized screenshot
   2007-03-30 KoSt: added 'no'
@@ -9,18 +10,8 @@
   051111 en;fr reviewed by julien hardelin
 -->
 <sect2 id="script-fu-tile-blur">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Tileable Blur</phrase>
-  </title>
+  <title>Tileable Blur</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Blur</secondary>
@@ -29,16 +20,11 @@
   <indexterm>
     <primary>Tileable Blur</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Tileable</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Tileable</quote> filter</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
@@ -70,9 +56,12 @@
       <procedure>
         <step>
           <para>
-            Duplicate layer(
-            <menuchoice><guimenu>Layer</guimenu><guimenuitem>Duplicate Layer</guimenuitem></menuchoice>
-            ) and select it to work on it.
+            Duplicate layer
+            (<menuchoice>
+              <guimenu>Layer</guimenu>
+              <guimenuitem>Duplicate Layer</guimenuitem>
+            </menuchoice>)
+            and select it to work on it.
           </para>
         </step>
         <step>
@@ -83,17 +72,23 @@
         </step>
         <step>
           <para>
-            Select all (
-            <keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>) and
-            reduce selection (
-            <menuchoice><guimenu>Selection</guimenu><guimenuitem>Shrink</guimenuitem></menuchoice>
-            ) to create a border with the wanted width.
+            Select all
+            (<keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>) and
+            reduce selection
+            (<menuchoice>
+              <guimenu>Selection</guimenu>
+              <guimenuitem>Shrink</guimenuitem>
+            </menuchoice>)
+            to create a border with the wanted width.
           </para>
         </step>
         <step>
           <para>
             Give a feathered border to the selection by using
-            <menuchoice><guimenu>Selection</guimenu><guimenuitem>Feather</guimenuitem></menuchoice>.
+            <menuchoice>
+              <guimenu>Selection</guimenu>
+              <guimenuitem>Feather</guimenuitem>
+            </menuchoice>.
           </para>
         </step>
         <step>
@@ -105,33 +100,36 @@
         <step>
           <para>
             Merge layers with
-            <menuchoice><guimenu>Layer</guimenu><guimenuitem>Merge down</guimenuitem></menuchoice>
+            <menuchoice>
+              <guimenu>Layer</guimenu>
+              <guimenuitem>Merge down</guimenuitem>
+            </menuchoice>.
           </para>
         </step>
       </procedure>
     </tip>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Blur</guisubmenu><guimenuitem>Tileable Blur</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Blur</guisubmenu>
+        <guimenuitem>Tileable Blur</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Tileable Blur</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Tileable Blur</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/filters-blur-tileable.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/filters-blur-tileable.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -157,10 +155,21 @@
       <varlistentry>
         <term>Blur Type</term>
         <listitem>
-          <para><guilabel>IIR</guilabel>: for photographic or scanned images.
-          </para>
-          <para><guilabel>RLE</guilabel>: for computer-generated images.
-          </para>
+          <para>Choose the algorithm to be applied:</para>
+          <variablelist>
+            <varlistentry>
+              <term>IIR</term>
+              <listitem>
+                <para>for photographic or scanned images.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>RLE</term>
+              <listitem>
+                <para>for computer-generated images.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
         </listitem>
       </varlistentry>
     </variablelist>

Modified: trunk/src/filters/enhance/NL_filter.xml
==============================================================================
--- trunk/src/filters/enhance/NL_filter.xml	(original)
+++ trunk/src/filters/enhance/NL_filter.xml	Fri Mar 20 19:48:25 2009
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-03-20 ude: fixed parameter description
   2007-08-20 AntI: added 'es'
   2007-04-14 KoSt: added 'no'
   2005-12-07 replaced <simplesect> by <sect3> by lexa
-  050930 de replaced informalfigure by axel.wernicke
-  050830 de added by axel.wernicke
+  2005-09-30 de replaced informalfigure by axel.wernicke
+  2005-08-30 de added by axel.wernicke
 -->
 <sect2 id="plug-in-nlfilt">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-26</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>NL Filter</phrase>
-  </title>
+  <title>NL Filter</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Enhance</secondary>
     <tertiary>NL filter</tertiary>
   </indexterm>
   <indexterm>
-    <primary>NL Filter</primary>
+    <primary>NL filter</primary>
   </indexterm>
+  <indexterm>
+    <primary>Nonlinear filter</primary>
+  </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Example for the NL-Filter</phrase>
-      </title>
+      <title>Example for the NL-Filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -46,7 +39,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/enhance-taj-nl-filter.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/enhance-taj-nl-filter.jpg"/>
         </imageobject>
         <caption>
           <para><quote>NL Filter</quote> applied</para>
@@ -56,7 +50,7 @@
     <para>
       NL means "Non Linear". Derived from the Unix
       <command>pnmnlfilt</command> program, it joins smoothing, despeckle
-      and sharpen enhancement functions. It works on the whole image, not
+      and sharpen enhancement functions. It works on the whole layer, not
       on the selection.
     </para>
     <para>
@@ -67,27 +61,31 @@
       size can be set with the Radius option.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Enhance</guisubmenu><guimenuitem>NL Filter</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Enhance</guisubmenu>
+        <guimenuitem>NL Filter</guimenuitem>
+      </menuchoice>.
+    </para>
+    <para>
+      The filter does not work if the active layer has an alpha channel. Then
+      the menu entry is insensitive and grayed out.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>NL Filter</quote> options
-        </phrase>
-      </title>
+      <title><quote>NL Filter</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/filters-enhance-nlfilter.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/filters-enhance-nlfilter.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -96,83 +94,94 @@
         <term>Preview</term>
         <listitem>
           <para>
-            When <guilabel>Do preview</guilabel> is checked, parameter
-            setting results are interactively displayed in preview.
+            When checked, parameter setting results are interactively
+            displayed in preview.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Parameter settings</term>
+        <term>Filter</term>
         <listitem>
           <para>
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Alpha</guilabel>: Meaning of this value
-                  depends on the selected option.
-                </para>
-              </listitem>
-              <listitem>
-                <para><guilabel>Radius</guilabel>:
-                  Controls the strength of the filter (0.33-1.00).
-                </para>
-              </listitem>
-            </itemizedlist>
+            The <link linkend="plug-in-nlfilt-mode">Operating Mode</link>
+            described below.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Alpha</term>
+        <listitem>
+          <para>
+            Controls the amount of the filter to apply. Valid range is
+            0.00-1.00. The exact meaning of this value depends on the selected
+            operating mode. Note that this parameter is related to but not
+            the same as the <parameter>alpha</parameter> parameter used in the
+            <command>pnmnlfilt</command> program.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Radius</term>
+        <listitem>
+          <para>
+            Controls the size of the effective sampling region around each
+            pixel. The range of this value is 0.33-1.00, where 0.33 means just
+            the pixel itself (and thus the filter will have no effect), and
+            1.00 means all pixels in the 3x3 grid are sampled.
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </sect3>
-  <sect3>
-    <title>
-      <phrase>Operating Modes</phrase>
-    </title>
+
+  <sect3 id="plug-in-nlfilt-mode">
+    <title>Operating Modes</title>
     <para>
-      This filter can perform several distinct functions, depending on
-      the value of the parameter <guilabel>alpha</guilabel>.
+      This filter can perform several distinct functions:
     </para>
     <variablelist>
       <varlistentry>
-        <term>
-          Alpha trimmed mean filter. (0.0 &lt;=
-          <parameter>alpha</parameter> &lt;= 0.5)
-        </term>
+        <term>Alpha trimmed mean</term>
         <listitem>
           <para>
             The value of the center pixel will be replaced by the mean of
             the 7 hexagon values, but the 7 values are sorted by size and
-            the top and bottom <parameter>alpha</parameter> portion of the 7
+            the top and bottom <parameter>Alpha</parameter> portion of the 7
             are excluded from the mean. This implies that an
-            <parameter>alpha</parameter> value of 0.0 gives the same sort of
-            output as a normal convolution (ie. averaging or smoothing
-            filter), where <parameter>radius</parameter> will determine the
+            <parameter>Alpha</parameter> value of 0.0 gives the same sort of
+            output as a normal convolution (i.e. averaging or smoothing
+            filter), where <parameter>Radius</parameter> will determine the
             "strength" of the filter. A good value to start from for subtle
-            filtering is <parameter>alpha</parameter> = 0.0,
-            <parameter>radius</parameter> = 0.55.  For a more blatant
-            effect, try <parameter>alpha</parameter> 0.0 and
-            <parameter>radius</parameter> 1.0.
+            filtering is
+            <parameter>Alpha</parameter> = 0.0,
+            <parameter>Radius</parameter> = 0.55.
+            For a more blatant effect, try
+            <parameter>Alpha</parameter> = 0.0 and
+            <parameter>Radius</parameter> = 1.0.
           </para>
           <para>
-            An <parameter>alpha</parameter> value of 0.5 will cause the
+            An <parameter>Alpha</parameter> value of 1.0 will cause the
             median value of the 7 hexagons to be used to replace the center
             pixel value. This sort of filter is good for eliminating "pop"
             or single pixel noise from an image without spreading the noise
             out or smudging features on the image. Judicious use of the
-            <parameter>radius</parameter> parameter will fine tune the
-            filtering. Intermediate values of <parameter>alpha</parameter>
-            give effects somewhere between smoothing and "pop" noise
-            reduction. For subtle filtering try starting with values of
-            <parameter>alpha</parameter> = 0.4,
-            <parameter>radius</parameter> = 0.6.  For a more blatant effect
-            try <parameter>alpha</parameter> = 0.5,
-            <parameter>radius</parameter> = 1.0 .
+            <parameter>Radius</parameter> parameter will fine tune the
+            filtering.
+          </para>
+          <para>
+            Intermediate values of <parameter>Alpha</parameter> give effects
+            somewhere between smoothing and "pop" noise reduction. For subtle
+            filtering try starting with values of
+            <parameter>Alpha</parameter> = 0.8,
+            <parameter>Radius</parameter> = 0.6.
+            For a more blatant effect try
+            <parameter>Alpha</parameter> = 1.0,
+            <parameter>Radius</parameter> = 1.0 .
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          Optimal estimation smoothing. (1.0 &lt;=
-          <parameter>alpha</parameter> &lt;= 2.0)
-        </term>
+        <term>Optimal estimation</term>
         <listitem>
           <para>
             This type of filter applies a smoothing filter adaptively over
@@ -181,72 +190,66 @@
             made inversely proportional to it. The idea is that if the
             variance is small then it is due to noise in the image, while if
             the variance is large, it is because of "wanted" image features.
-            As usual the  <parameter>radius</parameter> parameter  controls
-            the effective radius, but it probably advisable  to  leave  the
+            As usual the <parameter>Radius</parameter> parameter controls
+            the effective radius, but it probably advisable to leave  the
             radius between 0.8 and 1.0 for the variance calculation to be
-            meaningful. The <parameter>alpha</parameter> parameter sets the
+            meaningful. The <parameter>Alpha</parameter> parameter sets the
             noise threshold, over which less smoothing will be done. This
-            means that small values of <parameter>alpha</parameter> will
+            means that small values of <parameter>Alpha</parameter> will
             give the most subtle filtering effect, while large values will
             tend to smooth all parts of the image. You could start with
             values like
-            <code><parameter>alpha</parameter>  =  1.2</code>,
-            <code><parameter>radius</parameter> = 1.0</code>,
+            <parameter>Alpha</parameter>  = 0.2,
+            <parameter>Radius</parameter> = 1.0,
             and try increasing or decreasing the
-            <parameter>alpha</parameter> parameter  to  get the desired
+            <parameter>Alpha</parameter> parameter to  get the desired
             effect. This type of filter is best for filtering out dithering
             noise in both bitmap and color images.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          Edge enhancement. (-0.1 &gt;= <parameter>alpha</parameter> &gt;= -0.9)
-        </term>
+        <term>Edge enhancement</term>
         <listitem>
           <para>
-          This is the opposite type of filter to the smoothing filter. It
-          enhances edges. The <parameter>alpha</parameter> parameter
-          controls the amount of edge enhancement, from subtle (-0.1) to
-          blatant (-0.9). The <parameter>radius</parameter> parameter
-          controls the effective radius as usual, but useful values are
-          between 0.5 and 0.9. Try starting with values of
-          <code><parameter>alpha</parameter> = 0.3
-          </code>,
-          <code><parameter>radius</parameter> = 0.8
-          </code>.
+            This is the opposite type of filter to the smoothing filter. It
+            enhances edges. The <parameter>Alpha</parameter> parameter
+            controls the amount of edge enhancement, from subtle (0.1) to
+            blatant (0.9). The <parameter>Radius</parameter> parameter
+            controls the effective radius as usual, but useful values are
+            between 0.5 and 0.9. Try starting with values of
+            <parameter>Alpha</parameter> = 0.3,
+            <parameter>Radius</parameter> = 0.8.
         </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term>Combination use</term>
-        <listitem>
-          <para>
-            The various operating modes can be used one after the other to
-            get the desired result. For instance to turn a monochrome
-            dithered image into grayscale image you could try one or two
-            passes of the smoothing filter, followed by a pass of the
-            optimal estimation filter, then some subtle edge enhancement.
-            Note that using edge enhancement is only likely to be useful
-            after  one  of  the  non-linear filters (alpha trimmed mean or
-            optimal estimation filter), as edge enhancement is the direct
-            opposite of smoothing.
-          </para>
-          <para>
-            For reducing color quantization noise in images (ie. turning
-            .gif files back into 24 bit files) you could try a pass of the
-            optimal estimation filter (<parameter>alpha</parameter> 1.2,
-            <parameter>radius</parameter> 1.0), a pass of the median filter
-            (<parameter>alpha</parameter> 0.5, <parameter>radius</parameter>
-            0.55), and possibly a pass of the edge enhancement filter.
-            Several passes of the optimal estimation filter with declining
-            <parameter>alpha</parameter> values are more effective than a
-            single pass with a large <parameter>alpha</parameter> value. As
-            usual, there is a trade-off between filtering effectiveness and
-            losing detail. Experimentation is encouraged.
-          </para>
-        </listitem>
-      </varlistentry>
     </variablelist>
+
+    <simplesect>
+      <title>Combination use</title>
+      <para>
+        The various operating modes can be used one after the other to get the
+        desired result. For instance to turn a monochrome dithered image into
+        grayscale image you could try one or two passes of the smoothing
+        filter, followed by a pass of the optimal estimation filter, then some
+        subtle edge enhancement. Note that using edge enhancement is only
+        likely to be useful after one of the  non-linear filters (alpha
+        trimmed mean or optimal estimation filter), as edge enhancement is the
+        direct opposite of smoothing.
+      </para>
+      <para>
+        For reducing color quantization noise in images (i.e. turning .gif
+        files back into 24 bit files) you could try a pass of the optimal
+        estimation filter (<parameter>Alpha</parameter> = 0.2,
+        <parameter>Radius</parameter> = 1.0), a pass of the median filter
+        (<parameter>Alpha</parameter> = 1.0, <parameter>Radius</parameter> =
+        0.55), and possibly a pass of the edge enhancement filter. Several
+        passes of the optimal estimation filter with declining
+        <parameter>Alpha</parameter> values are more effective than a single
+        pass with a large <parameter>Alpha</parameter> value. As usual, there
+        is a trade-off between filtering effectiveness and losing detail.
+        Experimentation is encouraged.
+      </para>
+    </simplesect>
   </sect3>
 </sect2>

Modified: trunk/src/filters/enhance/unsharp_mask.xml
==============================================================================
--- trunk/src/filters/enhance/unsharp_mask.xml	(original)
+++ trunk/src/filters/enhance/unsharp_mask.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-08-20 AntI: added 'es'
   2007-04-15 KoSt: added 'no'
@@ -11,18 +12,8 @@
   050716 en added sect "more information"
 -->
 <sect2 id="plug-in-unsharp-mask">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-11-26</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Unsharp Mask</phrase>
-  </title>
+  <title>Unsharp Mask</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Enhance</secondary>
@@ -31,19 +22,15 @@
   <indexterm>
     <primary>Unsharp Mask</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Applying example for the Unsharp Mask filter
-        </phrase>
-      </title>
+      <title>Applying example for the Unsharp Mask filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -51,7 +38,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/enhance-taj-unsharp-mask.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/enhance-taj-unsharp-mask.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Unsharp mask</quote> applied</para>
@@ -83,44 +71,42 @@
         you regain the full control over the sharpening of your images.
       </para>
     </tip>
-    <tip>
-      <para>
-        To prevent color distortion while sharpening, Decompose your image to
-        HSV and work only on Value. Then Compose the image to HSV. Go to
-        Image/Mode and click on Decompose. Make sure the
-        <guilabel>Decompose to Layers</guilabel>
-        box is checked. Choose HSV and click OK. You will get a new grey-level
-        image with three layers, one for Hue, one for Saturation, and one for
-        Value. (Close the original image so you won't get confused). Select
-        the Value layer and apply your sharpening to it. When you are done,
-        with that same layer selected, reverse the process. Go to Image/Mode
-        and click on Compose. Again choose HSV and click OK. You will get back
-        your original image except that it will have been sharpened in the
-        Value component.
-      </para>
-    </tip>
+    <para>
+      To prevent color distortion while sharpening, Decompose your image to
+      HSV and work only on Value. Then Compose the image to HSV. Go to
+      Image/Mode and click on Decompose. Make sure the
+      <guilabel>Decompose to Layers</guilabel>
+      box is checked. Choose HSV and click OK. You will get a new grey-level
+      image with three layers, one for Hue, one for Saturation, and one for
+      Value. (Close the original image so you won't get confused). Select
+      the Value layer and apply your sharpening to it. When you are done,
+      with that same layer selected, reverse the process. Go to Image/Mode
+      and click on Compose. Again choose HSV and click OK. You will get back
+      your original image except that it will have been sharpened in the
+      Value component.
+    </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Enhance</guisubmenu><guimenuitem>Unsharp Mask</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Enhance</guisubmenu>
+        <guimenuitem>Unsharp Mask</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Unsharp Mask</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Unsharp Mask</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-enhance-unsharp-mask.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-enhance-unsharp-mask.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -168,10 +154,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>How does an unsharp mask work?</phrase>
-    </title>
+    <title>How does an unsharp mask work?</title>
     <para>
       Using an unsharp mask to sharpen an image can seem rather weird. Here is
       the explanation:
@@ -202,6 +187,7 @@
         <imagedata fileref="images/filters/examples/unsharp-mask-2.png"/>
       </imageobject>
     </mediaobject>
+
     <para>
       Unsharp mask has first been used in silver photography. The photograph
       first creates a copy of the original negative by contact, on a film,
@@ -212,22 +198,32 @@
       original negative will prevent light to go through and so will be
       subtracted from the light going through the original film.
     </para>
-    <para>
-      In digital photography, with GIMP, you will go through the following
-      steps:
-    </para>
+
     <procedure>
+      <para>
+        In digital photography, with GIMP, you will go through the following
+        steps:
+      </para>
       <step>
         <para>
           Open your image and duplicate it
-          <menuchoice><guimenu>Image</guimenu><guimenuitem>Duplicate</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Image</guimenu>
+            <guimenuitem>Duplicate</guimenuitem>
+          </menuchoice>
         </para>
       </step>
       <step>
         <para>
           In the copy, duplicate the layer
-          <menuchoice><guimenu>Layer</guimenu><guimenuitem>Duplicate layer</guimenuitem></menuchoice>, then drop the Filters menu down and apply
-          <menuchoice><guimenu>Blur</guimenu><guimenuitem>Gaussian Blur</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Layer</guimenu>
+            <guimenuitem>Duplicate layer</guimenuitem>
+          </menuchoice>, then drop the Filters menu down and apply
+          <menuchoice>
+            <guimenu>Blur</guimenu>
+            <guimenuitem>Gaussian Blur</guimenuitem>
+          </menuchoice>
           to the duplicated layer with the default IIR option and radius 5.
         </para>
       </step>
@@ -250,6 +246,7 @@
         </para>
       </step>
     </procedure>
+
     <para>
       VoilÃ. The<link linkend="plug-in-unsharp-mask">Unsharp Mask</link>
       plug-in does the same for you.
@@ -262,9 +259,7 @@
       nebula (black eye effect).
     </para>
     <figure>
-      <title>
-        <phrase>Black eye effect</phrase>
-      </title>
+      <title>Black eye effect</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/examples/unsharp-mask-3.png"/>

Copied: trunk/src/filters/introduction.xml (from r2784, /trunk/src/filters/filters_introduction.xml)
==============================================================================
--- /trunk/src/filters/filters_introduction.xml	(original)
+++ trunk/src/filters/introduction.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-01 prokoudine: improved Russian content
   2007-12-31 MikaS: updated 'fr'
@@ -12,26 +13,15 @@
   2005-08-18 de reviewed by axel.wernicke
 -->
 <sect1 id="filter-introduction">
-<!--  <sect1info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-10-25</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
+
   <indexterm>
-    <primary>Filters</primary>
-    <secondary>Introduction to filters</secondary>
+    <primary>Filters</primary><secondary>Introduction</secondary>
   </indexterm>
   <indexterm>
-    <primary>Preview</primary>
-    <secondary>Filter preview</secondary>
+    <primary>Preview</primary><secondary>Filter</secondary>
   </indexterm>
+
   <para>
     A filter is a special kind of tool designed to take an input layer or
     image, apply a mathematical algorithm to it, and return the input layer or
@@ -39,90 +29,66 @@
     uses filters to achieve a variety of effects and those effects are
     discussed here.
   </para>
-  <para>The filters are divided into several categories:</para>
+
   <itemizedlist>
+    <para>The filters are divided into several categories:</para>
     <listitem>
-      <para>
-        Blur see <xref linkend="filters-blur"/>.
-      </para>
+      <para><xref linkend="filters-blur"/></para>
     </listitem>
     <listitem>
-      <para>
-        Noise see <xref linkend="filters-noise"/>.
-      </para>
+      <para><xref linkend="filters-enhance"/></para>
     </listitem>
     <listitem>
-      <para>
-        Edge-Detect see <xref linkend="filters-edge"/>.
-      </para>
+      <para><xref linkend="filters-distort"/></para>
     </listitem>
     <listitem>
-      <para>
-        Enhance see <xref linkend="filters-enhance"/>.
-      </para>
+      <para><xref linkend="filters-light-and-shadow"/></para>
     </listitem>
     <listitem>
-      <para>
-        Generic see <xref linkend="filters-generic"/>.
-      </para>
+      <para><xref linkend="filters-noise"/></para>
     </listitem>
     <listitem>
-      <para>
-        Light and Shadow see <xref linkend="filters-light-and-shadow"/>.
-      </para>
+      <para><xref linkend="filters-edge"/></para>
     </listitem>
     <listitem>
-      <para>
-        Distorts see <xref linkend="filters-distort"/>.
-      </para>
+      <para><xref linkend="filters-generic"/></para>
     </listitem>
     <listitem>
-      <para>
-        Artistic see <xref linkend="filters-artistic"/>.
-      </para>
+      <para><xref linkend="filters-combine"/></para>
     </listitem>
     <listitem>
-      <para>
-        Map see <xref linkend="filters-map"/>.
-      </para>
+      <para><xref linkend="filters-artistic"/></para>
     </listitem>
     <listitem>
-      <para>
-        Render see <xref linkend="filters-render"/>.
-      </para>
+      <para><xref linkend="filters-decor"/></para>
     </listitem>
     <listitem>
-      <para>
-        Web see <xref linkend="filters-web"/>.
-      </para>
+      <para><xref linkend="filters-map"/></para>
     </listitem>
     <listitem>
-      <para>
-        Animation see <xref linkend="filters-animation"/>.
-      </para>
+      <para><xref linkend="filters-render"/></para>
     </listitem>
     <listitem>
-      <para>
-        Combine see <xref linkend="filters-combine"/>.
-      </para>
+      <para><xref linkend="filters-web"/></para>
+    </listitem>
+    <listitem>
+      <para><xref linkend="filters-animation"/></para>
     </listitem>
   </itemizedlist>
+
   <sect2>
-    <title>
-      <phrase>Preview</phrase>
-    </title>
+    <title>Preview</title>
     <para>
       Most filters have a Preview where changes in the image are displayed, in
-      real time (if the <quote>Preview</quote>
-      option is checked), before being applied to the image.
+      real time (if the <quote>Preview</quote> option is checked), before
+      being applied to the image.
     </para>
     <figure>
-      <title>
-        <phrase>Preview submenu</phrase>
-      </title>
+      <title>Preview submenu</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/preview-submenu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/preview-submenu.png"/>
         </imageobject>
         <caption>
           <para>

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Fri Mar 20 19:48:25 2009
@@ -185,22 +185,23 @@
     </chapter>
     <chapter id="filters">
       <title>Filters</title>
-      <xi:include href="filters/filters_introduction.xml"/>
-      <xi:include href="filters/filters_blur.xml"/>
+      <xi:include href="filters/introduction.xml"/>
+      <xi:include href="filters/blur.xml"/>
+      <xi:include href="filters/enhance.xml"/>
+      <xi:include href="filters/filters_distort.xml"/>
+      <xi:include href="filters/filters_light-effects.xml"/>
       <xi:include href="filters/filters_noise.xml"/>
       <xi:include href="filters/filters_edge-detect.xml"/>
-      <xi:include href="filters/filters_enhance.xml"/>
       <xi:include href="filters/filters_generic.xml"/>
-      <xi:include href="filters/filters_light-effects.xml"/>
-      <xi:include href="filters/filters_distort.xml"/>
+      <xi:include href="filters/filters_combine.xml"/>
       <xi:include href="filters/filters_artistic.xml"/>
+      <xi:include href="filters/filters_decor.xml"/>
       <xi:include href="filters/filters_map.xml"/>
       <xi:include href="filters/filters_render.xml"/>
-      <xi:include href="filters/filters_combine.xml"/>
-      <xi:include href="filters/filters_animation.xml"/>
       <xi:include href="filters/filters_web.xml"/>
+      <xi:include href="filters/filters_animation.xml"/>
+      <!-- -->
       <xi:include href="filters/filters_alpha-to-logo.xml"/>
-      <xi:include href="filters/filters_decor.xml"/>
     </chapter>
     <xi:include href="key-reference.xml"/>
   </part>

Modified: trunk/src/menus/menus-filters.xml
==============================================================================
--- trunk/src/menus/menus-filters.xml	(original)
+++ trunk/src/menus/menus-filters.xml	Fri Mar 20 19:48:25 2009
@@ -1,23 +1,14 @@
 <?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-02 j.h: moved xtns-scrip-fu.xml from the deprecated Toolbox/Xtns
     2006-01-21 en;fr reviewed by j.h
     2005/11/20 split off to one file per command; de created by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-imagewindow-menus-filters">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>The <quote>Filters</quote> Menu</phrase>
-  </title>
+  <title>The <quote>Filters</quote> Menu</title>
+
   <indexterm>
     <primary>Menus</primary>
     <secondary>Filters</secondary>
@@ -26,6 +17,7 @@
   <xi:include href="filter-repeat.xml"/>
   <xi:include href="filter-reshow.xml"/>
   <xi:include href="filter-reset-all.xml"/>
-
+  <!-- ... -->
+  <!--TODO xi:include href="filters/python-fu.xml"/-->
   <xi:include href="xtns-script-fu.xml"/>
 </sect1>

Modified: trunk/src/toolbox/intro.xml
==============================================================================
--- trunk/src/toolbox/intro.xml	(original)
+++ trunk/src/toolbox/intro.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-01 up to v2.4 fr; en by PP
   2007-05-29 KoSt: added 'no'
@@ -10,21 +11,12 @@
   2005-05-15 de reviewed by axel.wernicke
 -->
 <sect1 id="gimp-toolbox-introduction">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-02-09</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>The Toolbox</phrase>
-  </title>
+  <title>The Toolbox</title>
+
   <indexterm>
     <primary>Toolbox</primary>
   </indexterm>
+
   <para>
     The <acronym>GIMP</acronym>
     provides a comprehensive toolbox in order to quickly perform basic tasks
@@ -54,10 +46,18 @@
   <para>
     Most tools can be activated by clicking on an icon in the Toolbox.
     Some, however (namely, the Color tools), are accessible only via
-    the menus, either as <emphasis>Tools-&gt;Color Tools</emphasis> or as
-    <emphasis>Layer-&gt;Colors</emphasis>. Every tool, in fact, can be
-    activated from the <emphasis>Tools</emphasis> menu; also, every
-    tool can be activated from the keyboard using an accelerator key.
+    the menus, either as
+    <menuchoice>
+      <guimenu>Colors</guimenu>
+    </menuchoice>
+    or as
+    <menuchoice>
+      <guimenu>Tools</guimenu>
+      <guisubmenu>Colors</guisubmenu>
+    </menuchoice>.
+    Every tool, in fact, can be activated from the <emphasis>Tools</emphasis>
+    menu; also, every tool can be activated from the keyboard using an
+    accelerator key.
   </para>
   <para>
     In the default setup, created when GIMP is first installed, not all tools
@@ -75,19 +75,19 @@
     The shape of the cursor changes when it is inside an image, to one that
     indicates which tool is active (if in <guimenu>Preferences</guimenu> you have
     set
-    <menuchoice><guimenu>Image Windows</guimenu><guisubmenu>Mouse Pointers</guisubmenu><guimenuitem>Pointer mode</guimenuitem><guimenuitem>Tool icon</guimenuitem></menuchoice>
-    ).
+    <menuchoice>
+      <guimenu>Image Windows</guimenu>
+      <guisubmenu>Mouse Pointers</guisubmenu>
+      <guimenuitem>Pointer mode</guimenuitem>
+      <guimenuitem>Tool icon</guimenuitem>
+    </menuchoice>).
   </para>
+
   <sect2 id="gimp-tool-options-dialog">
-    <title>
-      <phrase>Tool Options</phrase>
-    </title>
+    <title>Tool Options</title>
+
     <figure>
-      <title>
-        <phrase>
-          Tool Options dialog for the Rectangle Select tool.
-        </phrase>
-      </title>
+      <title>Tool Options dialog for the Rectangle Select tool</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tool-options-rectsel.png" format="PNG"/>
@@ -105,10 +105,14 @@
         The Tool Options appear beneath the Toolbox in the default
         setup.  If you lose it somehow, you can get it back by creating
         a new Tool Options dialog using
-        <menuchoice><guimenu>File</guimenu><guisubmenu>Dialogs</guisubmenu><guimenuitem>Tool Options</guimenuitem></menuchoice>
-        and then docking it below the Toolbox.  See
-        the section on <link linkend="gimp-concepts-docks">Dialogs and
-        Docking</link> if you need help.
+        <menuchoice>
+          <guimenu>Windows</guimenu>
+          <guisubmenu>Dockable Dialogs</guisubmenu>
+          <guimenuitem>Tool Options</guimenuitem>
+        </menuchoice>
+        and then docking it below the Toolbox. See the section on
+        <link linkend="gimp-concepts-docks">Dialogs and Docking</link> if you
+        need help.
       </para>
     </tip>
     <para>

Modified: trunk/src/toolbox/tool-convolve.xml
==============================================================================
--- trunk/src/toolbox/tool-convolve.xml	(original)
+++ trunk/src/toolbox/tool-convolve.xml	Fri Mar 20 19:48:25 2009
@@ -128,8 +128,8 @@
       <title>Tool Options for the Blur/Sharpen tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-Blur/Sharpen.png"
-format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-blur-sharpen.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: trunk/src/toolbox/tool-threshold.xml
==============================================================================
--- trunk/src/toolbox/tool-threshold.xml	(original)
+++ trunk/src/toolbox/tool-threshold.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-05 j.h: updated to v2.4
@@ -11,7 +12,6 @@
   2005-12-06 replaced informalfigure by figure by lexa
   2005-08-07 de reviewed and restructured by axel.wernicke
 -->
-<!-- TODO: it zh_CN review needed -->
 <sect2 id="gimp-tool-threshold">
   <title>Threshold</title>
   <indexterm>
@@ -38,50 +38,58 @@
       <link linkend="gimp-tool-levels">Levels </link> tool.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
-    <para>
-      You can access this tool from the image menu through
-      <menuchoice>
-        <guimenu>Tools</guimenu>
-        <guisubmenu>Color Tools</guisubmenu>
-        <guimenuitem>Threshold,</guimenuitem>
-      </menuchoice>,
-    </para>
-    <para>
-      or through
-      <menuchoice>
-        <guimenu>Colors</guimenu>
-        <guimenuitem>Threshold</guimenuitem>
-      </menuchoice>,
-    </para>
-    <para>
-      or by clicking on the
-      <guiicon>
-        <inlinemediaobject>
-          <imageobject>
-            <imagedata
-              fileref="images/toolbox/stock-tool-threshold-22.png"/>
-          </imageobject>
-        </inlinemediaobject>
-      </guiicon>
-      icon in Toolbox if this tool has been installed in it. You can do
-      that through the <link linkend="gimp-tools-dialog">Tool dialog</link>.
-    </para>
+    <title>Activating the Tool</title>
+    <itemizedlist>
+      <para>
+        There are different possibilities to activate the tool:
+      </para>
+      <listitem>
+        <para>
+          You can access this tool from the image menu through
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Threshold,</guimenuitem>
+          </menuchoice>,
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          or through
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Threshold</guimenuitem>
+          </menuchoice>,
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          or by clicking on the
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-threshold-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
+          icon in Toolbox if this tool has been installed in it. You can do
+          that through the <link linkend="gimp-tools-dialog">Tool dialog</link>.
+        </para>
+      </listitem>
+    </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Threshold tool options</phrase>
-      </title>
+      <title>Threshold tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tools-threshold.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tools-threshold.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -130,12 +138,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>
-        Using Threshold and Quick Mask to create a selection mask
-      </phrase>
-    </title>
+    <title>Using Threshold and Quick Mask to create a selection mask</title>
     <para>
       That's not always the case, but an element you want to extract from
       an image can stand out well against the background. In this case,
@@ -159,9 +164,7 @@
         </para>
         <figure>
           <title>
-            <phrase>
-              The original image, the decompose image and its Layer Dialog
-            </phrase>
+            The original image, the decompose image and its Layer Dialog
           </title>
           <mediaobject>
             <imageobject>
@@ -195,9 +198,7 @@
           </para>
         </warning>
         <figure>
-          <title>
-            <phrase>The selected layer after threshold fit</phrase>
-          </title>
+          <title>The selected layer after threshold fit</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/using/threshold-fit.png" format="PNG"/>
@@ -232,12 +233,11 @@
           paste the previously copied layer.
         </para>
         <figure>
-          <title>
-            <phrase>The mask</phrase>
-          </title>
+          <title>The mask</title>
           <mediaobject>
             <imageobject>
-              <imagedata align="center" fileref="images/using/threshold-mask.png" format="PNG"/>
+              <imagedata align="center" format="PNG"
+                fileref="images/using/threshold-mask.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -250,9 +250,7 @@
           the selection.
         </para>
         <figure>
-          <title>
-            <phrase>The result</phrase>
-          </title>
+          <title>The result</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/using/threshold-result.png" format="PNG"/>

Modified: trunk/src/toolbox/tool-transform.xml
==============================================================================
--- trunk/src/toolbox/tool-transform.xml	(original)
+++ trunk/src/toolbox/tool-transform.xml	Fri Mar 20 19:48:25 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-17 j.h: updated to v2.6. Added Opacity
   2008-02-26 kost: updated 'no' v2.4
@@ -13,10 +14,12 @@
 -->
 <sect2 id="gimp-tool-transform">
   <title>Common Features</title>
+
   <indexterm>
     <primary>Tools</primary>
     <secondary>Transform Tools</secondary>
   </indexterm>
+
   <figure>
     <title>An overview of the transform tools</title>
     <mediaobject>
@@ -31,15 +34,15 @@
     image, selection, layer or path. Each transform tool has an Option dialog
     and an Information dialog to set parameters.
   </para>
+
   <sect3 id="gimp-tool-transform-options">
-    <title>
-      <phrase>Tool Options</phrase>
-    </title>
+    <title>Tool Options</title>
     <figure>
       <title>Common options of transform tools</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/transform-tools-common-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/transform-tools-common-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -70,7 +73,8 @@
                     <imageobject>
                       <imagedata
                         fileref="images/tool-options/rotate-affect-layer.png"/>
-                    </imageobject></inlinemediaobject>
+                    </imageobject>
+                  </inlinemediaobject>
                 </guiicon>
                 the tool works on the active layer. If no selection exists in
                 this layer, the whole layer will be transformed.
@@ -84,7 +88,8 @@
                     <imageobject>
                       <imagedata
                       fileref="images/tool-options/rotate-affect-selection.png"/>
-                    </imageobject></inlinemediaobject>
+                    </imageobject>
+                  </inlinemediaobject>
                 </guiicon>
                 the tool works on the selection contour only (the whole layer
                 contour if no selection).
@@ -264,9 +269,10 @@
         <listitem>
           <indexterm>
             <primary>Preview</primary>
-            <secondary>Option of the transformation tools</secondary>
+            <secondary>Transformation tools</secondary>
           </indexterm>
-          <para><acronym>GIMP</acronym> lets you select among four Preview
+          <para>
+            <acronym>GIMP</acronym> lets you select among four Preview
             possibilities:
           </para>
           <variablelist>



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