[gimp-help-2] Fix bugs #742256, #75003

[Julien Hardlin <jhardlin src gnome org>]

commit 0a18ee75bf5962f1bf94b4d49bbf9f75911d7b6f
Author: Julien Hardelin <jhardlin orange fr>
Date:   Sun Aug 30 08:35:04 2015 +0200

    Fix bugs #742256, #75003

 images/C/using/empty-clipboard-brush.png |  Bin 0 -> 17932 bytes
 src/filters/combine/depthmerge.xml       |    2 +-
 src/using/getting-unstuck.xml            |   22 +++++++++++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/images/C/using/empty-clipboard-brush.png b/images/C/using/empty-clipboard-brush.png
new file mode 100644
index 0000000..a1a76d0
Binary files /dev/null and b/images/C/using/empty-clipboard-brush.png differ
diff --git a/src/filters/combine/depthmerge.xml b/src/filters/combine/depthmerge.xml
index 90c15d5..e25f617 100644
--- a/src/filters/combine/depthmerge.xml
+++ b/src/filters/combine/depthmerge.xml
@@ -215,7 +215,7 @@
         <caption>
           <para>
             <emphasis>Offset</emphasis> = 0.980 : the limit, sharp,
-            is shifted so that the image2 area is increased.
+            is shifted so that the image-2 area is increased.
           </para>
         </caption>
       </mediaobject>
diff --git a/src/using/getting-unstuck.xml b/src/using/getting-unstuck.xml
index b48dd6c..63f3e44 100644
--- a/src/using/getting-unstuck.xml
+++ b/src/using/getting-unstuck.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2015-08-30 j.h: fix bug #742256
   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
-  2006-08-18 added norwegian translation by KoSt
-  2006-06-19 added italian translation by ciampix
-  2006-05-15 HdJ: Added dutch translation.
-  2006-05-13 added Korean translation by Dust
   2006-03-10 changed structure
   2006-02-20 fixed #322305
   2005-11-30 replaced informalfigure by axel.wernicke
@@ -256,5 +252,21 @@
         <guimenu>Image</guimenu> menu.
       </para>
     </sect3>
+    
+    <sect3><!--Bug #742256 2015-08-30-->
+      <title>Eraser and brushes no longer work</title>
+      <para>
+        You have selected the clipboard brush and the clipboard is empty.
+      </para>
+      <figure>
+        <title>Empty Clipboard Brush</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata format="PNG"
+              fileref="images/using/empty-clipboard-brush.png"/>
+          </imageobject>
+        </mediaobject>
+      </figure>
+    </sect3> 
   </sect2>
 </sect1>