From dc0409900b666177826b0adbe4e9cee4ed31fab4 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sun, 4 Oct 2009 06:34:37 +0000
Subject: [PATCH] Doc'ing Gujarati updates. Doc'ing new Label tool.

---
 docs/CHANGES.txt      |  3 +++
 docs/README.txt       | 31 +++++++++++++++++++++++++++----
 docs/html/README.html | 28 +++++++++++++++++++++++++---
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index fb96c094d..e2250b6a7 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -116,6 +116,9 @@ $Id$
     * Greek translation
       Kiriaki SERAFEIM <pse04178@rhodes.aegean.gr>
 
+    * Gujarati translation
+      Kartik Mistry <kartik.mistry@gmail.com>
+
     * Latvian
       Raivis Strogonovs <raivucis@gmail.com>
 
diff --git a/docs/README.txt b/docs/README.txt
index 046e7b4cb..84ea4f7a1 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                             http://www.tuxpaint.org/
 
-                          June 14, 2002 - July 1, 2009
+                        June 14, 2002 - October 3, 2009
 
      ----------------------------------------------------------------------
 
@@ -150,8 +150,8 @@ Main Screen
 
                The toolbar contains the drawing and editing controls.
 
-[Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Undo, Redo,       Eraser, New,
-                            Open, Save, Print, Quit]
+   [Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Label, Undo, Redo,      
+                     Eraser, New, Open, Save, Print, Quit]
 
        Middle: Drawing Canvas
 
@@ -294,7 +294,7 @@ Available Tools
 
      ----------------------------------------------------------------------
 
-         Text
+         Text and Label
 
                  Choose a font (from the 'Letters' available on the right)
                  and a color (from the color palette near the bottom). Click
@@ -314,6 +314,29 @@ Available Tools
                  still active causes the current line of text to move to that
                  location (where you can continue editing it).
 
+                      Text versus Label
+
+                              The Text tool is the original text-entry tool
+                              in Tux Paint. Text entered using this tool
+                              can't be modified or moved later, since it
+                              becomes part of the drawing. However, because
+                              the text becomes part of the picture, it can be
+                              drawn over or modified using Magic tool effects
+                              (e.g., smudged, tinted, embossed, etc.)
+
+                              When using the Label tool (which was added to
+                              Tux Paint in version 0.9.22), the text 'floats'
+                              over the image, and the details of the label
+                              (the text, the position of the label, the font
+                              choice and the color) get stored separately.
+                              This allows the label to be repositioned or
+                              edited later.
+
+                              The Label tool can be disabled (e.g., by
+                              selecting "Disable 'Label' Tool" in
+                              Tux Paint Config. or running Tux Paint with the
+                              "--nolabel" command-line option).
+
                       International Character Input
 
                               Tux Paint allows inputting characters in
diff --git a/docs/html/README.html b/docs/html/README.html
index 724db6a13..04010510a 100644
--- a/docs/html/README.html
+++ b/docs/html/README.html
@@ -26,7 +26,7 @@ version
 
 <p>June 14, 2002 -
 
-				July 1, 2009</p>
+				October 3, 2009</p>
 
 </center>
 
@@ -208,8 +208,9 @@ version
     <dd>
       <p>The toolbar contains the drawing and editing controls.</p>
 
+      <!-- FIXME: Updated screenshot -->
       <p align=center><img src="images/tools.jpg" width=324 height=254
-      alt="[Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Undo, Redo,
+      alt="[Tools: Paint, Stamp, Lines, Shapes, Text, Magic, Label, Undo, Redo,
       Eraser, New, Open, Save, Print, Quit]"></p>
     </dd>
 
@@ -416,7 +417,7 @@ version
       </dd>
 
 
-      <dt><b>Text</b></dt>
+      <dt><b>Text</b> and <b>Label</b></dt>
       <dd>
         <img src="images/tool_text.png" width=48 height=48 alt="" align=right>
 
@@ -441,6 +442,27 @@ version
         alt=""></p>
 
         <dl>
+        <dt><b>Text versus Label</b></dt>
+        <dd>
+          <p>The <b>Text</b> tool is the original text-entry tool in
+          Tux&nbsp;Paint.  Text entered using this tool can't be modified
+          or moved later, since it becomes part of the drawing.  However,
+          because the text becomes part of the picture, it can be drawn
+          over or modified using <b>Magic</b> tool effects (e.g., smudged,
+          tinted, embossed, etc.)</p>
+
+          <p>When using the <b>Label</b> tool (which was added to
+          Tux&nbsp;Paint in version 0.9.22), the text 'floats' over the
+          image, and the details of the label (the text, the position of
+          the label, the font choice and the color) get stored separately.
+          This allows the label to be repositioned or edited later.</p>
+
+          <p>The <b>Label</b> tool can be disabled (e.g., by selecting
+          "Disable&nbsp;'Label'&nbsp;Tool" in <i>Tux&nbsp;Paint&nbsp;Config.</i>
+          or running <i>Tux&nbsp;Paint</i> with the "<code>--nolabel</code>"
+          command-line option).</p>
+        </dd>
+
         <dt><b>International Character Input</b></dt>
         <dd>
           <p>Tux Paint allows inputting characters in different languages.