[gimp-help] Update Free Selection and Move tools

[Julien Hardlin <jhardlin src gnome org>]

commit 5ea06e61d78ae7624c24a1edb7e9900df617f342
Author: Julien Hardelin <jhardlin orange fr>
Date:   Wed Jul 10 15:23:09 2019 +0200

    Update Free Selection and Move tools

 src/concepts/grid-and-guides.xml | 22 ++++++++--------------
 src/toolbox/selection/free.xml   | 34 +++++++++++++++++++---------------
 src/toolbox/transform/move.xml   |  7 +++++++
 3 files changed, 34 insertions(+), 29 deletions(-)
---
diff --git a/src/concepts/grid-and-guides.xml b/src/concepts/grid-and-guides.xml
index b6a62c012..683eeaf70 100644
--- a/src/concepts/grid-and-guides.xml
+++ b/src/concepts/grid-and-guides.xml
@@ -2,15 +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-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
-             guide move (en,it) by ciampix
-  2006-01-06 Activated dutch translation and replaces some
-             ' by " by HdJ
-  2005-12-18 reviewed and added de translation by lexa
-  2005-11-28 replaced informalfigures by figures by lexa
+  2019-07-08 j.h: add moving guides intersection
 -->
 <sect1 id="gimp-concepts-image-grid-and-guides">
   <title>Grids and Guides</title>
@@ -153,11 +145,13 @@
     </para>
     <para>
       You can create as many guides as you like, positioned wherever you like.
-      To move a guide after you have created it, activate the Move tool in the
-      Toolbox (or press the <keycap>M</keycap> key), you can then click and
-      drag a guide. To delete a guide, simply drag it outside the image.
-      Holding down the <keycap>Shift</keycap> key, you can move everything but
-      a guide, using the guides as an effective alignment aid.
+      To <emphasis>move a guide</emphasis> after you have created it, activate 
+      the Move tool in the Toolbox (or press the <keycap>M</keycap> key), you 
+      can then click and drag a guide; click-and-drag the intersection of 
+      two guides to move them together. To <emphasis>delete a guide</emphasis>, 
+      simply drag it outside the image. Holding down the <keycap>Shift</keycap> 
+      key, you can move everything but a guide, using the guides as an 
+      effective alignment aid.
     </para>
 
     <para>
diff --git a/src/toolbox/selection/free.xml b/src/toolbox/selection/free.xml
index aa4a2caf0..7ca558f04 100644
--- a/src/toolbox/selection/free.xml
+++ b/src/toolbox/selection/free.xml
@@ -3,6 +3,7 @@
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2019-02-03 j.h: rewrite explanations
+  2019-07-08 j.h: 
 -->
 <sect2 id="gimp-tool-free-select" xmlns:xi="http://www.w3.org/2001/XInclude";>
   <title>Free Selection (Lasso)</title>
@@ -42,9 +43,8 @@
       <listitem>
         <para>
           Maintaining the mouse button pressed (i.e click-and-drag), drag to 
-          draw a free hand selection. When <emphasis>end point</emphasis> comes 
-          superimposed on the starting point, release the mouse button to 
-            <emphasis>close the selection</emphasis>.
+          draw a free hand selection. When end point comes superimposed on the 
+          starting point, release the mouse button to close the selection.
         </para>
         <para>
           If you click on the end point, it turns accompanied by a moving cross. 
@@ -54,12 +54,8 @@
       <listitem>
         <para>
           Or release the mouse button and drag to draw a polygonal selection. 
-          When the <emphasis>end point</emphasis> comes superimposed on the 
-          starting point, click to <emphasis>close the selection</emphasis>. 
-          Since GIMP-2.10, closing polygonal selection doesn't confirm the 
-          selection automatically; you still can tweak positions of nodes.Then 
-          press <keycap>Enter</keycap> or switch to another tool to confirm the 
-          selection.
+          When end point comes superimposed on the starting point, click to 
+          close the selection.
         </para>
         <para>
           Press the <keycap>Ctrl</keycap> keyboard key and click on the end 
@@ -72,8 +68,15 @@
     straight line.
   </para>
   <para>
-    Press <keycap>Enter</keycap> or double click inside the shape to validate 
-    the selection.
+    In polygonal mode, this selection is a <emphasis>preliminary 
+    selection</emphasis>; ants are marching, but the small yellow circle is 
+    still present: you can copy the selection and, pressing the 
+    <keycap>Backspace</keycap> key, you return to the previous selection step 
+    (re-open the shape), and you can edit the selection.
+  </para>
+  <para>
+    Press <keycap>Enter</keycap> or double click inside the shape to 
+    <emphasis>validate the selection</emphasis>.
   </para>
   <para>
     Pressing and releasing the mouse pointer allows you to mix free hand 
@@ -147,14 +150,15 @@
   <sect3>
     <title>Key modifiers</title>
     <para>
-      The Free Select tool does not have any special key modifiers,
-      only the ones that affect all selection tools in the same way.
+      The Free Select tool has key modifiers that affect all selection tools in 
+      the same way.
       See <link linkend="gimp-tool-select">Selection Tools</link> for
       help with these.
     </para>
     <para>
-      <keycap>Backspace</keycap> removes last segment drawn, 
-      <keycap>Escape</keycap> cancels all selection segments.
+      <keycap>Backspace</keycap> returns to previous selection step (removes 
+      last selection segment), <keycap>Escape</keycap> cancels all selection 
+      segments.
     </para>
     
   </sect3>
diff --git a/src/toolbox/transform/move.xml b/src/toolbox/transform/move.xml
index 03fbcf34a..f3dc48cbd 100644
--- a/src/toolbox/transform/move.xml
+++ b/src/toolbox/transform/move.xml
@@ -142,6 +142,13 @@
                   the mouse pointer goes over. Then it is activated and you
                   can move it.
                 </para>
+                <para>
+                  At the point of intersection of two guides, you can 
+                  click-and-drag to move them together. This is useful when the 
+                  guides are used to mark a point, rather than a pair of lines 
+                  (e.g, as is the case for the mandala symmetry guides, which 
+                  mark the symmetry point of origin).
+                </para>
               </listitem>
             </varlistentry>
             <varlistentry>