Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision e114b7b91f94dda95a03907d8059b612d8efec7d)
+++ general/sysutils/dbus.xml	(revision 4c796cf907ed0ebc481a37dce51ce0c5806b28cb)
@@ -7,7 +7,7 @@
   <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
   <!ENTITY dbus-download-ftp  " ">
-  <!ENTITY dbus-md5sum        "16dcae2dd0c76e398381601ac9acdec4">
-  <!ENTITY dbus-size          "1.8 MB">
-  <!ENTITY dbus-buildsize     "29 MB">
+  <!ENTITY dbus-md5sum        "7fbf877ed6ff7da6df90f07158373829">
+  <!ENTITY dbus-size          "1.9 MB">
+  <!ENTITY dbus-buildsize     "115 MB">
   <!ENTITY dbus-time          "0.5 SBU">
 ]>
@@ -30,13 +30,15 @@
     <title>Introduction to D-Bus</title>
 
-    <para><application>D-Bus</application> is a message bus system, a simple
-    way for applications to talk to one another.
-    <application>D-Bus</application> supplies both a system daemon (for events
-    such as <quote>new hardware device added</quote> or <quote>printer queue
-    changed</quote>) and a per-user-login-session daemon (for general IPC needs
-    among user applications). Also, the message bus is built on top of a
-    general one-to-one message passing framework, which can be used by any two
-    applications to communicate directly (without going through the message bus
-    daemon).</para>
+    <para>
+      <application>D-Bus</application> is a message bus system, a simple
+      way for applications to talk to one another.
+      <application>D-Bus</application> supplies both a system daemon (for events
+      such as <quote>new hardware device added</quote> or <quote>printer queue
+      changed</quote>) and a per-user-login-session daemon (for general IPC needs
+      among user applications). Also, the message bus is built on top of a
+      general one-to-one message passing framework, which can be used by any two
+      applications to communicate directly (without going through the message bus
+      daemon).
+    </para>
 
     &lfs71_checked;
@@ -45,20 +47,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&dbus-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&dbus-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&dbus-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&dbus-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &dbus-md5sum;</para>
+        <para>
+          Download MD5 sum: &dbus-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &dbus-size;</para>
+        <para>
+          Download size: &dbus-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &dbus-buildsize;</para>
+        <para>
+          Estimated disk space required: &dbus-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &dbus-time;</para>
+        <para>
+          Estimated build time: &dbus-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -73,6 +87,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="xorg7-lib"/>
-    (for <command>dbus-launch</command> program)</para>
+    <para role="recommended">
+      <xref linkend="xorg7-lib"/>
+      (for <command>dbus-launch</command> program)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -83,26 +99,13 @@
     </para>
 
-    <para>Note that the <command>configure</command> script will look for
-    <xref linkend="xmlto"/> but it does nothing as the XML/HTML documentation is
-    already shipped in the source tree.</para>
+    <para>
+      Note that the <command>configure</command> script will look for
+      <xref linkend="xmlto"/> but it does nothing as the XML/HTML documentation is
+      already shipped in the source tree.
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dbus"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='dbus-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>Ensure the following option is enabled in the kernel configuration
-    and recompile the kernel if necessary:</para>
-
-<screen><literal>General Setup
-  System V IPC</literal></screen>
-
-    <indexterm zone="dbus dbus-kernel">
-      <primary sortas="d-dbus">dbus</primary>
-    </indexterm>
-
+      <ulink url="&blfs-wiki;/dbus"/>
+    </para>
   </sect2>
 
@@ -110,6 +113,8 @@
     <title>Installation of D-Bus</title>
 
-    <para>As the <systemitem class="username">root</systemitem> user, create a
-    system user and group to handle the system message bus activity:</para>
+    <para>
+      As the <systemitem class="username">root</systemitem> user, create a
+      system user and group to handle the system message bus activity:
+    </para>
 
 <screen role="root"><userinput>groupadd -g 18 messagebus &amp;&amp;
