[dia/dia-0-97] doc: bug 632660 - help update for text editing

[Hans Breuer <hans src gnome org>]

commit 48552765dfb0348dd77838cedd45c447c36ec5b1
Author: Hans Breuer <hans breuer org>
Date:   Mon Apr 25 15:03:02 2011 +0200

    doc: bug 632660 - help update for text editing
    
    There are more changes done on the manual since 2009,
    so update revision info, too.

 doc/en/Makefile.am                   |    1 -
 doc/en/dia.xml                       |   14 +++++--
 doc/en/graphics/delete-text.png      |  Bin 23912 -> 0 bytes
 doc/en/graphics/toolbox-textedit.png |  Bin 0 -> 633 bytes
 doc/en/graphics/toolbox.png          |  Bin 28689 -> 23365 bytes
 doc/en/usage-objects.xml             |   69 ++++++++++++++++++++++-----------
 6 files changed, 56 insertions(+), 28 deletions(-)
---
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index 8730f7b..008bed8 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -117,7 +117,6 @@ pngfigures = \
 	graphics/standard-line-properties.png \
 	graphics/defaults-text.png \
 	graphics/toolbox-basic.png \
-	graphics/delete-text.png \
 	graphics/toolbox-image.png \
 	graphics/dia-startup.png \
 	graphics/toolbox-lower.png \
diff --git a/doc/en/dia.xml b/doc/en/dia.xml
index 2209665..5d5844d 100644
--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -129,19 +129,25 @@
 
   <releaseinfo>
 
-   This is version 0.97.0 of the Dia manual.
+   This is version 0.97.2 of the Dia manual.
 
   </releaseinfo>
   <revhistory>
-    <revision>
+  <revision>
+    <revnumber>0.97.2</revnumber>
+    <date>2011-04-25</date>
+    <authorinitials>hb</authorinitials>
+    <revremark>Actually describing noteable new features/behaviour of dia-0-97.x</revremark>
+  </revision>
+  <revision>
     <revnumber>0.97.0</revnumber>
-    <date>2008-27-05</date>
+    <date>2009-02-20</date>
     <authorinitials>sdteffen</authorinitials>
     <revremark>Bumping dates and revisions to show progress for 0.97 release</revremark>
   </revision>
   <revision>
     <revnumber>0.5-2</revnumber>
-    <date>2008-27-05</date>
+    <date>2008-05-27</date>
     <authorinitials>HDG</authorinitials>
     <revremark>dropping HTML entities, making dia-1.xml independant from dia-cmdline.xml,
     dropping file extension from graphics</revremark>
diff --git a/doc/en/graphics/toolbox-textedit.png b/doc/en/graphics/toolbox-textedit.png
new file mode 100644
index 0000000..96c864a
Binary files /dev/null and b/doc/en/graphics/toolbox-textedit.png differ
diff --git a/doc/en/graphics/toolbox.png b/doc/en/graphics/toolbox.png
index c1aa023..c6b3bd6 100644
Binary files a/doc/en/graphics/toolbox.png and b/doc/en/graphics/toolbox.png differ
diff --git a/doc/en/usage-objects.xml b/doc/en/usage-objects.xml
index 657a9a6..2c7de43 100644
--- a/doc/en/usage-objects.xml
+++ b/doc/en/usage-objects.xml
@@ -70,6 +70,34 @@
         </para>
       </tip>
     </sect2>
