From 775f61eb3296d5df08b41dd669b78dc292744480 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sat, 27 Sep 2003 08:30:41 +0000
Subject: [PATCH] Added some missing example configs to default config file.

---
 docs/CHANGES.txt  |  3 ++
 docs/TODO.txt     |  2 +-
 src/tuxpaint.conf | 74 +++++++++++++++++++++++++++++++++++++----------
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 404b69814..f28ad22b5 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -59,6 +59,9 @@ http://www.newbreedsoftware.com/tuxpaint/
     Korean, Japanese, Indonesian, Hebrew, Greek, Danish, Czech, Chinese
     and Catalan.
 
+  * Updated default configuration file to include examples of some newer
+    options.
+
 
 2003.Aug.18 (0.9.12)
   * Replaced "efont-serif" fonts with those from the 'ttf-freefont' package,
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 977d076a3..9ac501a7f 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -71,7 +71,7 @@ HIGH-PRIORITY TRANSLATION STUFF:
   * Make right-to-left strings not wordwrap with the shortest line at
     the top!
 
-  * Finish current translations.
+  * Finish current translations.  (Especially documentation!)
 
 
 LOW-PRIORITY TRANSLATION STUFF:
diff --git a/src/tuxpaint.conf b/src/tuxpaint.conf
index 062561bcd..b0bf54914 100644
--- a/src/tuxpaint.conf
+++ b/src/tuxpaint.conf
@@ -5,7 +5,7 @@
 #
 # Bill Kendrick <bill@newbreedsoftware.com>
 # Default distribution version last modified:
-# February 1, 2003
+# September 27, 2003
 
 
 # The variables described below are initially commented out.
@@ -78,6 +78,13 @@
 # printdelay=0
 
 
+### Use stored printer configuration?
+### ---------------------------------
+#
+# printcfg=yes
+# printcfg=no
+
+
 ### Use a different print command?
 ### ------------------------------
 ### Note: The command should expect a PNG file on its STDIN (standard-in)
@@ -103,13 +110,6 @@
 # mixedcase=yes
 
 
-### Don't use special mouse pointer (cursor) shapes?
-### ------------------------------------------------
-#
-# nofancycursors=yes
-# fancycursors=yes
-
-
 ### Grab the mouse and keyboard?
 ### ----------------------------
 #
@@ -117,6 +117,13 @@
 # dontgrab=yes
 
 
+### Disable [Control] key shortcuts?
+### --------------------------------
+#
+# noshortcuts=yes
+# shortcuts=yes
+
+
 ### Disable wheel mouse support?
 ### ----------------------------
 #
@@ -124,6 +131,13 @@
 # wheelmouse=yes
 
 
+### Don't use special mouse pointer (cursor) shapes?
+### ------------------------------------------------
+#
+# nofancycursors=yes
+# fancycursors=yes
+
+
 ### Use the keyboard to control the mouse pointer (cursor)?
 ### -------------------------------------------------------
 #
@@ -138,6 +152,34 @@
 # outlines=yes
 
 
+### Disable the Stamp tool?
+### -----------------------
+#
+# nostamps=yes
+# stamps=yes
+
+
+### Disable Stamp controls (flip, mirror, size)?
+### --------------------------------------------
+# 
+# nostampcontrols=yes
+# stampcontrols=yes
+
+
+### Show mirrored stamps by default? (e.g., for those prefering right-to-left)
+### --------------------------------------------------------------------------
+#
+# mirrorstamps=yes
+# dontmirrorstamps=yes
+
+
+### Use keyboard arrow keys to control mouse pointer?
+### -------------------------------------------------
+#
+# keyboard=yes
+# mouse=yes
+
+
 ### Disable 'Save Over Older Picture?' Prompt
 ### Always save over, instead
 ### -----------------------------------------
@@ -146,6 +188,13 @@
 # saveover=ask
 
 
+### Save images somewhere different?
+### --------------------------------
+### Note: Window users, use the form:  savedir=C:\WINDOWS\TUXPAINT
+#
+# savedir=~/.tuxpaint/saved
+
+
 ### Disable 'Save Over Older Picture?' Prompt
 ### Always make a new picture, instead
 ### -----------------------------------------
@@ -154,19 +203,12 @@
 # saveover=ask
 
 
-### Save images somewhere different?
-### --------------------------------
-#
-# savedir={PATH}
-# savedir=~/.tuxpaint/saved
-
-
 ### Use a different language?
 ### -------------------------
 ### Note: Where the language is a known language name (e.g., "spanish")
 ### 
 ### For a full list, see tuxpaint(1) man page, README.txt documentation,
-### or usage output ("tuxpaint --usage")
+### or language usage output (by running the command "tuxpaint --lang help")
 #
 # lang={LANGUAGE}
 # lang=english