@@ -117,30 +122,40 @@
         -u 18 -g messagebus -s /bin/false messagebus</userinput></screen>
 
-    <para>Install <application>D-Bus</application> by running the following
-    commands (you may wish to review the output from
-    <command>./configure --help</command> first and add any desired parameters
-    to the <command>configure</command> command shown below):</para>
+    <para>
+      Install <application>D-Bus</application> by running the following
+      commands (you may wish to review the output from
+      <command>./configure --help</command> first and add any desired parameters
+      to the <command>configure</command> command shown below):
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
+            --localstatedir=/var \
             --libexecdir=/usr/lib/dbus-1.0 \
-            --localstatedir=/var \
+            --with-console-auth-dir=/run/console/ \
+            --without-systemdsystemunitdir \
+            --disable-systemd \
 	    --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>See below for test instructions.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      See below for test instructions.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
 mv -v /usr/share/doc/dbus /usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
-    <para>The dbus tests cannot be run until after <xref linkend="dbus-glib"/>
-    has been installed.  The tests require passing additional parameters to
-    <command>configure</command> and exposing additional functionality in the
-    binaries. These interfaces are not intended to be used in a production
-    build of <application>D-Bus</application>.  If you would like to run the
-    unit tests, issue the following commands:</para>
+    <para>
+      The dbus tests cannot be run until after <xref linkend="dbus-glib"/>
+      has been installed. The tests require passing additional parameters to
+      <command>configure</command> and exposing additional functionality in the
+      binaries. These interfaces are not intended to be used in a production
+      build of <application>D-Bus</application>.  If you would like to run the
+      unit tests, issue the following commands:
+    </para>
     
 <screen><userinput>make distclean &amp;&amp;
@@ -150,8 +165,10 @@
 make distclean</userinput></screen>
 
-    <para>Note there has been a report that the tests may fail if running
-    inside a Midnight Commander shell.
-    You may get out-of-memory error messages when running the tests. 
-    These are normal and can be safely ignored.</para>
+    <para>
+      Note there has been a report that the tests may fail if running
+      inside a Midnight Commander shell.
+      You may get out-of-memory error messages when running the tests. 
+      These are normal and can be safely ignored.
+    </para>
 
   </sect2>
@@ -160,29 +177,43 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=/usr/lib/dbus-1.0</parameter>: This will
-    install binaries meant to be only used internally by
-    <application>D-Bus</application>, and the directory
-    <filename class="directory">dbus-1</filename> into
-    <filename class="directory">/usr/lib/dbus-1.0</filename> instead of
-    into <filename class="directory">/usr/libexec</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This parameter causes
-    the daemon PID file, system bus socket and machine uuid file to be
-    created in the <filename class="directory">/var</filename> directory
-    instead of the <filename class="directory">/usr/var</filename>
-    directory.</para>
-
-    <para><parameter>--enable-tests</parameter>: Build extra parts of the code
-    to support testing. Configure will end with a NOTE warning about this.</para>
-
-    <para><parameter>--enable-asserts</parameter>: Enable debugging code to run
-    assertions for statements normally assumed to be true. This prevents a
-    warning that '<parameter>--enable-tests</parameter>' on its own is only useful
-    for profiling and might not give true results for all tests, but adds its own
-    NOTE that this should not be used in a production build.
+    <para>
+      <parameter>--libexecdir=/usr/lib/dbus-1.0</parameter>: This will
+      ensure that <application>D-Bus</application> internal support
+      program is installed in the prefered directory
+      <filename class="directory">/usr/lib/dbus-1.0</filename> instead of
+      <filename class="directory">/usr/libexec</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-console-auth-dir=/run/console/</parameter>: This
+      parameter specifies location of the
+      <application>ConsoleKit</application>  auth dir.
+    </para>
+
+    <para>
+      <option>--without-systemdsystemunitdir</option>: This switch prevents
+      installation of systemd unit files.
+    </para>
+
+    <para>
+      <option>--disable-systemd</option>: This switch disables systemd
+      support in <application>D-Bus</application>
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>    
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--enable-tests</option>: Build extra parts of the code to support
+      testing. Configure will end with a NOTE warning about this.
+    </para>
+
+    <para>
+      <option>--enable-asserts</option>: Enable debugging code to run assertions for
+      statements normally assumed to be true. This prevents a warning that 
+      '<parameter>--enable-tests</parameter>' on its own is only useful for profiling
+      and might not give true results for all tests, but adds its own NOTE that this
+      should not be used in a production build.
+    </para>
 
   </sect2>