+    <sect2 id="toolbox-textedit">
+      <title>Textedit Control</title>
+      <figure>
+        <title>Textedit Control</title>
+        <screenshot>
+          <screeninfo>Textedit Control</screeninfo>
+          <graphic format="PNG" fileref="graphics/toolbox-textedit" srccredit="Hans Breuer" />
+        </screenshot>
+      </figure> 
+      <para>
+	The Textedit control is new with Dia from version 0.97 - it indicates being 
+	in text edit mode. Together with an appropriate object selection it is one way
+	to start text modification.
+      </para>
+      <para>
+	An object supporting in-canvas text editing can be in two different selection modes.
+	The normal selection is the same for all objects, it allows to manipulate the objects
+	position, grouping etc.. Some object can enter a second selection mode, which allows
+	to edit their text from the canvas. 
+      </para>
+      <tip>
+        <para>
+	There are multiple ways to enter text edit mode. You can press-and-hold the left mouse button,
+	activate text editing by Enter or F2 key or select the respective object after activating
+	Textedit from the toolbox.
+        </para>
+      </tip>
+    </sect2>
     <sect2 id="toolbox-magnify">
       <title>Magnify Control</title>
       <figure>
@@ -443,12 +471,22 @@
     <sect2 id="entering-text">
       <title>Entering Text</title>
       <para>
-        Text can be entered by selecting the object and then typing the text. 
+        Text can be entered by selecting the object, entering text edit mode and then 
+	typing the text.
         The font, size, alignment, and other formatting properties can be changed by 
-        double-clicking the object.
+        double-clicking the object, when not in text edit mode.
       </para>
       <para>
-        Here are some important tips regarding short-cut keys when entering text.
+	Many Dia objects suport in-canvas editing of text. Dia versions before 0.97
+	had not explicit distinction between a selected object and it's text edit mode.
+	As a result numerous workarounds were needed to support canvas and text editing
+	with the same set of keys, e.g. the Delete key was not deleting the character
+	right to the cursor, but instead the whole object.
+      </para>
+      <para>
+	With Dia 0.97 and later there is a dedicated <link linkend="toolbox-textedit">text edit mode</link>.
+	You can enter it by hitting Enter or F2 key while an appropriate object is selected.
+        To leave text editing just click outside of the editable area or hit the Escape key.
       </para>
       <figure>
         <title>Edit Menu Text Commands</title>
@@ -459,8 +497,8 @@
       </figure>  
       <tip>
         <para>
-          The normal Copy / Cut / Paste keys (Ctrl+C, Ctrl+X, Ctrl+V) work on 
-          entire objects, not on text. The Edit menu contains the commands 
+          While in text edit mode the normal Copy / Paste keys (Ctrl+C, Ctrl+V) work on 
+          the entire text. The Edit menu also contains the commands 
           Copy Text, Cut Text (Shift+Ctrl+X), and Paste Text (Shift+Ctrl+V) 
           to copy, cut, and paste just the text contents of an object. 
           Note that when you paste text into an object, the text is 
@@ -471,27 +509,12 @@
       <tip>
         <para>
           You cannot select a section of text inside an object with the mouse (this
-          moves the object). You can insert characters at the current cursor position 
+          moves the cursor). You can insert characters at the current cursor position 
           just by typing. You can delete the character to the left of the mouse using 
-          Backspace. IMPORTANT: The Del key deletes the entire object, not the text 
-          to the right of the cursor. Use Shift+Del, Ctrl+Del, or Alt+Del to delete 
-          the text to the right of the cursor. (Use Ctrl+Z or 
-          <menuchoice>
-            <guimenu>Edit</guimenu>
-            <guimenuitem>Undo</guimenuitem>
-          </menuchoice>  if you delete 
-          an object by mistake.) To delete all of the text in an object, use the 
-          Cut (Shift+Ctrl+X). 
+          Backspace. The Del key deletes the character right to the cursor. 
+	  To delete all of the text in an object, use the Cut (Shift+Ctrl+X). 
         </para>
       </tip>
-      <figure>
-        <title>Deleting Text</title>
-        <screenshot>
-          <screeninfo>Deleting Text</screeninfo>
-          <graphic format="PNG" fileref="graphics/delete-text" srccredit="Mark Dexter" />
-        </screenshot>
-      </figure>  
-
     </sect2>
     <sect2 id="aligning-objects">
       <title>Aligning Objects</title>