Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/fluxbox.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -34,6 +34,8 @@
     <title>Introduction to Fluxbox</title>
 
-    <para>The <application>Fluxbox</application> package contains a window
-    manager.</para>
+    <para>
+      The <application>Fluxbox</application> package contains a window
+      manager.
+    </para>
 
     &lfs91_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&fluxbox-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&fluxbox-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &fluxbox-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &fluxbox-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &fluxbox-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &fluxbox-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&fluxbox-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&fluxbox-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &fluxbox-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &fluxbox-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &fluxbox-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &fluxbox-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,5 +78,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
+    <para role="required">
+      <xref linkend="x-window-system"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -70,5 +86,6 @@
       <xref role="runtime" linkend="dbus"/> (runtime),
       <xref linkend="fribidi"/>, and
-      <xref linkend="imlib2"/> (if you wish to use other image formats in addition to XPM)
+      <xref linkend="imlib2"/> (if you wish to use other image formats in
+      addition to XPM)
     </para>
 
@@ -81,13 +98,19 @@
     <title>Installation of Fluxbox</title>
 
-    <para>Install <application>Fluxbox</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Fluxbox</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not have a working testsuite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not have a working testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -101,7 +124,9 @@
       <title>Config Files</title>
 
-      <para><filename>~/.fluxbox/init</filename>,
-      <filename>~/.fluxbox/keys</filename>, and
-      <filename>~/.fluxbox/menu</filename></para>
+      <para>
+        <filename>~/.fluxbox/init</filename>,
+        <filename>~/.fluxbox/keys</filename>, and
+        <filename>~/.fluxbox/menu</filename>
+      </para>
 
       <indexterm zone="fluxbox fluxbox-config">
@@ -122,8 +147,10 @@
       <title>Configuration Information</title>
 
-      <para>If <application>Fluxbox</application> is the only Window Manager
-      you want to use, you can start it with an <filename>.xinitrc</filename>
-      file in your home folder. Be sure to backup your
-      current <filename>.xinitrc</filename> before proceeding.</para>
+      <para>
+        If <application>Fluxbox</application> is the only Window Manager
+        you want to use, you can start it with an <filename>.xinitrc</filename>
+        file in your home folder. Be sure to backup your
+        current <filename>.xinitrc</filename> before proceeding.
+      </para>
 
       <indexterm zone="fluxbox fluxbox-config">
@@ -133,10 +160,11 @@
 <screen><userinput>echo startfluxbox &gt; ~/.xinitrc</userinput></screen>
 
-      <para>Or alternatively, if you use a login manager like
-      <application>GDM</application> or <application>LightDM</application> and would
-      like to be able to choose <application>Fluxbox</application> at the login
-      prompt, create a <filename>fluxbox.desktop</filename> file like this.</para>
-
-      <para>As <systemitem class="username">root</systemitem>:</para>
+      <para>
+        Or alternatively, if you use a login manager like
+        <xref linkend="gdm"/> or <xref linkend="lightdm"/>,
+        and would like to be able to choose <application>Fluxbox</application>
+        at the login prompt, create a <filename>fluxbox.desktop</filename>
+        file. As <systemitem class="username">root</systemitem>:
+      </para>
 
 <screen role="root"><userinput>mkdir -pv /usr/share/xsessions &amp;&amp;
@@ -150,11 +178,13 @@
 EOF</userinput></screen>
 
-      <para>If you didn't install <application>GDM</application>,
-      <application>SDDM</application>, or <application>LightDM</application>
-      in <filename class='directory'>/usr</filename>,
-      then change that command to fit the prefix you chose.</para>
-
-      <para>Now create the <application>Fluxbox</application> configuration
-      files:</para>
+      <para>
+        If you didn't install <xref linkend="gdm"/> or <xref
+        linkend="lightdm"/> in <filename class='directory'>/usr</filename>,
+        then change that command to fit the prefix you chose.
+      </para>
+
+      <para>
+        Now create the <application>Fluxbox</application> configuration files:
+      </para>
 
 <screen><userinput>mkdir -v ~/.fluxbox &amp;&amp;
@@ -162,29 +192,37 @@
 cp -v /usr/share/fluxbox/keys ~/.fluxbox/keys</userinput></screen>
 
-      <para>To generate the application menu, first you may wish to run
-      <command>fluxbox-generate_menu -h</command>, in order to choose any
-      <replaceable>&lt;user_options&gt;</replaceable>, then issue:</para>
-
-<screen><userinput>cd ~/.fluxbox &amp;&amp;
+      <para>
+        To generate the application menu, first you may wish to run
+        <command>fluxbox-generate_menu -h</command>, in order to choose any
+        <replaceable>&lt;user_options&gt;</replaceable>, then issue:
+      </para>
+
+<screen role="nodump"><userinput>cd ~/.fluxbox &amp;&amp;
 fluxbox-generate_menu <replaceable>&lt;user_options&gt;</replaceable></userinput></screen>
 
