[sawfish: 1/6] Doc for poweroff.

[Christopher Bratusek <chrisb src gnome org>]

commit 393bae1fbace2ce3c36d38d3e477f14bb17f762a
Author: Teika kazura <teika lavabit com>
Date:   Tue Dec 8 20:29:38 2009 +0900

    Doc for poweroff.

 man/faq.texi     |    8 ++++----
 man/news.texi    |   29 ++++++++++++++---------------
 man/sawfish.texi |   38 +++++++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/man/faq.texi b/man/faq.texi
index 6705da3..2f2dbb2 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -173,12 +173,12 @@ So @emph{don't} run the net server with X access control disabled
 
 From a shell lauch the following command: @code{sawfish-client -q -f restart}
 
- item Reboot and shutdown privilege.
+ item Shutdown privilege.
 
 The Sawfish root-menu has a ``session'' sub-menu which allows you to
-reboot and shutdown your machine. If you use GNOME or KDE, no
-additional work is required. But if you use Sawfish standalone, the user
-needs the privilege to execute @code{shutdown} command.
+shutdown your machine. If you use GNOME or KDE, no additional work is
+required. But if you use Sawfish standalone, the user needs the
+privilege to execute @code{shutdown} command.
 
 You can do it, for example, with @code{sudo} combined with user group
 @code{shutdown}:
diff --git a/man/news.texi b/man/news.texi
index 80da618..11a0825 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -116,17 +116,6 @@ defined in the module cited above. Variable @code{display-url-command} is
 renamed to @code{browser-program}.
 @end itemize
 
- item Poweroff actions
-
-Added poweroff command for letting none KDE/GNOME users easily
-reboot, halt, suspend or hibernate their machine. The commands
-beeing used to do so are also user-settable. In addition, when
-it's used to reboot or halt, when we call the `before-exit-hook'
-and `map-windows delete-window' before actually rebooting or halting,
-to ensure everything is fine on the next startup. Furthermore
-entries to the session-menu are beeing added. If you're using
-KDE or GNOME then those are not generated.
-
 @item Bugs fixed:
 @itemize @minus
 
@@ -207,10 +196,6 @@ own applications menu and auto generated one, then set your own in
 
 Root and Window-History menus are revamped, too. [Christopher Bratusek]
 
-Now you can reboot and shutdown your computer from the root menu ->
-``session'', but the user needs the appropriate privilege. For a way
-to do so, see @xref{FAQ}, ``Reboot and shutdown privilege'' section.
-
 @item Added options to change the font color of window title, independent of used theme [Matthew Love, Christopher Bratusek, Timo Korvola]
 
 Internally, a new function @code{remove-frame-part-value} which allows to change/remove values from frame-parts is used. [Timo Korvola]
@@ -307,6 +292,20 @@ added.
 Unless set by user, konsole and konqueror are used for user options
 @code{xterm-program} and @code{browser-program}.
 
+ item Poweroff from menu
+
+Added poweroff commands in menu for non KDE/GNOME users.
+They are reboot, halt, suspend and hibernate. The used shell commands
+can be set from configurator, under ``Misc'' -> ``External
+Applications''.
+
+User needs the appropriate privilege. For a way to do so, see
+ xref{FAQ}, ``Shutdown privilege'' section.
+
+Reboot and halt call @code{before-exit-hook} and do
+ code{delete-window} to each window before actually rebooting or
+halting, to ensure everything is fine on the next startup.
+
 @item New Frame Classes [Christopher Bratusek] @*
 A ``frame class'' defines frame component. There's no user visible
 changes.
diff --git a/man/sawfish.texi b/man/sawfish.texi
index 3bcae36..a845a1b 100644
--- a/man/sawfish.texi
+++ b/man/sawfish.texi
@@ -5575,23 +5575,6 @@ Calls the function of the same name.  @code{destroy-window} and
 @code{kill-client} both take @code{%W} as argument.
 @end defun
 
- defun poweroff @var{action}
-A function for rebooting, halting, suspending and hibernating
-your machine. Normally this is only used when running outside
-of GNOME or KDE, as their functions for doing so are beeing used then.
-
-The following @var{action} calls the following command:
-
- var{reboot}    @code{reboot-command}
- var{halt}      @code{halt-command}
- var{suspend}   @code{suspend-command}
- var{hibernate} @code{hibernate-command}
-
-Plus when @var{action} is @var{reboot} or @var{halt}, the
- code{before-exit-hook} and afterwards @code{map-windows delete-windows},
-to ensure we safely quit the current session.
- end defun
-
 @node Keymaps, Event Loop, Commands, Top
 @chapter Keymaps
 @cindex Keymaps
@@ -6363,6 +6346,27 @@ A string containing the name of the X display, exactly as passed to
 Sawfish.  For example: @code{":0"}, or @code{"foo:0.0"}.
 @end defvar
 
+ defun poweroff action
+A function for rebooting, halting, suspending and hibernating
+your machine. Normally this is only used when running outside
+of GNOME or KDE; they provied their own versions of functions.
+
+ var{action} is a symbol, and each invokes the shell command
+defined by the variable as follows:
+
+ multitable @columnfractions .2 .5
+ headitem @var{action} @tab variable
+ item @code{reboot} @tab @code{reboot-command}
+ item @code{halt} @tab @code{halt-command}
+ item @code{suspend} @tab @code{suspend-command}
+ item @code{hibernate} @tab @code{hibernate-command}
+ end multitable
+
+When @var{action} is @code{reboot} or @code{halt}, 
+ code{before-exit-hook} is called, and @code{delete-windows} is
+applied to each window to ensure we safely quit the current session.
+ end defun
+
 @defvar saved-command-line-args
 Holds a list of all of the command line arguments (including the
 executable name).