From 4097c3d14b181e429ff7d7c5d564bcd9dd0f0afe Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Thu, 15 Feb 2007 08:02:52 +0000
Subject: [PATCH] Example tuxpaint.conf has been updated to include newer
 options.

---
 docs/CHANGES.txt  |  4 +++-
 src/tuxpaint.conf | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 496210803..264444684 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/
 $Id$
 
 
-2007.January.10 (0.9.17)
+2007.January.21 (0.9.17)
 
   * Tool Improvements:
     ------------------
@@ -34,6 +34,8 @@ $Id$
 
     * Expanded MinGW/MSYS GCC compilation instructions for building Win32.
 
+    * Example tuxpaint.conf has been updated to include newer options.
+
   * Bug Fixes:
     ----------
     * Tux the Penguin sound effects were not working; fixed.
diff --git a/src/tuxpaint.conf b/src/tuxpaint.conf
index 9c226ba2a..f005af4f5 100644
--- a/src/tuxpaint.conf
+++ b/src/tuxpaint.conf
@@ -5,7 +5,7 @@
 #
 # Bill Kendrick <bill@newbreedsoftware.com>
 # Default distribution version last modified:
-# October 24, 2004
+# January 21, 2007
 
 
 # The variables described below are initially commented out.
@@ -39,15 +39,18 @@
 # windowed=yes
 
 
-### Window size / screen resolution.  (640x480 is the default.)
+### Window size / screen resolution.  (800x600 is the default.)
+### (Any size 640-or-wider by 480-or-taller should work.)
+### NOTE: This affects canvas (drawing area) size.
 ### -----------------------------------------------------------
 # 
-# windowsize=1600x1200
-# windowsize=1400x1050
-# windowsize=1280x1024
-# windowsize=1024x768
 # windowsize=800x600
-# windowsize=640x480
+
+### Window / screen orientation.  (Landscape (no rotation) is the default.)
+### -----------------------------------------------------------------------
+# 
+# orient=portrait
+# orient=landscape
 
 
 ### Disable sound effects?
@@ -91,13 +94,13 @@
 
 ### Use a different print command?
 ### ------------------------------
-### Note: The command should expect a PNG file on its STDIN (standard-in)
+### Note: The command should expect PostScript on its STDIN (standard-in)
 ### 
 ### For example, to convert the image to greyscale before converting
-### to PostScript, use "pngtopnm | ppmtopgm | pnmtops | lpr" as the command
+### to PostScript, use "pstopnm | ppmtopgm | pnmtops | lpr" as the command
 # 
 # printcommand={COMMAND}
-# printcommand=pngtopnm | pnmtops | lpr
+# printcommand=lpr
 
 
 ### Use the simpler shape tool? (No rotating)