-      <para>Alternately, copy a pregenerated menu:</para>
+      <para>
+        Alternately, copy a pregenerated menu:
+      </para>
 
 <screen><userinput>cp -v /usr/share/fluxbox/menu ~/.fluxbox/menu</userinput></screen>
 
-      <para>Menu items are added by editing <filename>~/.fluxbox/menu</filename>.
-      The syntax is explained on the <command>fluxbox</command> man page.</para>
-
-      <para>If you want to use an image as your desktop background, copy the
-      theme you like into <filename class='directory'>~/.fluxbox</filename>.
-      Then add a line to make it use the correct image. In the following
-      command, change <replaceable>&lt;theme&gt;</replaceable> for the name of
-      the theme you want and change
-      <replaceable>&lt;/path/to/nice/image.ext&gt;</replaceable> to point to
-      the actual image you want to use, where <replaceable>ext</replaceable>
-      must be <quote>xpm</quote>, if <xref linkend="imlib2"/> is not installed
-      to allow other image formats.</para>
-
-<screen><userinput>cp /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
+      <para>
+        Menu items are added by editing <filename>~/.fluxbox/menu</filename>.
+        The syntax is explained on the <command>fluxbox</command> man page.
+      </para>
+
+      <para>
+        If you want to use an image as your desktop background, copy the
+        theme you like into <filename class='directory'>~/.fluxbox</filename>.
+        Then add a line to make it use the correct image. In the following
+        command, change <replaceable>&lt;theme&gt;</replaceable> for the name
+        of the theme you want and change
+        <replaceable>&lt;/path/to/nice/image.ext&gt;</replaceable> to point to
+        the actual image you want to use, where <replaceable>ext</replaceable>
+        must be <quote>xpm</quote>, if <xref linkend="imlib2"/> is not installed
+        to allow other image formats.
+      </para>
+
+<screen role="nodump"><userinput>cp /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
 
 sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init &amp;&amp;
@@ -195,8 +233,10 @@
 echo "background.pixmap: &lt;/path/to/nice/image.ext&gt;" >> ~/.fluxbox/theme/theme.cfg</userinput></screen>
 
-      <para>In some locales the font specified in the theme may not contain the
-      needed characters. This results in menus with blank items. You can fix
-      this by editing <filename>~/.fluxbox/theme</filename> with a text editor
-      and altering it so that it names a suitable font.</para>
+      <para>
+        In some locales the font specified in the theme may not contain the
+        needed characters. This results in menus with blank items. You can fix
+        this by editing <filename>~/.fluxbox/theme</filename> with a text
+        editor and altering it so that it names a suitable font.
+      </para>
 
     </sect3>
@@ -228,6 +268,8 @@
         <term><command>fluxbox</command></term>
         <listitem>
-          <para>is a window manager for <application>X11</application> based
-          on <application>Blackbox</application> 0.61.0.</para>
+          <para>
+            is a window manager for <application>X11</application> based
+            on <application>Blackbox</application> 0.61.0.
+          </para>
           <indexterm zone="fluxbox fluxbox-prog">
             <primary sortas="b-fluxbox">fluxbox</primary>
@@ -239,13 +281,15 @@
         <term><command>fbsetbg</command></term>
         <listitem>
-          <para>is a utility that sets the background image. It requires one
-          of the following at runtime:
-          <command>Esetroot</command>, <command>wmsetbg</command>,
-          <xref linkend="feh-prog"/>, <command>hsetroot</command>,
-          <command>chbg</command>, <xref linkend="display"/>,
-          <command>qiv</command>, <command>xv</command>,
-          <command>xsri</command>, <command>xli</command>, or <command>xsetbg</command>.
-          It also requires <xref linkend="which-prog"/> if <command>Esetroot</command> is
-          found.</para>
+          <para>
+            is a utility that sets the background image. It requires one
+            of the following at runtime:
+            <command>Esetroot</command>, <command>wmsetbg</command>,
+            <xref linkend="feh-prog"/>, <command>hsetroot</command>,
+            <command>chbg</command>, <xref linkend="display"/>,
+            <command>qiv</command>, <command>xv</command>,
+            <command>xsri</command>, <command>xli</command>, or
+            <command>xsetbg</command>. It also requires <xref
+            linkend="which-prog"/> if <command>Esetroot</command> is found.
+          </para>
           <indexterm zone="fluxbox fbsetbg">
             <primary sortas="b-fbsetbg">fbsetbg</primary>
