Index: general.ent
===================================================================
--- general.ent	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ general.ent	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 12th &year;">
+<!ENTITY releasedate  "August 13th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ introduction/welcome/changelog.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -44,4 +44,18 @@
 
 -->
+
+      <listitem>
+        <para>August 13th, 2015</para>
+        <itemizedlist>
+          <listitem>
+            <para>[fernando] - Update to mpg123-1.22.4.  Fixes
+            <ulink url="&blfs-ticket-root;6814">#6814</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to wireshark-1.12.7.  Fixes
+            <ulink url="&blfs-ticket-root;6813">#6813</ulink>.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
 
       <listitem>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ multimedia/audioutils/mpg123.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -7,5 +7,5 @@
   <!ENTITY mpg123-download-http "&sourceforge-repo;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
-  <!ENTITY mpg123-md5sum        "fca857bc5ad0d2070cd38bd5f0f85f1c">
+  <!ENTITY mpg123-md5sum        "2dfafae3bbc532b4c8b04a77c6a6de89">
   <!ENTITY mpg123-size          "852 KB">
   <!ENTITY mpg123-buildsize     "14 MB">
Index: networking/netlibs/libndp.xml
===================================================================
--- networking/netlibs/libndp.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netlibs/libndp.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -123,5 +123,5 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libndp-tool">
+      <varlistentry id="ndp-tool">
         <term><command>ndptool</command></term>
         <listitem>
@@ -129,6 +129,6 @@
             tool for sending and receiving NDP messages.
           </para>
-          <indexterm zone="libndp libndp-tool">
-            <primary sortas="b-libndp-tool">libndp</primary>
+          <indexterm zone="libndp ndp-tool">
+            <primary sortas="b-ndp-tool">ndptool</primary>
           </indexterm>
         </listitem>
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netlibs/libnl.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -200,4 +200,163 @@
       <?dbhtml list-presentation="table"?>
 
+     <varlistentry id="genl-ctrl-list">
+        <term><command>genl-ctrl-list</command></term>
+        <listitem>
+          <para>
+            queries the Generic Netlink controller in kernel and prints
+            a list of all registered Generic Netlink families including
+            the version of the interface that has been registered.
+          </para>
+          <indexterm zone="libnl genl-ctrl-list">
+            <primary sortas="b-genl-ctrl-list">genl-ctrl-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-class-add">
+        <term><command>nl-class-add</command></term>
+        <listitem>
+          <para>
+            add or update or replace Traffic Classes
+          </para>
+          <indexterm zone="libnl nl-class-add">
+            <primary sortas="b-nl-class-add">nl-class-add</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-class-delete">
+        <term><command>nl-class-delete</command></term>
+        <listitem>
+          <para>
+            delete Traffic Classes
+          </para>
+          <indexterm zone="libnl nl-class-delete">
+            <primary sortas="b-nl-class-delete">nl-class-delete</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-classid-lookup">
+        <term><command>nl-classid-lookup</command></term>
+        <listitem>
+          <para>
+            is used to resolve qdisc/class names to classid values and vice
+            versa.
+          </para>
+          <indexterm zone="libnl nl-classid-lookup">
+            <primary sortas="b-nl-classid-lookup">nl-classid-lookup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-class-list">
+        <term><command>nl-class-list</command></term>
+        <listitem>
+          <para>
+            list Traffic Classes.
+          </para>
+          <indexterm zone="libnl nl-class-list">
+            <primary sortas="b-nl-class-list">nl-class-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-cls-add">
+        <term><command>nl-cls-add</command></term>
+        <listitem>
+          <para>
+            add a classifier.
+          </para>
+          <indexterm zone="libnl nl-cls-add">
+            <primary sortas="b-nl-cls-add">nl-cls-add</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-cls-delete">
+        <term><command>nl-cls-delete</command></term>
+        <listitem>
+          <para>
+            delete a classifier.
+          </para>
+          <indexterm zone="libnl nl-cls-delete">
+            <primary sortas="b-nl-cls-delete">nl-cls-delete</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-cls-list">
+        <term><command>nl-cls-list</command></term>
+        <listitem>
+          <para>
+            list classifiers.
+          </para>
+          <indexterm zone="libnl nl-cls-list">
+            <primary sortas="b-nl-cls-list">nl-cls-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-link-list">
+        <term><command>nl-link-list</command></term>
+        <listitem>
+          <para>
+            dump link attributes.
+          </para>
+          <indexterm zone="libnl nl-link-list">
+            <primary sortas="b-nl-link-list">nl-link-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-pktloc-lookup">
+        <term><command>nl-pktloc-lookup</command></term>
+        <listitem>
+          <para>
+            lookup packet location definitions.
+          </para>
+          <indexterm zone="libnl nl-pktloc-lookup">
+            <primary sortas="b-nl-pktloc-lookup">nl-pktloc-lookup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-qdisc-add">
+        <term><command>nl-qdisc-add</command></term>
+        <listitem>
+          <para>
+            add queueing disciplines (qdiscs) in the kernel.
+          </para>
+          <indexterm zone="libnl nl-qdisc-add">
+            <primary sortas="b-nl-qdisc-add">nl-qdisc-add</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-qdisc-delete">
+        <term><command>nl-qdisc-delete</command></term>
+        <listitem>
+          <para>
+             delete queueing disciplines (qdiscs) in the kernel.
+          </para>
+          <indexterm zone="libnl nl-qdisc-delete">
+            <primary sortas="b-nl-qdisc-delete">nl-qdisc-delete</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="nl-qdisc-list">
+        <term><command>nl-qdisc-list</command></term>
+        <listitem>
+          <para>
+            list queueing disciplines (qdiscs) in the kernel.  
+          </para>
+          <indexterm zone="libnl nl-qdisc-list">
+            <primary sortas="b-nl-qdisc-list">nl-qdisc-list</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libnl-lib">
         <term><filename class="libraryfile">libnl*-3.so</filename></term>
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netlibs/neon.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -179,4 +179,17 @@
       <?dbhtml list-presentation="table"?>
 
