Merge branch 'master' into sdl2.0

docs/en/html/OPTIONS.html

@@ -32,7 +32,7 @@
       </p>
 
       <p>
-        July 27, 2020
+        August 14, 2020
       </p>
     </center>
 
@@ -742,6 +742,17 @@
           default functionality (usually paint-mode).
         </dd>
 
+        <dt>
+          <code><b>noshapecontrols=yes</b></code>
+        </dt>
+
+        <dd>
+          Disable the control buttons shown when using the <b>Shapes</b>
+          tool that allow changing how shapes are drawn &mdash;
+          centered around the initial mouse click, or with a corner
+          at the initial mouse click.
+        </dd>
+
         <dt>
           <code><b>nolabel=yes</b></code>
         </dt>
@@ -3090,6 +3101,7 @@
             --nostamps<br>
             --nostampcontrols<br>
             --nomagiccontrols<br>
+            --noshapecontrols<br>
             --nolabel<br>
             --newcolorslast<br>
             --mouse-accessibility<br>
@@ -3170,6 +3182,7 @@
             --stamps<br>
             --stampcontrols<br>
             --magiccontrols<br>
+            --shapecontrols<br>
             --label<br>
             --newcolorsfirst<br>
             --nosysfonts<br>

docs/en/html/README.html

@@ -35,7 +35,7 @@
       </p>
 
       <p>
-        June 14, 2002 - July 27, 2020
+        June 14, 2002 - August 15, 2020
       </p>
     </center>
 
@@ -707,11 +707,47 @@
                 (circle, square, oval, etc.).
               </p>
 
+              <p>
+                Use the options at the bottom right to choose
+                the shape tool's behavior:
+              </p>
+
+              <dl>
+                <dt>
+                  Shapes from center
+                </dt>
+                <dd>
+                  The shape will expand from where you initially
+                  clicked, and will be centered around that position.
+                  (This was Tux&nbsp;Paint's only behavior through
+                  version 0.9.24.)
+                </dd>
+
+                <dt>
+                  Shapes from corner
+                </dt>
+                <dd>
+                  The shape will extend with one corner starting
+                  from where you initially clicked.  This is the
+                  default method of most other traditional drawing
+                  software. (This option was added starting with
+                  Tux&nbsp;Paint version 0.9.25.)
+                </dd>
+              </dl>
+
+              <p>
+                Note: If shape controls are disabled (e.g., with the
+                "<code>--noshapecontrols</code>" option), the controls
+                will not be presented, and the "shapes from center"
+                method will be used.
+              </p>
+
               <p>
                 In the canvas, click the mouse and hold it to
                 stretch the shape out from where you clicked. Some
                 shapes can change proportion (e.g., rectangle and
-                oval), others cannot (e.g., square and circle).
+                oval may be wider than tall, or taller than wide),
+                others cannot (e.g., square and circle).
               </p>
 
               <p>