@@ -257,6 +301,8 @@
         <term><command>fbsetroot</command></term>
         <listitem>
-          <para>is a utility to change root window appearance based on the
-          <application>Blackbox</application> application bsetroot.</para>
+          <para>
+            is a utility to change root window appearance based on the
+            <application>Blackbox</application> application bsetroot.
+          </para>
           <indexterm zone="fluxbox fbsetroot">
             <primary sortas="b-fbsetroot">fbsetroot</primary>
@@ -268,6 +314,8 @@
         <term><command>fluxbox-generate_menu</command></term>
         <listitem>
-          <para>is a utility that generates a menu by scanning your
-          <envar>PATH</envar>.</para>
+          <para>
+            is a utility that generates a menu by scanning your
+            <envar>PATH</envar>.
+          </para>
           <indexterm zone="fluxbox fluxbox-generate_menu">
             <primary sortas="b-fluxbox-generate_menu">fluxbox-generate_menu</primary>
@@ -279,6 +327,8 @@
         <term><command>startfluxbox</command></term>
         <listitem>
-          <para>is a session startup script that allows for command
-          executions prior to <command>fluxbox</command> starting.</para>
+          <para>
+            is a session startup script that allows for command
+            executions prior to <command>fluxbox</command> starting.
+          </para>
           <indexterm zone="fluxbox startfluxbox">
             <primary sortas="b-startfluxbox">startfluxbox</primary>
@@ -290,5 +340,7 @@
         <term><command>fbrun</command></term>
         <listitem>
-          <para>displays a run dialog window.</para>
+          <para>
+            displays a run dialog window.
+          </para>
           <indexterm zone="fluxbox fbrun">
             <primary sortas="b-fbrun">fbrun</primary>
@@ -300,6 +352,8 @@
         <term><command>fluxbox-remote</command></term>
         <listitem>
-          <para>provides command line access to key commands for
-          <application>Fluxbox</application>.</para>
+          <para>
+            provides command line access to key commands for
+            <application>Fluxbox</application>.
+          </para>
           <indexterm zone="fluxbox fluxbox-remote">
             <primary sortas="b-fluxbox-remote">fluxbox-remote</primary>
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/icewm.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -30,6 +30,8 @@
     <title>Introduction to IceWM</title>
 
-    <para><application>IceWM</application> is a window manager with the goals of
-    speed, simplicity, and not getting in the user&apos;s way.</para>
+    <para>
+      <application>IceWM</application> is a window manager with the goals of
+      speed, simplicity, and not getting in the user&apos;s way.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&icewm-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&icewm-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&icewm-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&icewm-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &icewm-md5sum;</para>
+        <para>
+          Download MD5 sum: &icewm-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &icewm-size;</para>
+        <para>
+          Download size: &icewm-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &icewm-buildsize;</para>
+        <para>
+          Estimated disk space required: &icewm-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &icewm-time;</para>
+        <para>
+          Estimated build time: &icewm-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -81,6 +95,8 @@
     <title>Installation of IceWM</title>
 
-    <para>Install <application>IceWM</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>IceWM</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -95,7 +111,11 @@
 make</userinput></screen>
 
-    <para>This package does not have a working testsuite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not have a working testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 <!--
 <screen role="root"><userinput>cp ../lib/IceWM.jpg lib &amp;&amp;
@@ -136,5 +156,6 @@
       <title>Config Files</title>
 
-      <para><filename>~/.icewm/keys</filename>,
+      <para>
+        <filename>~/.icewm/keys</filename>,
         <filename>~/.icewm/menu</filename>, and
         <filename>~/.icewm/preferences</filename>, and
@@ -144,5 +165,5 @@
         and will be used if you have not copied them to <filename
         class="directory">~/.icewm</filename>.
-       </para>
+      </para>
 
 
@@ -172,8 +193,10 @@
       <title>Configuration Information</title>
 
-      <para>If <application>IceWM</application> is the only Window Manager you
-      want to use, you can start it with an <filename>.xinitrc</filename> file
-      in your home folder. Be sure to backup your current
-      <filename>.xinitrc</filename> before proceeding.</para>
+      <para>
+        If <application>IceWM</application> is the only Window Manager you
+        want to use, you can start it with an <filename>.xinitrc</filename> file
+        in your home folder. Be sure to backup your current
+        <filename>.xinitrc</filename> before proceeding.
+      </para>
 
       <indexterm zone="icewm icewm-config">
@@ -183,6 +206,7 @@
 <screen><userinput>echo icewm-session &gt; ~/.xinitrc</userinput></screen>
 
-      <para>Now create the <application>IceWM</application> configuration
-      files:</para>
+      <para>
+        Now create the <application>IceWM</application> configuration files:
+      </para>
 
 <screen><userinput>mkdir -v ~/.icewm                                       &amp;&amp;