+     <varlistentry id="neon-config">
+        <term><command>neon-config</command></term>
+        <listitem>
+          <para>
+            is a script that provide information about an installed copy
+            of the neon library.
+          </para>
+          <indexterm zone="neon neon-config">
+            <primary sortas="b-neon-config">neon-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libneon">
         <term><filename class="libraryfile">libneon.so</filename></term>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netprogs/nfs-utils.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -346,20 +346,20 @@
       </varlistentry>
 
-      <varlistentry id="mountnfs">
+      <varlistentry id="mount.nfs">
         <term><command>mount.nfs</command></term>
         <listitem>
           <para>Used to mount a network share using NFS</para>
-          <indexterm zone="nfs-utils mountnfs">
-            <primary sortas="b-mountnfs">mount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountnfs4">
+          <indexterm zone="nfs-utils mount.nfs">
+            <primary sortas="b-mount.nfs">mount.nfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount.nfs4">
         <term><command>mount.nfs4</command></term>
         <listitem>
           <para>Used to mount a network share using NFSv4</para>
-          <indexterm zone="nfs-utils mountnfs4">
-            <primary sortas="b-mountnfs4">mount.nfs4</primary>
+          <indexterm zone="nfs-utils mount.nfs4">
+            <primary sortas="b-mount.nfs4">mount.nfs4</primary>
           </indexterm>
         </listitem>
@@ -398,32 +398,32 @@
 
 
-      <varlistentry id="rpcmountd">
+      <varlistentry id="rpc.mountd">
         <term><command>rpc.mountd</command></term>
         <listitem>
           <para>implements the NFS mount protocol on an NFS server.</para>
-          <indexterm zone="nfs-utils rpcmountd">
-            <primary sortas="b-rpcmountd">rpc.mountd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcnfsd">
+          <indexterm zone="nfs-utils rpc.mountd">
+            <primary sortas="b-rpc.mountd">rpc.mountd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpc.nfsd">
         <term><command>rpc.nfsd</command></term>
         <listitem>
           <para>implements the user level part of the NFS
           service on the server.</para>
