Removed a dup, adding some missing ones, FIXME for other missing ones.

2 files changed, 27 insertions, 19 deletions

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 4cfe155..67beee8 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -6,9 +6,9 @@ Copyright (c) 2002-2009 by Bill Kendrick and others
 bill@newbreedsoftware.com
 http://www.tuxpaint.org/
 
-$Id: CHANGES.txt,v 1.733 2010/04/13 17:26:55 wkendrick Exp $
+$Id: CHANGES.txt,v 1.734 2010/04/15 19:57:40 wkendrick Exp $
 
-2009.April.13 (0.9.22)
+2009.April.15 (0.9.22)
   * New Tools:
     ----------
     * Label - A tool to add text to a drawing, which can be modified or
@@ -224,6 +224,9 @@ $Id: CHANGES.txt,v 1.733 2010/04/13 17:26:55 wkendrick Exp $
     * tuxpaint-import tool uses BASHisms, so changed shebang to #!/bin/bash
       (instead of #!/bin/sh).
 
+    * Added some missing examples to the default tuxpaint.conf file.
+      (Thanks to Aapo Rantalainen <aapo.rantalainen@gmail.com>)
+
 
 2009.June.28 (0.9.21)
   * New Starters:
diff --git a/src/tuxpaint.conf b/src/tuxpaint.conf
index a04717f..89dbba3 100644
--- a/src/tuxpaint.conf
+++ b/src/tuxpaint.conf
@@ -7,9 +7,12 @@
 # http://www.tuxpaint.org/
 #
 # Default distribution version last modified:
-# June 25, 2007
+# April 15, 2010
 # 
-# $Id: tuxpaint.conf,v 1.6 2007/06/25 18:00:51 wkendrick Exp $
+# $Id: tuxpaint.conf,v 1.7 2010/04/15 19:57:40 wkendrick Exp $
+
+
+# FIXME: Add alllocalefonts, allowscreensaver, stampsize, datadir, nolockfile -bjk 2010.04.15
 
 
 # The variables described below are initially commented out.
@@ -33,7 +36,7 @@
 #     system-wide configuration file, and which they don't want to always have
 #     to override via command-line options.
 #
-# For more information, see Tux Paint's main documentation file:  README.txt
+# For more information, see Tux Paint's "OPTIONS" documentation file
 
 
 ### Fullscreen or Windowed?
@@ -50,6 +53,15 @@
 # 
 # windowsize=800x600
 
+
+### Use native screen size when in fullscreen.
+### (Overrides 'windowsize' or default (800x600) when in fullscreen,
+### and tries to make Tux Paint fit in the current desktop resolution.)
+### -------------------------------------------------------------------
+# 
+# native=yes
+
+
 ### Window / screen orientation.  (Landscape (no rotation) is the default.)
 ### -----------------------------------------------------------------------
 # 
@@ -201,13 +213,6 @@
 # dontmirrorstamps=yes
 
 
-### Use keyboard arrow keys to control mouse pointer?
-### -------------------------------------------------
-#
-# keyboard=yes
-# mouse=yes
-
-
 ### Disable 'Save Over Older Picture?' Prompt
 ### Always save over, instead
 ### -----------------------------------------
@@ -216,13 +221,6 @@
 # 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
 ### -----------------------------------------
@@ -238,6 +236,13 @@
 # save=yes
 
 
+### Save images somewhere different?
+### --------------------------------
+### Note: Window users, use the form:  savedir=C:\WINDOWS\TUXPAINT
+#
+# savedir=~/.tuxpaint/saved
+
+
 ### Use a different language?
 ### -------------------------
 ### Note: Where the language is a known language name (e.g., "spanish")