@@ -193,73 +217,97 @@
 cp -v /usr/share/icewm/winoptions ~/.icewm/winoptions</userinput></screen>
 
-      <para>You can now edit these files to meet your requirements. In
-      particular, review the <filename>preferences</filename> file. You can use
-      <command>Logout -> Restart-IceWM</command> on the main menu to load your
-      changed preferences, but changes to the background only take effect when
-      <application>IceWM</application> is started.</para>
-
-      <para>At this point you can <emphasis>either</emphasis> modify the
-      traditional menu files to suit your requirements, <emphasis>or</emphasis>
-      use the newer <command>icewm-menu-fdo</command> described later.</para>
-
-      <para>The syntax of the menus is explained in the help files, which you
-      can access by running <command>help</command> from the menu, but some of
-      the detail is out of date and the default selections in the menus (a few
-      old applications on the main menu, everything else on the
-      <command>Programs</command> menu) will benefit from being updated to meet
-      your needs. The following examples are  provided to encourage you to
-      think about how you wish to organise your menus. Please note the
-      following:</para>
+      <para>
+        You can now edit these files to meet your requirements. In particular,
+        review the <filename>preferences</filename> file. You can use
+        <command>Logout -> Restart-IceWM</command> on the main menu to load
+        your changed preferences, but changes to the background only take
+        effect when <application>IceWM</application> is started.
+      </para>
+
+      <para>
+        At this point you can <emphasis>either</emphasis> modify the
+        traditional menu files to suit your requirements,
+        <emphasis>or</emphasis> use the newer
+        <command>icewm-menu-fdo</command> described later.
+      </para>
+
+      <para>
+        The syntax of the menus is explained in the help files, which you can
+        access by running <command>help</command> from the menu, but some of
+        the detail is out of date and the default selections in the menus (a
+        few old applications on the main menu, everything else on the
+        <command>Programs</command> menu) will benefit from being updated to
+        meet your needs. The following examples are  provided to encourage you
+        to think about how you wish to organise your menus. Please note the
+        following:
+      </para>
 
       <itemizedlist>
         <listitem>
-          <para>If a program listed in the menu has not been installed, it will
-          not appear when the menu is displayed. Similarly, if the program
-          exists but the specified icon does not, no icon will be displayed in
-          the menu.</para>
-        </listitem>
-        <listitem>
-          <para>The icons can be either <filename>.xpm</filename> or
-          <filename>.png</filename> files, and there is no need to specify the
-          extension. If the icon is located in the &quot;library&quot;
-          (<filename class="directory">/usr/share/icewm/icons</filename>) there
-          is no need to specifiy the path.</para>
-        </listitem>
-        <listitem>
-          <para>Most programs are in sub-menus, and the main menu will always
-          append entries for <literal>windows, help, settings, logout</literal>
-          at the bottom.</para> </listitem>
-        <listitem>
-          <para>An icon for <application>firefox</application> was copied to
-          the library directory and given a meaningful name. The icon for
-          <application>xine</application> is <filename>xine.xpm</filename>
-          which was installed to a pixmap directory.</para>
-        </listitem>
-        <listitem>
-          <para>The default toolbar is not altered.</para>
+          <para>
+            If a program listed in the menu has not been installed, it will
+            not appear when the menu is displayed. Similarly, if the program
+            exists but the specified icon does not, no icon will be displayed
+            in the menu.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The icons can be either <filename>.xpm</filename> or
+            <filename>.png</filename> files, and there is no need to specify
+            the extension. If the icon is located in the &quot;library&quot;
+            (<filename class="directory">/usr/share/icewm/icons</filename>)
+            there is no need to specifiy the path.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Most programs are in sub-menus, and the main menu will always
+            append entries for
+            <literal>windows, help, settings, logout</literal>
+            at the bottom.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            An icon for <application>firefox</application> was copied to
+            the library directory and given a meaningful name. The icon for
+            <application>xine</application> is <filename>xine.xpm</filename>
+            which was installed to a pixmap directory.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The default toolbar is not altered.
+          </para>
         </listitem>
       </itemizedlist>
 
-      <para>If you wish to use this traditional method, there are more examples in
+      <para>
+        If you wish to use this traditional method, there are more examples in
         previous releases of this book (e.g. BLFS-7.8).
       </para>
 