-          <indexterm zone="nfs-utils rpcnfsd">
-            <primary sortas="b-rpcnfsd">rpc.nfsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcstatd">
+          <indexterm zone="nfs-utils rpc.nfsd">
+            <primary sortas="b-rpc.nfsd">rpc.nfsd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpc.statd">
         <term><command>rpc.statd</command></term>
         <listitem>
           <para>is used by the NFS file locking service. Run on both sides,
           client as well as server, when you want file locking enabled.</para>
-          <indexterm zone="nfs-utils rpcstatd">
-            <primary sortas="b-rpcstatd">rpc.statd</primary>
+          <indexterm zone="nfs-utils rpc.statd">
+            <primary sortas="b-rpc.statd">rpc.statd</primary>
           </indexterm>
         </listitem>
@@ -473,20 +473,20 @@
       </varlistentry>
 
-      <varlistentry id="umountnfs">
+      <varlistentry id="umount.nfs">
         <term><command>umount.nfs</command></term>
         <listitem>
           <para>Used to unmount a network share using NFS</para>
-          <indexterm zone="nfs-utils umountnfs">
-            <primary sortas="b-umountnfs">umount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umountnfs4">
+          <indexterm zone="nfs-utils umount.nfs">
+            <primary sortas="b-umount.nfs">umount.nfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umount.nfs4">
         <term><command>umount.nfs4</command></term>
         <listitem>
           <para>Used to unmount a network share using NFSv4</para>
-          <indexterm zone="nfs-utils umountnfs4">
-            <primary sortas="b-umountnfs4">umount.nfs4</primary>
+          <indexterm zone="nfs-utils umount.nfs4">
+            <primary sortas="b-umount.nfs4">umount.nfs4</primary>
           </indexterm>
         </listitem>
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netutils/nmap.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -212,4 +212,29 @@
       </varlistentry>
 
+      <varlistentry id="nping">
+        <term><command>nping</command></term>
+        <listitem>
+          <para>
+             is an open-source tool for network packet generation, response
+             analysis and response time measurement.
+          </para>
+          <indexterm zone="nmap nping">
+            <primary sortas="b-nping">nping</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uninstall_zenmap">
+        <term><command>uninstall_zenmap</command></term>
+        <listitem>
+          <para>
+             is a Python script to uninstall <command>zenmap</command>.
+          </para>
+          <indexterm zone="nmap uninstall_zenmap">
+            <primary sortas="b-uninstall_zenmap">uninstall_zenmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xnmap">
         <term><command>xnmap</command></term>
Index: networking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netutils/whois.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -137,4 +137,16 @@
         </listitem>
       </varlistentry>
+
+     <varlistentry id="mkpasswd-whois">
+        <term><command>mkpasswd</command></term>
+        <listitem>
+          <para>
+            generate new password, optionally apply it to a user.
+          </para>
+          <indexterm zone="whois mkpasswd-whois">
+            <primary sortas="b-mkpasswd-whois">mkpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ networking/netutils/wireshark.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -7,8 +7,8 @@
   <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
   <!ENTITY wireshark-download-ftp  "ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-md5sum        "25ad2bc1c2a21396827c238fcff51bf3">
+  <!ENTITY wireshark-md5sum        "c8ae53f648b1dcbf6e74495401a0f1ab">
   <!ENTITY wireshark-size          "28 MB">
   <!ENTITY wireshark-buildsize     "1.6 GB, with the Qt GUI">
-  <!ENTITY wireshark-time          "6.0 SBU, with the Qt GUI">
+  <!ENTITY wireshark-time          "6.2 SBU, with the Qt GUI">
 ]>
 
@@ -119,5 +119,5 @@
     <para role="optional">
       <xref linkend="gtk2"/>,
-      <xref linkend="qt4"/>, or 
+      <xref linkend="qt4"/>, or
       <xref linkend="qt5"/>
     </para>
@@ -160,5 +160,5 @@
       Wireshark</application> to capture live packets from the network:
     </para>