@@ -193,7 +224,10 @@
     <sect3 id="dbus-config">
       <title>Config Files</title>
-      <para><filename>/etc/dbus-1/session.conf</filename>,
-      <filename>/etc/dbus-1/system.conf</filename> and
-      <filename>/etc/dbus-1/system.d/*</filename></para>
+
+      <para>
+        <filename>/etc/dbus-1/session.conf</filename>,
+        <filename>/etc/dbus-1/system.conf</filename> and
+        <filename>/etc/dbus-1/system.d/*</filename>
+      </para>
 
       <indexterm zone="dbus dbus-config">
@@ -214,19 +248,23 @@
       <title>Configuration Information</title>
 
-      <para>The configuration files listed above should probably not be
-      modified. If changes are required, you should create
-      <filename>/etc/dbus-1/session-local.conf</filename> and/or
-      <filename>/etc/dbus-1/system-local.conf</filename> and make any
-      desired changes to these files.</para>
-
-      <para>If any packages install a
-      <application>D-Bus</application> <filename>.service</filename>
-      file outside of the standard <filename
-      class="directory">/usr/share/dbus-1/services</filename> directory,
-      that directory should be added to the local session configuration.
-      For instance, <filename
-      class="directory">/usr/local/share/dbus-1/services</filename> can
-      be added by performing the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        The configuration files listed above should probably not be
+        modified. If changes are required, you should create
+        <filename>/etc/dbus-1/session-local.conf</filename> and/or
+        <filename>/etc/dbus-1/system-local.conf</filename> and make any
+        desired changes to these files.
+     </para>
+
+      <para>
+        If any packages install a
+        <application>D-Bus</application> <filename>.service</filename>
+        file outside of the standard <filename
+        class="directory">/usr/share/dbus-1/services</filename> directory,
+        that directory should be added to the local session configuration.
+        For instance, <filename
+        class="directory">/usr/local/share/dbus-1/services</filename> can
+        be added by performing the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>cat &gt; /etc/dbus-1/session-local.conf &lt;&lt; "EOF"
@@ -247,8 +285,10 @@
       <title>Boot Script</title>
 
-      <para>To automatically start <command>dbus-daemon</command> when the
-      system is rebooted, install the
-      <filename>/etc/rc.d/init.d/dbus</filename> bootscript from the
-      <xref linkend="bootscripts"/> package.</para>
+      <para>
+        To automatically start <command>dbus-daemon</command> when the
+        system is rebooted, install the
+        <filename>/etc/rc.d/init.d/dbus</filename> bootscript from the
+        <xref linkend="bootscripts"/> package.
+      </para>
 
       <indexterm zone="dbus dbus-init">
@@ -258,43 +298,43 @@
 <screen role="root"><userinput>make install-dbus</userinput></screen>
 
-      <para>Note that this boot script only starts the system-wide
-      <application>D-Bus</application> daemon. Each user requiring access to
-      <application>D-Bus</application> services will also need to run a
-      session daemon as well. There are many methods you can use to start a
-      session daemon using the <command>dbus-launch</command> command. Review
-      the <command>dbus-launch</command> man page for details about the
-      available parameters and options. Here are some suggestions and
-      examples:</para>
+      <para>
+        Note that this boot script only starts the system-wide
+        <application>D-Bus</application> daemon. Each user requiring access to
+        <application>D-Bus</application> services will also need to run a
+        session daemon as well. There are many methods you can use to start a
+        session daemon using the <command>dbus-launch</command> command. Review
+        the <command>dbus-launch</command> man page for details about the
+        available parameters and options. Here are some suggestions and
+        examples:
+      </para>
 
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Add <command>dbus-launch</command> to the line in the
-          <filename>~/.xinitrc</filename> file that starts your graphical
-          desktop environment<!-- as shown in <xref linkend="gnome-config"/>-->.</para>
-        </listitem>
-        <listitem>
-          <para>If you use <command>xdm</command> or some other display manager
-          that calls the <filename>~/.xsession</filename> file, you can add
-          <command>dbus-launch</command> to the line in your
-          <filename>~/.xsession</filename> file that starts your graphical
-          desktop environment. The syntax would be similar to the example in
-          the <filename>~/.xinitrc</filename> file.</para>
-        </listitem>
-<!-- Enabled by default. 
-        <listitem>
-          <para>If you use <command>gdm</command> or some other display manager
-          that utilizes custom files to initiate sessions, use the example in
-          <xref linkend="gdm-config-dbus"/> of the
-          <application>GDM</application> instructions to create a file
-          containing <command>dbus-launch</command>.</para>
-        </listitem>-->
-        <listitem>
-          <para>The examples shown previously use
-          <command>dbus-launch</command> to specify a program to be run. This
-          has the benefit (when also using the
-          <parameter>--exit-with-session</parameter> parameter) of stopping the
-          session daemon when the specified program is stopped. You can also
-          start the session daemon in your system or personal startup scripts
-          by adding the following lines:</para>
+          <para>
+            Add <command>dbus-launch</command> to the line in the
+            <filename>~/.xinitrc</filename> file that starts your graphical
+            desktop environment.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            If you use <command>xdm</command> or some other display manager
+            that calls the <filename>~/.xsession</filename> file, you can add
+            <command>dbus-launch</command> to the line in your
+            <filename>~/.xsession</filename> file that starts your graphical
+            desktop environment. The syntax would be similar to the example in
+            the <filename>~/.xinitrc</filename> file.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The examples shown previously use
+            <command>dbus-launch</command> to specify a program to be run. This
+            has the benefit (when also using the
+            <parameter>--exit-with-session</parameter> parameter) of stopping the
+            session daemon when the specified program is stopped. You can also
+            start the session daemon in your system or personal startup scripts
+            by adding the following lines:
+          </para>
 
 <screen><userinput><literal># Start the D-Bus session daemon
@@ -302,7 +342,9 @@
 export DBUS_SESSION_BUS_ADDRESS</literal></userinput></screen>
 
-          <para>This method will not stop the session daemon when you exit
-          your shell, therefore you should add the following line to your
-          <filename>~/.bash_logout</filename> file:</para>
+          <para>
+            This method will not stop the session daemon when you exit
+            your shell, therefore you should add the following line to your
+            <filename>~/.bash_logout</filename> file:
+          </para>
 
 <screen><userinput><literal># Kill the D-Bus session daemon
@@ -311,9 +353,10 @@
 
         <listitem>
-          <para>A hint has been written that provides ways to start scripts
-          using the KDM session manager of KDE. The concepts in this hint could
-          possibly be used with other session managers as well. The hint is
-          located at <ulink
-          url="&hints-root;/downloads/files/execute-session-scripts-using-kdm.txt"/>.
+          <para>
+            A hint has been written that provides ways to start scripts
+            using the KDM session manager of KDE. The concepts in this hint could
+            possibly be used with other session managers as well. The hint is
+            located at <ulink
+            url="&hints-root;/downloads/files/execute-session-scripts-using-kdm.txt"/>.
           </para>
         </listitem>
@@ -330,13 +373,23 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, 
-	dbus-send and dbus-uuidgen</seg>
-        <seg>libdbus-1.so</seg>
-        <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0, 
-	/usr/share/dbus-1, /usr/share/doc/dbus-1.6.0 and /var/run/dbus</seg>
+        <seg>
+          dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, 
+	  dbus-send and dbus-uuidgen
+        </seg>
+        <seg>
+           libdbus-1.so
+        </seg>
+        <seg>
+          /etc/dbus-1,
+          /usr/include/dbus-1.0,
+          /usr/lib/dbus-1.0, 
+	  /usr/share/dbus-1,
+          /usr/share/doc/dbus-&dbus-version; and
+          /var/lib/dbus
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -350,5 +403,7 @@
         <term><command>dbus-cleanup-sockets</command></term>
         <listitem>
-          <para>is used to clean up leftover sockets in a directory.</para>
+          <para>
+            is used to clean up leftover sockets in a directory.
+          </para>
           <indexterm zone="dbus dbus-cleanup-sockets">
             <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
@@ -360,6 +415,7 @@
         <term><command>dbus-daemon</command></term>
         <listitem>
-          <para>is the <application>D-Bus</application> message bus
-          daemon.</para>
+          <para>
+            is the <application>D-Bus</application> message bus daemon.
+          </para>
           <indexterm zone="dbus dbus-daemon">
             <primary sortas="b-dbus-daemon">dbus-daemon</primary>
@@ -371,7 +427,9 @@
         <term><command>dbus-launch</command></term>
         <listitem>
-          <para>is used to start <command>dbus-daemon</command> from a shell
-          script. It  would  normally be called from a user's login
-          scripts.</para>
+          <para>
+            is used to start <command>dbus-daemon</command> from a shell
+            script. It  would  normally be called from a user's login
+            scripts.
+          </para>
           <indexterm zone="dbus dbus-launch">
             <primary sortas="b-dbus-launch">dbus-launch</primary>
@@ -383,6 +441,8 @@
         <term><command>dbus-monitor</command></term>
         <listitem>
-          <para>is used to monitor messages going through a
-          <application>D-Bus</application> message bus.</para>
+          <para>
+            is used to monitor messages going through a
+            <application>D-Bus</application> message bus.
+          </para>
           <indexterm zone="dbus dbus-monitor">
             <primary sortas="b-dbus-monitor">dbus-monitor</primary>
@@ -394,6 +454,8 @@
         <term><command>dbus-send</command></term>
         <listitem>
-          <para>is used to send a message to a <application>D-Bus</application>
-          message bus.</para>
+          <para>
+            is used to send a message to a <application>D-Bus</application>
+            message bus.
+          </para>
           <indexterm zone="dbus dbus-send">
             <primary sortas="b-dbus-send">dbus-send</primary>
@@ -405,5 +467,7 @@
         <term><command>dbus-uuidgen</command></term>
         <listitem>
-          <para>is used to generate or read a universally unique ID.</para>
+          <para>
+            is used to generate a universally unique ID.
+          </para>
           <indexterm zone="dbus dbus-uuidgen">
             <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
@@ -415,10 +479,12 @@
         <term><filename class='libraryfile'>libdbus-1.so</filename></term>
         <listitem>
-          <para>contains the API functions used by the
-          <application>D-Bus</application> message daemon.
-          <application>D-Bus</application> is first a library that provides
-          one-to-one communication between any two applications;
-          <command>dbus-daemon</command> is an application that uses this
-          library to implement a message bus daemon.</para>
+          <para>
+            contains the API functions used by the
+            <application>D-Bus</application> message daemon.
+            <application>D-Bus</application> is first a library that provides
+            one-to-one communication between any two applications;
+            <command>dbus-daemon</command> is an application that uses this
+            library to implement a message bus daemon.
+          </para>
           <indexterm zone="dbus libdbus-1">
             <primary sortas="c-libdbus-1">libdbus-1.so</primary>
@@ -432,2 +498,3 @@
 
 </sect1>
+ 