-      <para><emphasis>Alternatively</emphasis>, you can create a menu which conforms
-        to the FDO Desktop Menu Specifications, where programs can be found because
-        they have a .desktop file in the XDG_DATA_HOME or XDG_DATA_DIR directories.
-        Unlike most windowmanagers, <application>icewm</application> does not search
-        for programs when the menu is invoked, so if you take this route you will
-        need to rerun the following command after installing or removing programs:
+      <para>
+        <emphasis>Alternatively</emphasis>, you can create a menu which
+        conforms to the FDO Desktop Menu Specifications, where programs can be
+        found because they have a .desktop file in the XDG_DATA_HOME or
+        XDG_DATA_DIR directories.  Unlike most windowmanagers,
+        <application>icewm</application> does not search for programs when the
+        menu is invoked, so if you take this route you will need to rerun the
+        following command after installing or removing programs:
       </para>
 
 <screen><userinput>icewm-menu-fdo >~/.icewm/menu</userinput></screen>
 
-      <para>If you wish to put icons on your desktop, you will need to install
-      a program such as <xref linkend="rox-filer"/> which provides a pinboard.
-      If you do that you will no longer be able to access the menu by
-      right-clicking on the desktop, you will have to use the
-      <application>IceWM</application> button. To ensure that the
-      <application>rox</application> pinboard is running, the following
-      commands will put it in the startup file:</para>
+      <para>
+        If you wish to put icons on your desktop, you will need to install a
+        program such as <xref linkend="rox-filer"/> which provides a pinboard.
+        If you do that you will no longer be able to access the menu by
+        right-clicking on the desktop, you will have to use the
+        <application>IceWM</application> button. To ensure that the
+        <application>rox</application> pinboard is running, the following
+        commands will put it in the startup file:
+      </para>
 
 <screen role="nodump"><userinput>cat &gt; ~/.icewm/startup &lt;&lt; "EOF"
@@ -269,20 +317,28 @@
 
      <tip>
-      <para>There are a number of keyboard shortcuts in
-      <application>IceWM</application>:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Ctrl + Alt + F<replaceable>N</replaceable> : go to
-          <filename>tty<replaceable>N</replaceable></filename>.</para>
-        </listitem>
-        <listitem>
-          <para>Ctrl + Alt + <replaceable>N</replaceable> : go to desktop
-          number <replaceable>N</replaceable></para>
-        </listitem>
-        <listitem>
-          <para>Ctrl + Alt + Space : open a box on the taskbar where you can
-          key in the name of an application and run it.</para>
-        </listitem>
-      </itemizedlist>
+       <para>
+         There are a number of keyboard shortcuts in
+         <application>IceWM</application>:
+       </para>
+       <itemizedlist>
+         <listitem>
+           <para>
+             Ctrl + Alt + F<replaceable>N</replaceable> : go to
+             <filename>tty<replaceable>N</replaceable></filename>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Ctrl + Alt + <replaceable>N</replaceable> : go to desktop
+             number <replaceable>N</replaceable>
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Ctrl + Alt + Space : open a box on the taskbar where you can
+             key in the name of an application and run it.
+           </para>
+         </listitem>
+       </itemizedlist>
      </tip>
 
@@ -315,5 +371,7 @@
         <term><command>icehelp</command></term>
         <listitem>
-          <para>is used to display the html manual.</para>
+          <para>
+            is used to display the html manual.
+          </para>
           <indexterm zone="icewm icehelp">
             <primary sortas="b-icehelp">icehelp</primary>
@@ -325,6 +383,8 @@
         <term><command>icesh</command></term>
         <listitem>
-          <para>is a command-line window manager which can be used in
-          <filename>~/.icewm/startup</filename>.</para>
+          <para>
+            is a command-line window manager which can be used in
+            <filename>~/.icewm/startup</filename>.
+          </para>
           <indexterm zone="icewm icesh">
             <primary sortas="b-icesh">icesh</primary>
@@ -336,5 +396,7 @@
         <term><command>icesound</command></term>
         <listitem>
-          <para>plays audio files on GUI events raised by IceWM.</para>
+          <para>
+            plays audio files on GUI events raised by IceWM.
+          </para>
           <indexterm zone="icewm icesound">
             <primary sortas="b-icesound">icesound</primary>
@@ -346,5 +408,7 @@
         <term><command>icewm</command></term>
         <listitem>
-          <para>is the window manager.</para>
+          <para>
+            is the window manager.
+          </para>
           <indexterm zone="icewm icewm-prog">
             <primary sortas="b-icewm">icewm</primary>
@@ -356,7 +420,9 @@
         <term><command>icewm-menu-fdo</command></term>
         <listitem>
-          <para>can create a file in a format suitable for an IceWM menu, which
-          lists those programs currently installed in a layout conforming to the
-          FDO Desktop Menu Specifications.</para>
+          <para>
+            can create a file in a format suitable for an IceWM menu, which
+            lists those programs currently installed in a layout conforming to
+            the FDO Desktop Menu Specifications.
+          </para>
           <indexterm zone="icewm icewm-menu-fdo">
             <primary sortas="b-icewm-menu-fdo">icewm-menu-fdo</primary>
