Merge branch 'icewm-1-4-BRANCH'

man/icesh.pod

@@ -765,6 +765,10 @@ Let icewm restart itself.
 
 Let icewm execute the C<SuspendCommand>.
 
+=item B<hibernate>
+
+Let icewm execute the C<HibernateCommand>.
+
 =item B<winoptions>
 
 Let icewm reload the C<winoptions>.
@@ -773,6 +777,10 @@ Let icewm reload the C<winoptions>.
 
 Let icewm reload the C<keys> file.
 
+=item B<refresh>
+
+Let icewm refresh the desktop background.
+
 =item B<guievents>
 
 Monitor the B<ICEWM_GUI_EVENT> property and report all changes.

man/icesound.pod

@@ -12,7 +12,7 @@ B<icesound> [I<OPTIONS>]
 
 The L<icewm(1)> window manager generates so-called GUI events in
 response to interesting actions, like opening or closing of application
-windows, switching of work space, etc.  GUI events are a property of the
+windows, switching of workspace, etc.  GUI events are a property of the
 X root window.  L<icewm(1)> changes this property whenever a new GUI
 event occurs.  Interested applications can listen for changes to this
 property.  There are nearly twenty GUI events defined.
@@ -107,6 +107,11 @@ Lists the supported sound file names and exits.
 
 Lists the supported audio interfaces and exits.
 
+=item B<-o>, B<--output=FILE>
+
+Redirect all output to I<FILE>.
+A leading tilde or environment variable is expanded.
+
 =item B<-v>, B<--verbose>
 
 Be verbose and print some information when sound events occur.

man/icewm-keys.pod

@@ -15,8 +15,8 @@
 =head2 DESCRIPTION
 
 The C<keys> file defines global keybindings to launch applications.
-A keybinding has three parts. The word B<key>, a double-quoted string
-with an X11 key combination, and a program with its arguments.
+A keybinding has three parts: the word B<key>, a double-quoted string
+with an X11 key combination and a program with its arguments.
 These are separated by one or more spaces. Empty lines are allowed.
 Comment lines start with a hash.
 
@@ -27,9 +27,9 @@ For example, the following defines a hotkey to restart B<icewm>:
 See the output of C<xmodmap -pk> for a list of the many keystroke names
 you can use in icewm key definitions. Since IceWM version 3.4.0,
 bindings can not only be defined by their keystroke name, but also by
-their key label. In addition, the shifted key is available as well.
+their key label. In addition, the shifted key is now definable as well.
 For example, the key with + and = can be bound in either of the
-following four ways, which here are identical:
+following four ways, which are identical:
 
     key "Ctrl+Shift+equal"  xterm
     key "Ctrl+Shift+="      xterm
@@ -72,8 +72,9 @@ C<Pointer_Button1> and up, like C<Shift+Pointer_Button3>.
 
 =item I<program> I<options>
 
-I<program> is the name of the executable or its full path.
-The path may start with $HOME or a tilde, which will be expanded.
+I<program> is the name of the executable or its path.
+It may start with a tilde or an environment variable,
+which will be expanded.
 The I<options> are passed as arguments to the I<program>.
 
 =item B<switchkey>

man/icewm-menu-fdo.pod

@@ -99,6 +99,8 @@ Print the program version to F<stdout> and exit.
 
 Print copying permissions to F<stdout> for the program and exit.
 
+=back
+
 =head2 USAGE
 
 This utility is not normally used directly. It is used as the

man/icewm-preferences.pod

@@ -41,6 +41,12 @@ Synchronize X11 for debugging (slow)
 
 Enable event logging for debugging
 
+=item B<OutputFile>=""
+
+Redirect all output to I<FILE>.
+A leading tilde or environment variable is expanded.
+This file is truncated on startup if it exceeds 5 KB.
+
 =item B<Splash>=""
 
 Splash image on startup (IceWM.jpg)
