[sawfish: 6/6] Merge branch 'teika'

[Christopher Bratusek <chrisb src gnome org>]

commit 1e6caae210b82ab3650fab191d505c812640ba9d
Merge: 3e4c69f... b8b7a8a...
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Dec 12 10:04:10 2009 +0100

    Merge branch 'teika'
    
    Conflicts:
    	ChangeLog

 ChangeLog                                 |   19 ++++
 OPTIONS                                   |    3 +
 lisp/sawfish/wm/integration/gnome.jl      |    2 +-
 lisp/sawfish/wm/integration/kde.jl        |    2 +-
 lisp/sawfish/wm/integration/standalone.jl |   37 ++++----
 lisp/sawfish/wm/user.jl                   |    4 +-
 lisp/sawfish/wm/util/compat.jl            |   13 ---
 man/faq.texi                              |    8 +-
 man/news.texi                             |   29 +++---
 man/sawfish.texi                          |  134 ++++++++++++++++-------------
 10 files changed, 137 insertions(+), 114 deletions(-)
---
diff --cc ChangeLog
index aebefa5,5583c9b..bf757f8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,21 +1,25 @@@
++<<<<<<< HEAD
 +2009-12-12  Christopher Bratusek <zanghar freenet de>
 +	* README.IMPORTANT: updated
 +
+ 2009-12-12  Teika Kazura <teika lavabit com>
+ 	* man/faq.texi
+ 	* man/news.texi
+ 	* man/sawfish.texi: Doc for poweroff.
+ 
+ 	* man/sawfish.texi: Small reorganization.
+ 
+ 	* lisp/sawfish/wm/util/compat.jl: Outdated part deletion.
+ 	                                  Declaration as obsolete for 'sawfish-directory' and so on are not necessary now, after purge of 'sawmill'.
+ 	                                  Deleted codes are harmless, but confusing.
+ 
+ 	* OPTIONS
+ 	* lisp/sawfish/wm/integration/gnome.jl
+ 	* lisp/sawfish/wm/integration/kde.jl
+ 	* lisp/sawfish/wm/integration/standalone.jl
+ 	* lisp/sawfish/wm/user.jl
+ 	* man/news.texi: Poweroff refinements. Describes the option if you want poweroff menu. Option "extra-session-menu" is renamed to 'want-poweroff-menu'.
+ 
  2009-12-08  Christopher Bratusek <zanghar freenet de>
  	* debian/rules
  	* debian/control: depend on automake rather than on automake1.10