@@ -368,6 +434,8 @@
         <term><command>icewm-session</command></term>
         <listitem>
-          <para>runs icewmbg, icewm, icewmtray, startup, shutdown (i.e. startup
-          and shutdown scripts are run if installed).</para>
+          <para>
+            runs icewmbg, icewm, icewmtray, startup, shutdown (i.e. startup
+            and shutdown scripts are run if installed).
+          </para>
           <indexterm zone="icewm icewm-session">
             <primary sortas="b-icewm-session">icewm-session</primary>
@@ -379,6 +447,8 @@
         <term><command>icewm-set-gnomewm</command></term>
         <listitem>
-          <para>is a script to set the <application>GNOME</application>windowmanager to
-          <application>icewm</application> using <application>gconftool</application>.
+          <para>
+            is a script to set the <application>GNOME</application> window
+            manager to <application>icewm</application> using
+            <application>gconftool</application>.
           </para>
           <indexterm zone="icewm icewm-set-gnomewm">
@@ -391,6 +461,8 @@
         <term><command>icewmbg</command></term>
         <listitem>
-          <para>is used to set the background, according to the various
-          <literal>DesktopBackground</literal> settings in the preferences.</para>
+          <para>
+            is used to set the background, according to the various
+            <literal>DesktopBackground</literal> settings in the preferences.
+          </para>
           <indexterm zone="icewm icewmbg">
             <primary sortas="b-icewmbg">icewmbg</primary>
@@ -402,5 +474,7 @@
         <term><command>icewmhint</command></term>
         <listitem>
-          <para>is used internally.</para>
+          <para>
+            is used internally.
+          </para>
           <indexterm zone="icewm icewmhint">
             <primary sortas="b-icewmhint">icewmhint</primary>
@@ -412,5 +486,7 @@
         <term><command>icewmtray</command></term>
         <listitem>
-          <para>provides the tray.</para>
+          <para>
+            provides the tray.
+          </para>
           <indexterm zone="icewm icewmtray">
             <primary sortas="b-icewmtray">icewmtray</primary>
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/openbox.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -47,6 +47,7 @@
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &openbox-md5sum;
-      </para>
+        <para>
+          Download MD5 sum: &openbox-md5sum;
+        </para>
       </listitem>
       <listitem>
@@ -94,12 +95,18 @@
     <title>Installation of Openbox</title>
 
-    <note><para>If XORG_PREFIX is not <filename class='directory'>/usr</filename>,
-    tell <command>gcc</command> about it:</para>
-
-    <screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+    <note>
+      <para>
+        If XORG_PREFIX is not <filename class='directory'>/usr</filename>,
+        tell <command>gcc</command> about it:
+      </para>
+
+<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+
     </note>
 
-    <para>If you only installed the Python 3 PyXDG module convert one of the
-    scripts to Python 3:</para>
+    <para>
+      If you only installed the Python 3 PyXDG module convert one of the
+      scripts to Python 3:
+    </para>
 
 <screen><userinput>2to3-&python3-majorver; -w data/autostart/openbox-xdg-autostart &amp;&amp;
@@ -155,6 +162,10 @@
 
       <para>
-        /etc/xdg/openbox/autostart, /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
-        ~/.config/openbox/autostart, ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
+        <filename>/etc/xdg/openbox/autostart</filename>,
+        <filename>/etc/xdg/openbox/menu.xml</filename>,
+        <filename>/etc/xdg/openbox/rc.xml</filename>,
+        <filename>~/.config/openbox/autostart</filename>,
+        <filename>~/.config/openbox/menu.xml</filename> and
+        <filename>~/.config/openbox/rc.xml</filename>
       </para>
 
@@ -272,7 +283,8 @@
         If you like to have the numlock key set whan you start Xorg, install
         <!-- 13-12-11 numlockx not found on the KDE website. This URL is OK ? -->
-        <ulink url="http://ftp.de.debian.org/debian/pool/main/n/numlockx/numlockx_1.2.orig.tar.gz">Numlockx</ulink> and
-        add that to your xinitrc. Another useful application is
-        <xref linkend="dbus"/>:
+        <ulink url=
+        "http://ftp.de.debian.org/debian/pool/main/n/numlockx/numlockx_1.2.orig.tar.gz">
+        Numlockx</ulink> and add that to your xinitrc. Another useful
+        application is <xref linkend="dbus"/>:
       </para>
 
Index: x/wm/other-wms.xml
===================================================================
--- x/wm/other-wms.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/other-wms.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -14,14 +14,12 @@
   </sect1info>
 
-  <title>Other Window Managers</title>
+  <title>Other Window Manager</title>
 