-      
+
 <screen><literal>[*] Networking support ---&gt;          [CONFIG_NET]
       Networking options ---&gt;
@@ -207,20 +207,20 @@
 
     <para>
-      If you want to build a Qt GUI and have both <application>Qt4
-      </application> and 5 installed, issue either:
-    </para>
-
-<screen><userinput>source setqt5</userinput></screen>
-
-    <para>
-      if you want the <application>Qt5</application> GUI built, or:
+      If you want to build the Qt GUI (see <quote>Command Explanations</quote>),
+      for the <application>Qt5</application> GUI, issue:
+    </para>
+
+<screen><userinput>source setqt5 &amp;&amp;
+
+sed -e 's/"-fPIE"/""/' \
+    -e 's/"-pie"/""/'  \
+    -i configure</userinput></screen>
+
+    <para>
+      and add <envar>CXXFLAGS="-fPIC"</envar> to the configure line, or, for the <application>Qt4</application> GUI, issue:
     </para>
 
 <screen><userinput>source setqt4 &amp;&amp;
 sed -i 's/Qt5 Qt/Qt/' configure</userinput></screen>
-
-    <para>
-      if you want the <application>Qt4</application> GUI built.
-    </para>
 
     <para>
@@ -276,5 +276,6 @@
     </para>
 
-<screen role="root"><userinput>install -v -m644 <replaceable>&lt;Downloaded_Files&gt;</replaceable> /usr/share/doc/wireshark-&wireshark-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m644 <replaceable>&lt;Downloaded_Files&gt;</replaceable> \
+                 /usr/share/doc/wireshark-&wireshark-version;</userinput></screen>
 
     <para>
@@ -298,4 +299,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e 's/"-fPIE"/""/' ... configure</command>: This command is
+      required for Qt-5.5, because it is necessary to compile with
+      <envar>CXXFLAGS="-fPIC"</envar>.
+    </para>
 
     <para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ packages.ent	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -371,5 +371,5 @@
 <!ENTITY whois-version                "5.2.10">
 <!ENTITY wicd-version                 "1.7.3">
-<!ENTITY wireshark-version            "1.12.6">  <!-- even minors only -->
+<!ENTITY wireshark-version            "1.12.7">  <!-- even minors only -->
 
 <!ENTITY wicd-major-version           "1.7">
@@ -731,5 +731,5 @@
 
 <!-- Chapter 47 -->
-<!ENTITY mpg123-version               "1.22.3">
+<!ENTITY mpg123-version               "1.22.4">
 <!ENTITY vorbistools-version          "1.4.0">
 <!ENTITY lame-version                 "3.99.5">
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ x/dm/lxdm.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -341,5 +341,5 @@
       </varlistentry>
 
-      <varlistentry id="lxdm-bin">
+      <varlistentry id="lxdm-binary">
         <term><command>lxdm-binary</command></term>
         <listitem>
@@ -348,6 +348,6 @@
              <option>-d</option> to daemonize
           </para>
-          <indexterm zone="lxdm lxdm-bin">
-            <primary sortas="b-lxdm">lxdm</primary>
+          <indexterm zone="lxdm lxdm-binary">
+            <primary sortas="b-lxdm-binary">lxdm-binary</primary>
           </indexterm>
         </listitem>
Index: x/dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ x/dm/sddm.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -116,5 +116,8 @@
 
 <screen role="root"><userinput>groupadd -g 64 sddm &amp;&amp;
-useradd -c "SDDM Daemon" -d /var/lib/sddm -u 64 -g sddm -s /bin/false sddm</userinput></screen>
+useradd  -c "SDDM Daemon" \
+         -d /var/lib/sddm \
+         -u 64 -g sddm    \
+         -s /bin/false sddm</userinput></screen>
 
     <para>
@@ -374,5 +377,6 @@
       </para>
 
-<screen role="root"><userinput>echo 'setxkbmap <replaceable>"&lt;your keyboard comma separated list&gt;"</replaceable>' &gt;&gt; /usr/share/sddm/scripts/Xsetup</userinput></screen>
+<screen role="root"><userinput>echo 'setxkbmap <replaceable>"&lt;your keyboard comma separated list&gt;"</replaceable>' &gt;&gt; \
+     /usr/share/sddm/scripts/Xsetup</userinput></screen>
 
       <para>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ x/installing/xorg-server.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -299,4 +299,17 @@
       </varlistentry>
 