@@ -1026,15 +1032,19 @@ Command to start logout.
 
 Command to cancel logout.
 
-=item B<ShutdownCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff; } ||:""
+=item B<ShutdownCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff || loginctl poweroff; } ||:""
 
 Command to shutdown the system.
 
-=item B<RebootCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot; } ||:""
+=item B<RebootCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot || loginctl reboot; } ||:""
 
 Command to reboot the system.
 
-=item B<SuspendCommand>="test -e /run/systemd/system && systemctl suspend"
+=item B<SuspendCommand>="test -e /run/systemd/system && systemctl suspend || loginctl suspend"
+
+Command to hibernate the system.
+
+=item B<SuspendCommand>="test -e /run/systemd/system && systemctl suspend || loginctl suspend"
 
 Command to send the system to standby mode
 
@@ -1732,19 +1742,11 @@ Incoming load on the network monitor.
 
 Idle (non) load on the network monitor, leave empty to force transparency.
 
-=item B<DesktopBackgroundColor>=""
-
-Desktop background color(s).
-
-=item B<DesktopTransparencyColor>=""
-
-Color(s) to announce for semitransparent windows.
-
 =back
 
 =head3 DESKTOP BACKGROUND
 
-The following preferences are read by L<icewmbg(1)>:
+The following themeable preferences are read by L<icewmbg(1)>:
 
 =over
 
@@ -1758,11 +1760,13 @@ Resize desktop background to full screen.
 
 =item B<DesktopBackgroundColor>=""
 
-Desktop background color(s).
+A comma-separated list of zero or more desktop background colors.
 
 =item B<DesktopBackgroundImage>=""
 
-Desktop background image(s).
+A comma-separated list of zero or more desktop background images.
+Each image may be a path with a L<glob(7)> pattern, or start with a
+tilde or environment variable.
 
 =item B<ShuffleBackgroundImages>=0  0/1
 
@@ -1779,6 +1783,7 @@ Color(s) to announce for semitransparent windows.
 =item B<DesktopTransparencyImage>=""
 
 Image(s) to announce for semitransparent windows.
+This is a list similar to B<DesktopBackgroundImage>.
 
 =item B<DesktopBackgroundMultihead>=0  0/1
 

man/icewm-session.pod

@@ -35,6 +35,7 @@ Use I<FILE> as the IceWM window manager.
 =item B<-o>, B<--output=FILE>
 
 Redirect all output to I<FILE>.
+A leading tilde or environment variable is expanded.
 
 =item B<-a>, B<--alpha>
 

man/icewm-winoptions.pod

@@ -66,8 +66,6 @@ Lastly, the I<OPTION: VALUE> pair refer to the options and values
 described below. A line with just a dot, followed by an option/value
 pair, applies to all windows.
 
-=back
-
 =head2 OPTIONS
 
 There are four categories: I<general>, I<function>, I<decor> and

man/icewm.pod

@@ -48,7 +48,7 @@ applications, and to a small set of monitoring applets.
 
 The background setting application. It can assign plain background color
 or images in different formats to the X background.  Each workspace can
-have its own background.  It supports semi-transparency. Semitransparent
+have its own background.  It supports semitransparency. Semitransparent
 background image and colour can be configured. When the background image
 has changed then L<icewmbg(1)> can be notified to update the background.
 Multi-head monitor setups are fully supported.  See the L<icewmbg(1)>.
@@ -120,6 +120,11 @@ the look and feel of B<icewm>, like colors, fonts and buttons.
 Connect to the X11 server on I<DISPLAY>.  By default
 the environment variable C<DISPLAY> is used.
 
+=item B<-o>, B<--output=FILE>
+
+Redirect all output to I<FILE>.
+A leading tilde or environment variable is expanded.
+
 =item B<--sync>
 
 This option specifies to use a slower synchronous communication mode

man/icewmbg.pod