-  <para><command>twm</command> is the Tab Window Manager. This is the default
-  window manager installed by the <xref linkend="x-window-system"/>
-  packages.</para>
-
-  <para><command>mwm</command> is the Motif&reg; Window Manager. It is an
-  <application>OSF/Motif&reg;</application> clone packaged and installed with
-  <!-- <xref linkend="lesstif"/>.</para>-->
-  <ulink url="http://sourceforge.net/projects/lesstif/">LessTif</ulink>.</para>
+  <para>
+    <command>mwm</command> is the Motif Window Manager. It has been
+    released under a LGPL license in 2012, together with the Motif
+    library, and is available at
+    <ulink url="https://sourceforge.net/projects/motif/"/>.
+  </para>
 
 </sect1>
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/sawfish.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -30,8 +30,10 @@
     <title>Introduction to sawfish</title>
 
-    <para>The <application>sawfish</application> package contains a window
-    manager. This is useful for organizing and displaying windows where all
-    window decorations are configurable and all user-interface policy is
-    controlled through the extension language.</para>
+    <para>
+      The <application>sawfish</application> package contains a window
+      manager. This is useful for organizing and displaying windows where all
+      window decorations are configurable and all user-interface policy is
+      controlled through the extension language.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sawfish-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sawfish-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sawfish-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sawfish-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sawfish-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sawfish-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sawfish-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sawfish-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sawfish-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sawfish-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sawfish-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sawfish-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -75,13 +89,19 @@
     <title>Installation of sawfish</title>
 
-    <para>Install <application>sawfish</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>sawfish</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --with-pango  &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -92,16 +112,22 @@
     <title>Command Explanations</title>
 
-    <para><parameter>- -disable-themer</parameter>: This
-    option prevents building the <application>sawfish</application> themer.
-    This program was not migrated to <application>GTK-2</application>.</para>
-
-    <para><option>- -with-audiofile</option>: This command directs
-    <application>sawfish</application> to use
-    <filename class="libraryfile">libaudiofile</filename>
-    for sound manipulation.</para>
-
-    <para><option>- -with-esd</option>: This command directs
-    <application>sawfish</application> to use the Enlightened Sound
-    Daemon.</para>
+    <para>
+      <parameter>- -disable-themer</parameter>: This
+      option prevents building the <application>sawfish</application> themer.
+      This program was not migrated to <application>GTK-2</application>.
+    </para>
+
+    <para>
+      <option>- -with-audiofile</option>: This command directs
+      <application>sawfish</application> to use
+      <filename class="libraryfile">libaudiofile</filename>
+      for sound manipulation.
+    </para>
+
+    <para>
+      <option>- -with-esd</option>: This command directs
+      <application>sawfish</application> to use the Enlightened Sound
+      Daemon.
+    </para>
 
   </sect2>
@@ -117,6 +143,8 @@
       </indexterm>
 
-      <para>Be sure to backup your current <filename>.xinitrc</filename>
-      before proceeding.</para>
+      <para>
+        Be sure to backup your current <filename>.xinitrc</filename>
+        before proceeding.
+      </para>
 
 <screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"
@@ -124,13 +152,17 @@
 EOF</userinput></screen>
 
-      <para>Optionally, you can use a Display Manager, such as <xref
-      linkend="lxdm"/>.</para>
-
-      <para>From the developers:  <quote>The default menu binding is somewhat
-      obscure; you must middle-click on the background to bring up the menus.
-      (If you have a two-button mouse, try clicking both buttons
-      simultaneously)</quote>. You can find this at <ulink
-      url="http://download.tuxfamily.org/sawfish/themes/FAQ.html/">sawfish's
-      FAQ</ulink>.</para>
+      <para>
+        Optionally, you can use a Display Manager, such as <xref
+        linkend="lxdm"/>.
+      </para>
+
+      <para>
+        From the developers:  <quote>The default menu binding is somewhat
+        obscure; you must middle-click on the background to bring up the menus.
+        (If you have a two-button mouse, try clicking both buttons
+        simultaneously)</quote>. You can find this at <ulink
+        url="http://download.tuxfamily.org/sawfish/themes/FAQ.html/">sawfish's
+        FAQ</ulink>.
+      </para>
 
     </sect3>
@@ -172,6 +204,8 @@
         <term><filename>sawfish</filename></term>
         <listitem>
-          <para>is the extensible window manager using a
-          <application>Lisp</application>-based scripting language.</para>
+          <para>
+            is the extensible window manager using a
+            <application>Lisp</application>-based scripting language.
+          </para>
           <indexterm zone="sawfish sawfish-prog">
             <primary sortas="b-sawfish">sawfish</primary>