+     <varlistentry id="Xdmx">
+        <term><command>Xdmx</command></term>
+        <listitem>
+          <para>
+            is a proxy X server that uses one or more other X servers as
+            its display devices.
+          </para>
+          <indexterm zone="xorg-server Xdmx">
+            <primary sortas="b-Xdmx">Xdmx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="Xephyr-x7">
         <term><command>Xephyr</command></term>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ x/wm/fluxbox.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -260,11 +260,11 @@
       </varlistentry>
 
-      <varlistentry id="fluxbox-generate">
+      <varlistentry id="fluxbox-generate_menu">
         <term><command>fluxbox-generate_menu</command></term>
         <listitem>
           <para>is a utility that generates a menu by scanning your
           <envar>PATH</envar>.</para>
-          <indexterm zone="fluxbox fluxbox-generate">
-            <primary sortas="b-fluxbox-generate">fluxbox-generate_menu</primary>
+          <indexterm zone="fluxbox fluxbox-generate_menu">
+            <primary sortas="b-fluxbox-generate_menu">fluxbox-generate_menu</primary>
           </indexterm>
         </listitem>
@@ -303,4 +303,16 @@
       </varlistentry>
 
+     <varlistentry id="fluxbox-update_configs">
+        <term><command>fluxbox-update_configs</command></term>
+        <listitem>
+          <para>
+            use to manage config files (reload, update, test).
+          </para>
+          <indexterm zone="fluxbox fluxbox-update_configs">
+            <primary sortas="b-fluxbox-update_configs">fluxbox-update_configs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision 5ee1266c69e02a83dc5104dfd9dff07fe5fb823f)
+++ x/wm/sawfish.xml	(revision 6d772cc846694b56dae8db43ea72ead32da79408)
@@ -148,7 +148,7 @@
       <seglistitem>
         <seg>
-          sawfish, sawfish-client, sawfish-kde4-session, sawfish-mate-session,
-          sawfish-about, sawfish-config, sawfish-lumina-session, and
-          sawfish-xfce-session
+          sawfish, sawfish-about, sawfish-client, sawfish-config,
+          sawfish-kde4-session, sawfish-lumina-session, sawfish-mate-session,
+          and sawfish-xfce-session
         </seg>
         <seg>
@@ -211,4 +211,52 @@
       </varlistentry>
 
+     <varlistentry id="sawfish-kde4-session">
+        <term><command>sawfish-kde4-session</command></term>
+        <listitem>
+          <para>
+             is a script to run <application>KDE4</application> using <application>sawfish</application>.
+          </para>
+          <indexterm zone="sawfish sawfish-kde4-session">
+            <primary sortas="b-sawfish-kde4-session">sawfish-kde4-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="sawfish-mate-session">
+        <term><command>sawfish-mate-session</command></term>
+        <listitem>
+          <para>
+             is a script to run <application>mate</application> using <application>sawfish</application>.
+          </para>
+          <indexterm zone="sawfish sawfish-mate-session">
+            <primary sortas="b-sawfish-mate-session">sawfish-mate-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="sawfish-lumina-session">
+        <term><command>sawfish-lumina-session</command></term>
+        <listitem>
+          <para>
+             is a script to run <application>Lumina</application> using <application>sawfish</application>.
+          </para>
+          <indexterm zone="sawfish sawfish-lumina-session">
+            <primary sortas="b-sawfish-lumina-session">sawfish-lumina-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="sawfish-xfce-session">
+        <term><command>sawfish-xfce-session</command></term>
+        <listitem>
+          <para>
+             is a script to run <application>xfce</application> using <application>sawfish</application>.
+          </para>
+          <indexterm zone="sawfish sawfish-xfce-session">
+            <primary sortas="b-sawfish-xfce-session">sawfish-xfce-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
