[gimp-help] Update Clone and Heal tools

[Julien Hardlin <jhardlin src gnome org>]

commit e932ed0fe89389174dd54715483500f6ea3886e4
Author: Julien Hardelin <jhardlin orange fr>
Date:   Sun May 12 08:25:06 2019 +0200

    Update Clone and Heal tools

 .../filters/examples/distort/ripple-ex-period.png  | Bin 0 -> 5006 bytes
 images/C/toolbox/clone-ex-sample-merged.png        | Bin 0 -> 136985 bytes
 images/C/toolbox/heal-compar.png                   | Bin 10575 -> 50836 bytes
 src/glossary/glossary.xml                          |   8 +++++--
 src/toolbox/paint/.directory                       |   6 ++++++
 src/toolbox/paint/clone.xml                        |  24 ++++++++++++++++++---
 src/toolbox/paint/heal.xml                         |  22 ++++++++++++-------
 src/toolbox/selection/foreground.xml               |   2 +-
 8 files changed, 48 insertions(+), 14 deletions(-)
---
diff --git a/images/C/filters/examples/distort/ripple-ex-period.png 
b/images/C/filters/examples/distort/ripple-ex-period.png
new file mode 100644
index 000000000..380896c5d
Binary files /dev/null and b/images/C/filters/examples/distort/ripple-ex-period.png differ
diff --git a/images/C/toolbox/clone-ex-sample-merged.png b/images/C/toolbox/clone-ex-sample-merged.png
new file mode 100644
index 000000000..4f3de28cc
Binary files /dev/null and b/images/C/toolbox/clone-ex-sample-merged.png differ
diff --git a/images/C/toolbox/heal-compar.png b/images/C/toolbox/heal-compar.png
index 1fc1e5402..6f1224b42 100644
Binary files a/images/C/toolbox/heal-compar.png and b/images/C/toolbox/heal-compar.png differ
diff --git a/src/glossary/glossary.xml b/src/glossary/glossary.xml
index a2f58a9ef..4bb8044b2 100644
--- a/src/glossary/glossary.xml
+++ b/src/glossary/glossary.xml
@@ -271,7 +271,7 @@
       </orderedlist>
 
       <!--TO TRANSLATORS: a png file without text is in 
-https://git.gnome.org/browse/gimp-help-2/tree/docs folder-->
+https://gitlab.gnome.org/GNOME/gimp-help/tree/master/docs/xcf images folder-->
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/glossary/companding-curves-compared.png" format="PNG"/>
@@ -2148,7 +2148,7 @@ fileref="images/dialogs/examples/layer-groups-pass-through-ex6.png"/>
 
   <glossentry id="glossary-samplemerge">
     <glossterm>
-      <phrase>Sample Merge</phrase>
+      <phrase>Sample Merged</phrase>
     </glossterm>
     <glossdef>
       <para>
@@ -2164,6 +2164,10 @@ fileref="images/dialogs/examples/layer-groups-pass-through-ex6.png"/>
         all the visible layers. When the Sample Merged option is not checked,
         the color used is the color of the active layer itself.
       </para>
+      <para>
+        See also <link linkend="gimp-tool-clone"/> for using Sample Merged in 
+        non-destructive image editing.
+      </para>
     </glossdef>
   </glossentry>
 
diff --git a/src/toolbox/paint/.directory b/src/toolbox/paint/.directory
new file mode 100644
index 000000000..51e143fd4
--- /dev/null
+++ b/src/toolbox/paint/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2019,5,12,8,21,19
+Version=3
+
+[Settings]
+HiddenFilesShown=true
diff --git a/src/toolbox/paint/clone.xml b/src/toolbox/paint/clone.xml
index 36cbf4aca..4482cc404 100644
--- a/src/toolbox/paint/clone.xml
+++ b/src/toolbox/paint/clone.xml
@@ -199,7 +199,8 @@
                   you <quote>see</quote> (color made with all the layers of
                   a multi-layer image) that's cloned. If it's unchecked,
                   only the selected layer is cloned. For more information
-                  see the glossary entry <link
+                  about non-destructive image editing with Sample merged see 
+                  <link
                   linkend="glossary-samplemerge">Sample Merge</link>.
                 </para>
               </listitem>
@@ -220,9 +221,26 @@
               <listitem>
                 <para>
                   If this option is not checked (default), Clone tool samples 
-                  from the active layer. If this option is checked, Clone tool 
-                  samples from all layers.
+                  from the active layer.
                 </para>
+                <para>
+                  If this option is checked, Clone tool samples from all layers.
+                  This allows you to work in a non-destructive fashion, without 
+                  modifying original pixels: you create a new layer 
+                  (transparent) above the image layer; this new layer being 
+                  active, all cloned pixels will appear in this layer.
+                </para>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata format="PNG"
+                      fileref="images/toolbox/clone-ex-sample-merged.png"/>
+                  </imageobject>
+                  <caption>
+                    <para>
+                      Cloned pixels are in the new layer.
+                    </para>
+                  </caption>
+                </mediaobject>
               </listitem>
             </varlistentry>
           </variablelist>
diff --git a/src/toolbox/paint/heal.xml b/src/toolbox/paint/heal.xml
index bd02a3909..e42414fe0 100644
--- a/src/toolbox/paint/heal.xml
+++ b/src/toolbox/paint/heal.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  2018-10-14 j.h: update to v2.10
-  2007-10-27 j.h: created
+  2019-05-09 j.h update to v2.10.10
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-heal">
   <title>Heal</title>
@@ -40,7 +39,7 @@
     <keycap>Ctrl</keycap> key and drag the sample to the defect. Click. If the
     defect is slight, not very
     different from its surrounding, it will be corrected as soon. Else, you
-    can correct it with repeated clicks, but with a risk of daubing
+    can correct it with repeated clicks, but with a risk of daubing.
   </para>
 
   <sect3>
@@ -151,6 +150,10 @@ format="PNG"/>
             If you enable this option, healing is not calculated only
             from the values of the active layer, but from all visible layers.
           </para>
+          <para>
+            See <xref linkend="gimp-tool-clone"/> for using Sample Merged in 
+            non-destructive image editing.
+          </para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -179,11 +182,14 @@ format="PNG"/>
         </imageobject>
         <caption>
           <para>
-           Two black spots in the red area. Zoom x800. The source is where the
-           four colors meet. Cloning on the left spot. Healing on the right
-           spot.
-         </para>
-        </caption>
+            Cloning on the left. All colors are transferred.
+          </para>
+          <para>
+            Healing on the right. Colors are much less transferred, especially 
+            on borders where surrounding pixels of destination are taken in 
+            account.
+          </para>
+    </caption>
       </mediaobject>
     </figure>
   </sect3>
diff --git a/src/toolbox/selection/foreground.xml b/src/toolbox/selection/foreground.xml
index 3655450d9..d25e6b466 100644
--- a/src/toolbox/selection/foreground.xml
+++ b/src/toolbox/selection/foreground.xml
@@ -252,7 +252,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-foreground-select">
           </para>
           <para>
             <guilabel>Draw background</guilabel>: to draw what will be 
-            foreground.
+            background.
           </para>
           <para>
             <guilabel>Draw unknown</guilabel>: to add to your selection pixels