@@ -183,5 +217,7 @@
         <term><filename>sawfish-about</filename></term>
         <listitem>
-          <para>is the <application>sawfish</application> about window.</para>
+          <para>
+            is the <application>sawfish</application> about window.
+          </para>
           <indexterm zone="sawfish sawfish-about">
             <primary sortas="b-sawfish-about">sawfish-about</primary>
@@ -193,6 +229,8 @@
         <term><filename>sawfish-client</filename></term>
         <listitem>
-          <para>allows you to connect to a window manager process and
-          evaluate arbitrary <application>Lisp</application> forms.</para>
+          <para>
+            allows you to connect to a window manager process and
+            evaluate arbitrary <application>Lisp</application> forms.
+          </para>
           <indexterm zone="sawfish sawfish-client">
             <primary sortas="b-sawfish-client">sawfish-client</primary>
@@ -204,5 +242,7 @@
         <term><filename>sawfish-config</filename></term>
         <listitem>
-          <para>is the <application>sawfish</application> configuration manager.</para>
+          <para>
+            is the <application>sawfish</application> configuration manager.
+          </para>
           <indexterm zone="sawfish sawfish-config-prog">
             <primary sortas="b-sawfish-config-prog">sawfish-config</primary>
@@ -215,5 +255,6 @@
         <listitem>
           <para>
-             is a script to run <application>KDE4</application> using <application>sawfish</application>.
+             is a script to run <application>KDE4</application> using
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-kde4-session">
@@ -240,5 +281,6 @@
         <listitem>
           <para>
-             is a script to run <application>mate</application> using <application>sawfish</application>.
+             is a script to run <application>mate</application> using
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-mate-session">
@@ -252,5 +294,6 @@
         <listitem>
           <para>
-             is a script to run <application>Lumina</application> using <application>sawfish</application>.
+             is a script to run <application>Lumina</application> using
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-lumina-session">
@@ -264,5 +307,6 @@
         <listitem>
           <para>
-             is a script to run <application>xfce</application> using <application>sawfish</application>.
+             is a script to run <application>xfce</application> using
+             <application>sawfish</application>.
           </para>
           <indexterm zone="sawfish sawfish-xfce-session">
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ x/wm/wm.xml	(revision 97ee53dc35b9f4a456aeaaf98807b5a0999c7625)
@@ -11,45 +11,50 @@
   <title>Window Managers</title>
 
-  <sect1 id="wm-introduction">
-    <?dbhtml filename="introduction.html" ?>
+  <!--
+  $LastChangedBy$
+  $Date$/date>
+  -->
 
-    <sect1info>
-      <othername>$LastChangedBy$</othername>
-      <date>$Date$</date>
-    </sect1info>
-
-    <title>Introduction</title>
-
-    <para>Window Managers and Desktop Environments are the primary user
+  <para>
+    Window Managers and Desktop Environments are the primary user
     interfaces into the <application>X</application> Window System. A window
     manager is a program that controls the appearance of windows and provides
     the means by which the user can interact with them. A Desktop Environment
     provides a more complete interface to the operating system, and provides a
-    range of integrated utilities and applications.</para>
+    range of integrated utilities and applications.
+  </para>
 
-    <para>There are many Window Managers available. Some of the more well
+  <para>
+    There are many Window Managers available. Some of the more well
     known ones include <application>fvwm2</application>, <application>Window
     Maker</application>, <application>AfterStep</application>,
     <application>Enlightenment</application>,
     <application>Sawfish</application>,
-    and <application>Blackbox</application>.</para>
+    and <application>Blackbox</application>.
+  </para>
 
-    <para>The Desktop Environments available for Linux are
+  <para>
+    The Desktop Environments available for Linux are
     <application>GNOME</application>, <application>KDE</application>, and
-    <application>XFce</application>.</para>
+    <application>XFce</application>.
+  </para>
 
-    <para>Choosing a Window Manager or Desktop Environment is highly
+  <para>
+    Choosing a Window Manager or Desktop Environment is highly
     subjective. The choice depends on the look and feel of the packages, the
     resources (RAM, disk space) required, and the utilities included.  One web
     site that provides a very good summary of what is available, screenshots,
-    and their respective features is <ulink url="http://xwinman.org/">Window
-    Managers for X</ulink>.</para>
+    and their respective features is
+    <ulink url="http://www.xwinman.org/">
+      Window Managers for X
+    </ulink>.
+  </para>
 
-    <para>In this chapter, the installation instructions of several Window
+  <para>
+    In this chapter, the installation instructions of several Window
     Managers and one lightweight Desktop Environment are presented. Later in
     the book, both <application>KDE</application> and
-    <application>GNOME</application> have their own sections.</para>
-
-  </sect1>
+    <application>GNOME</application> have their own sections.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