@@ -11,15 +11,15 @@ B<icewmbg> [I<OPTIONS>]
 =head2 DESCRIPTION
 
 B<icewmbg> can assign a colour or image to the I<X11> desktop background.
-Common image formats are supported.  Each L<icewm(1)> work space can have
+Common image formats are supported.  Each L<icewm(1)> workspace can have
 its own background.
 
 When the background image changes, B<icewmbg> can be notified to
-update the background.  When switching work spaces, it checks the image
+update the background.  When switching workspaces, it checks the image
 file modification time.  If the file has changed, it reloads the
 image from file.
 
-B<icewmbg> supports semi-transparency.  Semitransparent background
+B<icewmbg> supports semitransparency.  Semitransparent background
 images and colours can be configured.
 
 It uses RandR or Xinerama to support backgrounds on all connected
@@ -31,6 +31,10 @@ It will update the C<_ICEWMBG_IMAGE> property of the root window to the
 path of the background image whenever it changes the desktop background.
 
 B<icewmbg> is started automatically by L<icewm-session(1)>.
+If there is just a single background for all workspaces, icewmbg may
+conclude that it can safely exit after setting the desktop background,
+to free its system memory.  If the screen size changes, icewm will then
+attempt to restart icewmbg, preferably via icewm-session.
 
 =head2 OPTIONS
 
@@ -44,6 +48,7 @@ from that directory are used in sorted order.
 If the value starts with an exclamation mark, as in I<!FILE>,
 the images from the directory I<FILE> are permuted randomly.
 Image file names or directory names may have L<glob(7)> wildcards,
+or they may start with a tilde or environment variable.
 
 =over
 
@@ -118,6 +123,11 @@ This overrules the C<DesktopBackgroundMultihead> preference.
 Cycle over the list of background images every I<SECONDS>.
 This overrules the C<CycleBackgroundsPeriod> preference.
 
+=item B<-o>, B<--output=FILE>
+
+Redirect all output to I<FILE>.
+A leading tilde or environment variable is expanded.
+
 =back
 
 =head2 GENERAL OPTIONS
@@ -172,22 +182,22 @@ The settings read are:
 
 If these settings are set in the F<preferences> file, they can
 be overridden by the theme in the theme defaults file.
-To prevent this, set these preferences in F<prefoverride> instead.
+To enforce a certain setting, set it in the F<prefoverride> file instead.
 See L<icewm-prefoverride(5)>.
 
-=head2 WORK SPACES
+=head2 WORKSPACES
 
-Each work space can have a unique image. Specify multiple images to
+Each workspace can have a unique image. Specify multiple images to
 B<DesktopBackgroundImage> separated by comma's.  Or give at least one
-directory with images. The images are assigned to each work space in
-the order given. When icewm changes work space, the running icewmbg
+directory with images. The images are assigned to each workspace in
+the order given. When icewm changes workspace, the running icewmbg
 will adapt the desktop background to the assigned image.
 
-If you specify more images then there are work spaces, then
+If you specify more images then there are workspaces, then
 B<CycleBackgroundsPeriod> can set a period. When the period expires,
 icewmbg will switch to the next set of images. If you give less images
-than there are work spaces, then icewmbg will reuse previous images
-for the remaining work spaces.
+than there are workspaces, then icewmbg will reuse previous images
+for the remaining workspaces.
 
 =head2 IMAGE SCALING
 
@@ -203,7 +213,7 @@ What happens for their combination is given by the following table:
 
 =head2 EXAMPLES
 
-    # For four unique desktop backgrounds for four work spaces do:
+    # For four unique desktop backgrounds for four workspaces do:
 
     icewmbg -p -i image0,image1,image2,image3 &
 
@@ -230,7 +240,7 @@ B<icewmbg> will terminate.
 =item B<SIGUSR1>
 
 B<icewmbg> will reshuffle the list of background images and
-update the backgrounds of all work spaces.
+update the backgrounds of all workspaces.
 
 =back