[sawfish: 1/6] News and doc that sawfish.wm.defaults is always read, regardless of .sawfishrc existence.

[Christopher Bratusek <chrisb src gnome org>]

commit 71b2994617da9dc5b98249b500c96b9468700e67
Author: Teika kazura <teika lavabit com>
Date:   Mon Oct 12 16:27:21 2009 +0900

    News and doc that sawfish.wm.defaults is always read, regardless of .sawfishrc existence.

 ChangeLog                   |    6 ++++++
 lisp/sawfish/wm/defaults.jl |    5 +++--
 lisp/sawfish/wm/user.jl     |    2 +-
 man/faq.texi                |   34 ++++++++++++----------------------
 man/news.texi               |   11 +++++++++--
 5 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1343bef..65b2768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-15  Teika kazura <teika lavabit com>
+	* lisp/sawfish/wm/defaults.jl
+	* lisp/sawfish/wm/user.jl
+	* man/faq.texi
+	* man/news.texi: News and doc that sawfish.wm.defaults is always read, regardless of .sawfishrc existence.
+
 2009-10-09  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/menus.jl: added "Reload Appsmenu" entry
 
diff --git a/lisp/sawfish/wm/defaults.jl b/lisp/sawfish/wm/defaults.jl
index 980481b..186505d 100644
--- a/lisp/sawfish/wm/defaults.jl
+++ b/lisp/sawfish/wm/defaults.jl
@@ -1,4 +1,4 @@
-;; sawfish-default.jl -- default user startup
+;; defaults.jl -- do some user supports before loading rc file
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
@@ -20,7 +20,8 @@
 
 ;; Commentary:
 
-;; This file provides defaults for users without .sawfishrc files
+;; This used to be read only if .sawfishrc lacks, thus named
+;; "defaults", but starting from Sawfish-1.6, it is always read.
 
 (declare (in-module user))
 
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 40a5644..c9a128d 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -81,7 +81,7 @@
 
 	  (when (and (file-exists-p "~/.sawmillrc")
 	             (not (file-exists-p "~/.sawfishrc")))
-	    (rename-file "~/.sawmillrc" "~/sawfishrc")
+	    (rename-file "~/.sawmillrc" "~/.sawfishrc")
 	    (message "Renamed file ~/.sawmillrc -> ~/.sawfishrc"))
 
 	  ;; First the site-wide stuff
diff --git a/man/faq.texi b/man/faq.texi
index 55d85bc..72b3b4a 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -43,35 +43,25 @@ code. The GUI can be run by middle-clicking background ->
 ``Customize''. Most customizations similar to other window managers
 can be done through GUI.
 
-For customizations by lisp, first understand that in the startup, three
-files are read, in the order: @file{sawfish-defaults},
- file{~/.sawfish/custom}, @file{.sawfishrc}.
+For customizations by lisp, first understand that in the startup, files
+ file{~/.sawfish/custom}, @file{.sawfishrc} are read in this order.
 
 @table @asis
- item @file{sawfish-defaults}
-This is a system default lisp library. It loads some of the common
-window manager features. More precisely, it currently does:
-
- itemize
- item GNOME setup, by opening @code{sawfish.wm.integration.gnome},
-if GNOME is running.
- item KDE setup, by opening @code{sawfish.wm.integration.kde},
-if KDE is running.
- item Error handling enhancements, by opening 
- code{sawfish wm ext error-handler} 
- end itemize
 @item @file{~/.sawfish/custom}
-This stores customizations created by the configurator GUI; it
-shouldn't really be edited manually.
+This file is created and edited by the configurator GUI, and stores
+customizations. It shouldn't really be edited manually.
 
 @item @file{~/.sawfish/rc}  or @file{~/.sawfishrc}
 This is the file you edit. It is a hand written lisp code, and almost
-all explicit customization should be done here.
+all explicit customizations should be done here.
+
+Choose the filename either @file{~/.sawfish/rc} or
+ file{~/.sawfishrc}. The former is recommended, because the directory
+ file{~/.sawfish} is anyway created to store @file{custom}, and you
+can also put other lisp scripts, like user-contributed codes there.
 
-Choose either @file{~/.sawfish/rc} or @file{~/.sawfishrc}. The
-former is recommended, because the directory @file{~/.sawfish} is
-anyway created to store @file{custom}, and you can also put other lisp
-scripts, like user-contributed codes there.
+Sawfish < 1.6 reads @file{sawfish-defaults} by default only if
+ file{~/.sawfishrc} lacks, but now it is always read.
 @end table
 
 @item How do I bind a key to execute a shell command?
diff --git a/man/news.texi b/man/news.texi
index 0a27dd1..e7f7356 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -32,9 +32,16 @@ they occurred between. For more detailed information see the
 @item Sawfish now got an implementation of the FDO (freedesktop.org) application menu, it is
 beeing generated, if there's no customized apps-menu
 
- item Since v1.5.0 @code{~/.sawmillrc} is no longer a valid resoucefile, from this version on,
+ item User config file changes
+
+In Sawfish < 1.6, @code{sawfish.wm.defaults} is loaded by default,
+only if the @file{~/.sawfishrc} lacks. Now, it is always read, so you
+don't have to @code{require} it. It sets up GNOME and KDE support if
+they run, and does @code{(require 'sawfish.wm.ext.error-handler)}.
+
+Since v1.5.0 @code{~/.sawmillrc} is no longer a valid resoucefile, from this version on,
 Sawfish will rename @code{~/.sawmillrc} to @code{~/.sawfishrc}, if the former does exist on
-your system, but the later doesn't
+your system, but the latter doesn't.
 
 @item @code{sawfish-ui} has been renamed to @code{sawfish-config}