Index: archive/gnome/caribou-new.xml
===================================================================
--- archive/gnome/caribou-new.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ archive/gnome/caribou-new.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="caribou" xreflabel="Caribou-&caribou-version;" revision="systemd">
+<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
   <?dbhtml filename="caribou.html"?>
 
Index: archive/w3m.xml
===================================================================
--- archive/w3m.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ archive/w3m.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -17,6 +17,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: pierre $</othername>
-    <date>$Date: 2019-02-15 22:01:29 +0100 (ven. 15 févr. 2019) $</date>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2019-06-09 07:27:41 -0500 (Sun, 09 Jun 2019) $</date>
   </sect1info>
 
Index: general.ent
===================================================================
--- general.ent	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general.ent	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -6,5 +6,5 @@
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
-<!ENTITY version      "&year;-&month;-&day;">
+<!ENTITY version      "&year;-&month;-&day; System V">
 <!ENTITY releasedate  "June 27th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -83,5 +83,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20190524">
+<!ENTITY blfs-bootscripts-version     "20190609">
 <!ENTITY systemd-units-version        "20180105">
 
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genlib/libatasmart.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -149,5 +149,5 @@
         <listitem>
           <para>
-            is a utility to issue disk tests.
+            is a utility to issue disks tests.
           </para>
           <indexterm zone="libatasmart sktest">
Index: general/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genlib/libbytesize.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -146,5 +146,5 @@
           /usr/include/bytesize,
           /usr/share/gtk-doc/html/libbytesize, and 
-          /usr/lib/python{2.7,3.7}/site-packages/bytesize
+          /usr/lib/python{2.7,3.6}/site-packages/bytesize
         </seg>
       </seglistitem>
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genlib/libpaper.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -100,5 +100,5 @@
 
 cat &gt; /usr/bin/run-parts &lt;&lt; "EOF"
-#!/bin/sh
+<literal>#!/bin/sh
 # run-parts:  Runs all the scripts found in a directory.
 # from Slackware, by Patrick J. Volkerding with ideas borrowed
@@ -147,5 +147,5 @@
 done
 
-exit 0
+exit 0</literal>
 EOF
 
@@ -185,5 +185,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/papersize &lt;&lt; "EOF"
-a4
+<literal>a4</literal>
 EOF</userinput></screen>
 
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genlib/libwacom.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;" revision="systemd">
+<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
   <?dbhtml filename="libwacom.html"?>
 
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genlib/telepathy-glib.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;" revision="systemd">
+<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
   <?dbhtml filename="telepathy-glib.html"?>
 
Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genutils/bogofilter.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;" revision="systemd">
+<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;">
   <?dbhtml filename="bogofilter.html"?>
 
Index: general/genutils/telepathy-mission-control.xml
===================================================================
--- general/genutils/telepathy-mission-control.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/genutils/telepathy-mission-control.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;" revision="systemd">
+<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
   <?dbhtml filename="telepathy-mission-control.html"?>
 
@@ -124,4 +124,14 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+<!--
+    <para>
+      <parameter>- -disable-upower</parameter> This switch
+      disables the use of <application>UPower</application>
+      because <application>Telepathy Mission Control</application>
+      fails to build with latest version.
+    </para>
+As far as I can tell, this is no longer needed as of 5.16.4. -renodr 
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -176,5 +186,5 @@
         <listitem>
           <para>
-            waits for a D-Bus bus name that will be provided
+            waits for a (D-Bus) bus name that will (after a while) be provided
             automatically by the desktop session.
           </para>
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/prog/rust.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -227,5 +227,5 @@
 
 <screen><userinput>cat &lt;&lt; EOF &gt; config.toml
-# see config.toml.example for more possible options
+<literal># see config.toml.example for more possible options
 [llvm]
 
@@ -263,5 +263,5 @@
 # get a trace if there is an Internal Compiler Exception
 backtrace-on-ice = true
-
+</literal>
 EOF</userinput></screen>
 
Index: general/sysutils/accountsservice.xml
===================================================================
--- general/sysutils/accountsservice.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/accountsservice.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;" revision="systemd">
+<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
   <?dbhtml filename="accountsservice.html"?>
 
@@ -86,5 +86,6 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/> and
-      <xref linkend="systemd"/>
+      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
     </para>
 
@@ -109,10 +110,20 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 
-meson --prefix=/usr            \
-            -Dadmin_group=adm  \
-            -Dsystemd=true     \
+meson --prefix=/usr                   \
+            -Dadmin_group=adm         \
+            -Delogind=true            \
+            -Dsystemdsystemunitdir=no \
+            .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr           \
+            -Dadmin_group=adm \
+            -Dsystemd=true    \
             .. &amp;&amp;
 ninja</userinput></screen>
@@ -167,10 +178,20 @@
 
     <sect3 id="accountsservice-init">
-      <title>Systemd Units</title>
-
-      <para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Units</phrase></title>
+
+      <para revision="sysv">
         To start the <command>accounts-daemon</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the
+        install the
+        <filename>/etc/rc.d/init.d/accounts-daemon</filename> init script from
+        the <xref linkend="bootscripts"/> package
+        by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <para revision="systemd">
+        To start the <command>accounts-daemon</command> daemon at boot,
+	enable the previously installed systemd unit
+        by running the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
@@ -180,5 +201,7 @@
       </indexterm>
 
-<screen role="root"><userinput>systemctl enable accounts-daemon</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make install-accounts-daemon</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable accounts-daemon</userinput></screen>
 
     </sect3>
Index: general/sysutils/cups-pk-helper.xml
===================================================================
--- general/sysutils/cups-pk-helper.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/cups-pk-helper.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;" revision="systemd">
+<sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;">
   <?dbhtml filename="cups-pk-helper.html"?>
 
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/dbus.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -92,7 +92,10 @@
     </para>
 
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="xorg7-lib"/> (for <command>dbus-launch</command> program)
+      <phrase revision="sysv"><xref linkend="elogind"/> (first build
+      without, and then again after elogind is installed)</phrase>
     </para>
 
@@ -142,7 +145,10 @@
             --sysconfdir=/etc                    \
             --localstatedir=/var                 \
+            --enable-user-session                \
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
             --disable-static                     \
+            --with-systemduserunitdir=no         \
+            --with-systemdsystemunitdir=no       \
             --docdir=/usr/share/doc/dbus-&dbus-version; \
             --with-console-auth-dir=/run/console \
@@ -189,5 +195,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para revision="systemd">
+    <para>
       The shared library needs to be moved to
       <filename class="directory">/lib</filename>, and as a result the
@@ -198,5 +204,5 @@
     </para>
 
-<screen revision="systemd" role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
+<screen role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
 ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
 
@@ -222,4 +228,11 @@
 <screen role="root" revision="sysv"><userinput>dbus-uuidgen --ensure</userinput></screen>
 
+    <para revision="sysv">
+      If using <xref linkend="elogind"/>, create a symlink to the
+      <filename>/var/lib/dbus/machine-id</filename> file:
+    </para>
+
+<screen role="root" revision="sysv"><userinput>ln -sv /var/lib/dbus/machine-id /etc</userinput></screen>
+
     <para revision="systemd">
       If not in chroot, at this point, you should reload the systemd daemon,
@@ -286,19 +299,15 @@
       href="../../xincludes/static-libraries.xml"/>
 
+    <para>
+      <parameter>--enable-user-session</parameter>: This parameter enables
+      per-user DBus sessions with
+      <phrase revision="sysv"><application>elogind</application>.</phrase>
+      <phrase revision="systemd"><application>systemd</application>.</phrase>
+    </para>
+
     <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This switch disables systemd
-      support in <application>D-Bus</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--without-systemdsystemunitdir</parameter>: This switch
-      prevents installation of systemd unit files.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--enable-user-session</parameter>: This parameter enables
-      per-user DBus sessions with <application>systemd</application>.
-    </para>
-
+      <parameter>--with-systemd{user,system}unitdir=</parameter>: These
+      switches disable installation of systemd units on elogind based systems.
+    </para>
     <para>
       <parameter>--with-console-auth-dir=/run/console/</parameter>: This
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/fcron.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -241,5 +241,5 @@
 
 <screen role="root"><userinput>cat &gt; /usr/bin/run-parts &lt;&lt; "EOF" &amp;&amp;
-#!/bin/sh
+<literal>#!/bin/sh
 # run-parts:  Runs all the scripts found in a directory.
 # from Slackware, by Patrick J. Volkerding with ideas borrowed
@@ -288,5 +288,5 @@
 done
 
-exit 0
+exit 0</literal>
 EOF
 chmod -v 755 /usr/bin/run-parts</userinput></screen>
@@ -305,8 +305,8 @@
 
 <screen role="root"><userinput>cat &gt; /var/spool/fcron/systab.orig &lt;&lt; "EOF"
-&amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
+<literal>&amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
 &amp;bootrun 02 4 * * * root run-parts /etc/cron.daily
 &amp;bootrun 22 4 * * 0 root run-parts /etc/cron.weekly
-&amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly
+&amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly</literal>
 EOF</userinput></screen>
 
Index: general/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/logrotate.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -126,5 +126,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/logrotate.conf &lt;&lt; EOF
-# Begin of /etc/logrotate.conf
+<literal># Begin of /etc/logrotate.conf
 
 # Rotate log files weekly
@@ -165,5 +165,5 @@
 include /etc/logrotate.d
 
-# End of /etc/logrotate.conf
+# End of /etc/logrotate.conf</literal>
 EOF
 
@@ -180,5 +180,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/logrotate.d/sys.log &lt;&lt; EOF
-/var/log/sys.log {
+<literal>/var/log/sys.log {
    # If the log file is larger than 100kb, rotate it
    size   100k
@@ -188,5 +188,5 @@
       /bin/killall -HUP syslogd
    endscript
-}
+}</literal>
 EOF
 
@@ -196,5 +196,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/logrotate.d/example.log &lt;&lt; EOF
-file1
+<literal>file1
 file2
 file3 {
@@ -203,5 +203,5 @@
     ...
    endscript
-}
+}</literal>
 EOF
 
Index: general/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/modemmanager.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -81,4 +81,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <xref linkend="gobject-introspection"/>,
       <xref linkend="libmbim"/>,
@@ -106,9 +107,11 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --enable-more-warnings=no \
-            --disable-static     &amp;&amp;
+<screen revision="sysv"><userinput>./configure --prefix=/usr                 \
+            --sysconfdir=/etc             \
+            --localstatedir=/var          \
+            --disable-static              \
+            --enable-more-warnings=no     \
+            --with-systemd-journal=no     \
+            --with-systemd-suspend-resume &amp;&amp;
 make</userinput></screen>
 
@@ -138,13 +141,16 @@
     <title>Command Explanations</title>
 
-    <para revision="systemd">
+    <para>
       <parameter>--with-systemd-suspend-resume</parameter>: This
-      switch forces <application>ModemManager</application> to use the systemd
+      switch forces <application>ModemManager</application> to use the
+      <phrase revision="sysv"><application>elogind</application></phrase>
+      <phrase revision="systemd"><application>systemd</application></phrase>
       power management facilities.
     </para>
 
-    <para revision="systemd">
+    <para>
       <parameter>--with-systemd-journal</parameter>: This switch forces
-      <application>ModemManager</application> to use the systemd journal for
+      <application>ModemManager</application>
+      <phrase revision="sysv">not</phrase> to use the systemd journal for
       logging.
     </para>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ general/sysutils/sysutils.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -35,4 +35,8 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome.ent	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -34,6 +34,6 @@
 <!ENTITY gnome-video-effects-version       "0.4.3">
 <!ENTITY grilo-version                     "0.3.7">
-<!ENTITY libchamplain-version              "0.12.19">
-<!ENTITY libgdata-version                  "0.17.10">
+<!ENTITY libchamplain-version              "0.12.16">
+<!ENTITY libgdata-version                  "0.17.9">
 <!ENTITY libgee-version                    "0.20.1">
 <!ENTITY libgtop-version                   "2.40.0">
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/applications.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -22,7 +22,4 @@
   </para>
 
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-apps.xml"/>
--->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baobab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/evolution.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="evolution" xreflabel="Evolution-&evolution-version;" revision="systemd">
+<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
   <?dbhtml filename="evolution.html" ?>
 
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-color-manager.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;" revision="systemd">
+<sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;">
   <?dbhtml filename="gnome-color-manager.html"?>
 
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-disk-utility.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;" revision="systemd">
+<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;">
   <?dbhtml filename="gnome-disk-utility.html"?>
 
Index: gnome/applications/gnome-logs.xml
===================================================================
--- gnome/applications/gnome-logs.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-logs.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;" revision="systemd">
+<sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;">
   <?dbhtml filename="gnome-logs.html"?>
 
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-maps.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;" revision="systemd">
+<sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;">
   <?dbhtml filename="gnome-maps.html"?>
 
Index: gnome/applications/gnome-power-manager.xml
===================================================================
--- gnome/applications/gnome-power-manager.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-power-manager.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;" revision="systemd">
+<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;">
   <?dbhtml filename="gnome-power-manager.html"?>
 
Index: gnome/applications/gnome-tweaks.xml
===================================================================
--- gnome/applications/gnome-tweaks.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-tweaks.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;" revision="systemd">
+<sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;">
   <?dbhtml filename="gnome-tweaks.html"?>
 
Index: gnome/applications/gnome-weather.xml
===================================================================
--- gnome/applications/gnome-weather.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/gnome-weather.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;" revision="systemd">
+<sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;">
   <?dbhtml filename="gnome-weather.html"?>
 
Index: gnome/applications/network-manager-applet.xml
===================================================================
--- gnome/applications/network-manager-applet.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/network-manager-applet.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -100,14 +100,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional" revision="sysv">
-      <xref linkend="gc"/> (for linker garbage collection),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jansson"/>,
-      <ulink url="&gnome-download-http;/gnome-bluetooth/">
-        GNOME Bluetooth</ulink>, and
-      <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
-        mobile-broadband-provider-info</ulink> (runtime)
-    </para>
-    <para role="optional" revision="systemd">
+    <para role="optional">
       <xref linkend="gc"/> (for linker garbage collection),
       <xref linkend="gnome-bluetooth"/>,
Index: gnome/applications/vinagre.xml
===================================================================
--- gnome/applications/vinagre.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/vinagre.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;" revision="systemd">
+<sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;">
   <?dbhtml filename="vinagre.html"?>
 
Index: gnome/applications/vino.xml
===================================================================
--- gnome/applications/vino.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/applications/vino.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="vino" xreflabel="Vino-&vino-version;" revision="systemd">
+<sect1 id="vino" xreflabel="Vino-&vino-version;">
   <?dbhtml filename="vino.html"?>
 
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/gnome.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,6 +14,5 @@
   <?dbhtml filename="gnome.html" dir="gnome"?>
 
-  <title><phrase revision="sysv">Selected GNOME Applications</phrase>
-         <phrase revision="systemd">GNOME</phrase></title>
+  <title>GNOME</title>
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/> -->
Index: gnome/platform/evolution-data-server.xml
===================================================================
--- gnome/platform/evolution-data-server.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/evolution-data-server.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -16,5 +16,5 @@
 
 <sect1 id="evolution-data-server"
-xreflabel="evolution-data-server-&evolution-data-server-version;" revision="systemd">
+xreflabel="evolution-data-server-&evolution-data-server-version;">
   <?dbhtml filename="evolution-data-server.html"?>
 
Index: gnome/platform/folks.xml
===================================================================
--- gnome/platform/folks.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/folks.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="folks" xreflabel="Folks-&folks-version;" revision="systemd">
+<sect1 id="folks" xreflabel="Folks-&folks-version;">
   <?dbhtml filename="folks.html"?>
 
@@ -113,5 +113,5 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+cd build &amp;&amp;
 
 meson --prefix=/usr --sysconfdir=/etc .. &amp;&amp;
Index: gnome/platform/gdm.xml
===================================================================
--- gnome/platform/gdm.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gdm.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="gdm" xreflabel="GDM-&gdm-version;" revision="systemd">
+<sect1 id="gdm" xreflabel="GDM-&gdm-version;">
   <?dbhtml filename="gdm.html"?>
 
@@ -100,5 +100,6 @@
       <xref role="runtime" linkend="gnome-session"/>,
       <xref role="runtime" linkend="gnome-shell"/>, and
-      <xref role="runtime" linkend="systemd"/>
+      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
+      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
     </para>
 
@@ -128,5 +129,17 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr         \
+<screen revision="sysv"><userinput>sed 's@systemd@elogind@' -i data/pam-lfs/gdm-launch-environment.pam &amp;&amp;
+
+./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --without-plymouth    \
+            --disable-static      \
+	    --enable-gdm-xsession \
+            --with-systemdsystemunitdir=no \
+            --with-pam-mod-dir=/lib/security &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure --prefix=/usr         \
             --sysconfdir=/etc     \
             --localstatedir=/var  \
@@ -145,5 +158,7 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root" revision="sysv"><userinput>make install</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>make install &amp;&amp;
 install -v -m644 data/gdm.service /lib/systemd/system/gdm.service</userinput></screen>    
 
@@ -214,7 +229,16 @@
 
     <sect3 id="gdm-init">
-      <title>Systemd Units</title>
-
-      <para>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
+
+      <para revision="sysv">
+        To start the <command>gdm</command> automatically when the system
+        is booted, install the <filename>/etc/rc.d/init.d/gdm</filename>
+        init script included in the <xref linkend="bootscripts"/> package and
+        set the default runlevel to 5 (graphical login) as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <para revision="systemd">
         To start the <command>gdm</command> daemon at boot, enable
         the previously installed systemd unit by running the following command
@@ -226,5 +250,24 @@
       </indexterm>
 
-<screen role="root"><userinput>systemctl enable gdm</userinput></screen>
+      <para revision="sysv">
+        In order to permanently set the default to 5, starting the
+        <command>gdm</command> greeter screen automatically, you can modify
+        <filename>/etc/inittab</filename>. As the  <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root" revision="sysv"><userinput>make install-gdm &amp;&amp;
+sed /initdefault/s/3/5/ -i /etc/inittab</userinput></screen>
+
+      <para revision="sysv">
+          You should also disable default elogind power management:
+      </para>
+
+<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
+<literal>AllowSuspend=no
+AllowHibernation=no</literal>
+EOF</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable gdm</userinput></screen>
 
     </sect3>
Index: gnome/platform/geocode-glib.xml
===================================================================
--- gnome/platform/geocode-glib.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/geocode-glib.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;" revision="systemd">
+<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;">
   <?dbhtml filename="geocode-glib.html"?>
 
Index: gnome/platform/gfbgraph.xml
===================================================================
--- gnome/platform/gfbgraph.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gfbgraph.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="gfbgraph" xreflabel="gfbgraph-&gfbgraph-version;" revision="systemd">
+<sect1 id="gfbgraph" xreflabel="gfbgraph-&gfbgraph-version;">
   <?dbhtml filename="gfbgraph.html"?>
 
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gjs.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -81,6 +81,6 @@
     </para>
 
-    <bridgehead revision="systemd" renderas="sect4">Recommended (required for GNOME)</bridgehead>
-    <para role="recommended" revision="systemd">
+    <bridgehead renderas="sect4">Recommended (required for GNOME)</bridgehead>
+    <para role="recommended">
       <xref linkend="gtk3"/>
     </para>
Index: gnome/platform/gnome-backgrounds.xml
===================================================================
--- gnome/platform/gnome-backgrounds.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-backgrounds.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;" revision="systemd">
+<sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;">
   <?dbhtml filename="gnome-backgrounds.html"?>
 
Index: gnome/platform/gnome-bluetooth.xml
===================================================================
--- gnome/platform/gnome-bluetooth.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-bluetooth.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;" revision="systemd">
+<sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;">
   <?dbhtml filename="gnome-bluetooth.html"?>
 
@@ -97,5 +97,6 @@
     <para role="optional">
       <xref role="runtime" linkend="bluez"/> and
-      <xref role="runtime" linkend="systemd"/>
+      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
+      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
     </para>
 
Index: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-control-center.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;" revision="systemd">
+<sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;">
   <?dbhtml filename="gnome-control-center.html"?>
 
Index: gnome/platform/gnome-menus.xml
===================================================================
--- gnome/platform/gnome-menus.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-menus.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;" revision="systemd">
+<sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;">
   <?dbhtml filename="gnome-menus.html"?>
 
Index: gnome/platform/gnome-online-accounts.xml
===================================================================
--- gnome/platform/gnome-online-accounts.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-online-accounts.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;" revision="systemd">
+<sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;">
   <?dbhtml filename="gnome-online-accounts.html"?>
 
Index: gnome/platform/gnome-session.xml
===================================================================
--- gnome/platform/gnome-session.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-session.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;" revision="systemd">
+<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;">
   <?dbhtml filename="gnome-session.html"?>
 
@@ -78,8 +78,9 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
+      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/>,</phrase>
       <xref linkend="gnome-desktop"/>,
       <xref linkend="json-glib"/>,
       <xref linkend="mesa"/>,
-      <xref linkend="systemd"/>,
+      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>,</phrase>
       and <xref linkend="upower"/>
     </para>
@@ -118,5 +119,13 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr           \
+      -Dsystemd_journal=false \
+      .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
Index: gnome/platform/gnome-settings-daemon.xml
===================================================================
--- gnome/platform/gnome-settings-daemon.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-settings-daemon.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;" revision="systemd">
+<sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;">
   <?dbhtml filename="gnome-settings-daemon.html"?>
 
@@ -89,5 +89,6 @@
       <xref linkend="libwacom"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="systemd"/>,
+      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
       <xref linkend="upower"/>, and
       <xref linkend="xorg-wacom-driver"/>
Index: gnome/platform/gnome-shell-extensions.xml
===================================================================
--- gnome/platform/gnome-shell-extensions.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-shell-extensions.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-shell-extensions" xreflabel="gnome-shell-extensions-&gnome-shell-extensions-version;" revision="systemd">
+<sect1 id="gnome-shell-extensions" xreflabel="gnome-shell-extensions-&gnome-shell-extensions-version;">
   <?dbhtml filename="gnome-shell-extensions.html"?>
 
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-shell.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;" revision="systemd">
+<sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;">
   <?dbhtml filename="gnome-shell.html"?>
 
@@ -84,5 +84,6 @@
       <xref linkend="sassc"/>,
       <xref linkend="startup-notification"/>, and
-      <xref linkend="systemd"/>
+      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
     </para>
 
Index: gnome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gnome-user-docs.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;" revision="systemd">
+<sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;">
   <?dbhtml filename="gnome-user-docs.html"?>
 
Index: gnome/platform/grilo.xml
===================================================================
--- gnome/platform/grilo.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/grilo.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="grilo" xreflabel="Grilo-&grilo-version;" revision="systemd">
+<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
   <?dbhtml filename="grilo.html"?>
 
@@ -95,7 +95,6 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr            \
+cd build    &amp;&amp;
+meson --prefix=/usr \
       --libexecdir=/usr/lib .. &amp;&amp;
 ninja</userinput></screen>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/gvfs.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -84,12 +84,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="gcr"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libcdio"/>,
-      <xref linkend="libgudev"/> and
-      <xref linkend="udisks2"/>
-    </para>
-    <para role="recommended" revision="systemd">
+    <para role="recommended">
       <xref linkend="gcr"/>,
       <xref linkend="gtk3"/>,
@@ -97,33 +90,11 @@
       <xref linkend="libgdata"/>,
       <xref linkend="libgudev"/>,
-      <!-- DJ, the below is for logind only. -renodr -->
-      <xref linkend="systemd"/>, and
+      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase> and
       <xref linkend="udisks2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional" revision="sysv">
-      <xref linkend="apache"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="fuse2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openssh"/>,
-      <xref linkend="samba"/>,
-      <ulink url="&gnome-download-http;/gnome-online-accounts">GNOME Online Accounts</ulink>,
-      <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-      <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
-      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>, 
-      <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
-      <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>,
-    </para>
-
-    <para role="optional" revision="systemd">
+    <para role="optional">
       <xref linkend="apache"/>,
       <xref linkend="avahi"/>,
@@ -173,5 +144,4 @@
       -Dsmb=false       \
       -Dtmpfilesdir=no  \
-      -Dlogind=false    \
       -Ddnssd=false     \
       -Dgoa=false       \
Index: gnome/platform/libchamplain.xml
===================================================================
--- gnome/platform/libchamplain.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/libchamplain.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -9,11 +9,11 @@
   <!ENTITY libchamplain-download-ftp
            "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-md5sum        "a3015b1f32d80d65515f8042ce595b30">
-  <!ENTITY libchamplain-size          "228 KB">
+  <!ENTITY libchamplain-md5sum        "52a410767f4797657b505e439bf7ce83">
+  <!ENTITY libchamplain-size          "612 KB">
   <!ENTITY libchamplain-buildsize     "10 MB">
   <!ENTITY libchamplain-time          "0.1 SBU">
 ]>
 
-<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;" revision="systemd">
+<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;">
   <?dbhtml filename="libchamplain.html"?>
 
@@ -79,7 +79,6 @@
       <xref linkend="clutter"/>,
       <xref linkend="clutter-gtk"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsoup"/>, and
-      <xref linkend="sqlite"/>
+      <xref linkend="gtk3"/>, and
+      <xref linkend="libsoup"/>
     </para>
 
@@ -108,10 +107,8 @@
     </para>
 
-<!-- Because there is still rudimentary autotools support, there is already a 
-     build directory. Change into it and go from there :-) -->
-<screen><userinput>cd build &amp;&amp;
-
-meson --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
+<screen><userinput>./configure --prefix=/usr     \
+            --enable-vala     \
+            --disable-static  &amp;&amp;
+make</userinput></screen>
 
     <para>
@@ -123,8 +120,8 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-  <!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -143,5 +140,4 @@
 
   </sect2>
-  -->
 
   <sect2 role="content">
@@ -161,6 +157,6 @@
         </seg>
         <seg>
-          /usr/include/champlain-0.12 and
-          /usr/share/gtk-doc/html/champlain-0.12
+          /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
+          /usr/share/gtk-doc/html/{libchamplain-0.12,libchamplain-gtk-0.12}
         </seg>
       </seglistitem>
Index: gnome/platform/libgdata.xml
===================================================================
--- gnome/platform/libgdata.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/libgdata.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -7,11 +7,11 @@
   <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
   <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-md5sum        "d858d411ad394c275643b14993dfeed4">
-  <!ENTITY libgdata-size          "820 KB">
-  <!ENTITY libgdata-buildsize     "73 MB (with tests)">
-  <!ENTITY libgdata-time          "1.1 SBU (with tests)">
+  <!ENTITY libgdata-md5sum        "cd41fec52a0f0ba999eb60025e0ac806">
+  <!ENTITY libgdata-size          "1.4 MB">
+  <!ENTITY libgdata-buildsize     "64 MB (with tests)">
+  <!ENTITY libgdata-time          "0.7 SBU (with tests)">
 ]>
 
-<sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;" revision="systemd">
+<sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;">
   <?dbhtml filename="libgdata.html"?>
 
@@ -114,9 +114,9 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>ninja test</command>. Note that
+      To test the results, issue: <command>make check</command>. Note that
       the tests need network access.
     </para>
@@ -126,5 +126,5 @@
     </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -154,8 +154,6 @@
         </seg>
         <seg>
-          /usr/include/libgdata,
-          /usr/libexec/installed-tests/libgdata,
-          /usr/share/gtk-doc/html/gdata, and
-          /usr/share/installed-tests/libgdata
+          /usr/include/libgdata and
+          /usr/share/gtk-doc/html/gdata
         </seg>
       </seglistitem>
Index: gnome/platform/libgee.xml
===================================================================
--- gnome/platform/libgee.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/libgee.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="libgee" xreflabel="libgee-&libgee-version;" revision="systemd">
+<sect1 id="libgee" xreflabel="libgee-&libgee-version;">
   <?dbhtml filename="libgee.html"?>
 
Index: gnome/platform/libgweather.xml
===================================================================
--- gnome/platform/libgweather.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/libgweather.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -15,5 +15,5 @@
 ]>
 
-<sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;" revision="systemd">
+<sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;">
   <?dbhtml filename="libgweather.html"?>
 
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/mutter.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="mutter" xreflabel="Mutter-&mutter-version;" revision="systemd">
+<sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
   <?dbhtml filename="mutter.html"?>
 
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/platform.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,24 +14,7 @@
   <?dbhtml filename="core.html"?>
 
-  <title><phrase revision="sysv">GNOME Libraries and Utilities</phrase>
-         <phrase revision="systemd">GNOME Libraries and Desktop</phrase></title>
+  <title>GNOME Libraries and Desktop</title>
 
-  <para revision="sysv">
-    The objective of this section is not to build a
-    <application>GNOME</application> desktop, because it depends on
-    <application>systemd</application>, which BLFS doesn't support. Rather, it
-    provides packages required for some platform independent
-    <application>GNOME</application> applications to build and run properly
-    under any Window Manager (e.g.
-    <application>Fluxbox</application>,
-    <application>Icewm</application>,
-    <application>Openbox</application>,
-    <application>Sawfish</application>), or Desktop Environment (e.g.
-    <application>KDE</application>,
-    <application>XFCE</application>,
-    <application>LXDE</application>).
-  </para>
-
-  <para revision="systemd">
+  <para>
     The objective of this section is to build a
     <application>GNOME</application> desktop, since we have
@@ -71,6 +54,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsound.xml"/>
 
-<!-- systemd: GNOME Desktop -->
-<!-- trunk: Required Runtime Dependencies -->
+<!-- GNOME Desktop -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/>-->
Index: gnome/platform/rest.xml
===================================================================
--- gnome/platform/rest.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/rest.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="rest" xreflabel="rest-&rest-version;" revision="systemd">
+<sect1 id="rest" xreflabel="rest-&rest-version;">
   <?dbhtml filename="rest.html"?>
 
Index: gnome/platform/zenity.xml
===================================================================
--- gnome/platform/zenity.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ gnome/platform/zenity.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="zenity" xreflabel="Zenity-&zenity-version;" revision="systemd">
+<sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
   <?dbhtml filename="zenity.html"?>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ introduction/welcome/changelog.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Move elogind branch to trunk. Incorporates
+          Gnome into System V version of the book.</para>
+        </listitem>
+        <listitem>
           <para>[xry111] - Update to libarchive-3.4.0. Fixes
           <ulink url="&blfs-ticket-root;12199">#12199</ulink>.</para>
@@ -56,14 +60,14 @@
           <para>[thomas] - Update bind-9.14.3. Fixes
           <ulink url="&blfs-ticket-root;12176">#12176</ulink></para>
-	</listitem>
-	<listitem>
+        </listitem>
+        <listitem>
           <para>[thomas] - Update nfs-utils-2.4.1. Fixes
           <ulink url="&blfs-ticket-root;12142">#12142</ulink></para>
         </listitem>
-	<listitem>
+        <listitem>
           <para>[thomas] - Update nano-4.3. Fixes
           <ulink url="&blfs-ticket-root;12170">#12170</ulink></para>
         </listitem>
-	<listitem>
+        <listitem>
           <para>[thomas] - Update postgresql-11.4. Fixes
           <ulink url="&blfs-ticket-root;12184">#12184</ulink></para>
@@ -101,5 +105,5 @@
         <listitem>
           <para>[renodr] - Update to PyYAML-5.1.1 (Python Module). Fixes
-          <ulink url="&blfs-ticket-root;12141">#12141</ulink>.</para>
+          <ulink url="&blfs-ticket-root;12142">#12142</ulink>.</para>
         </listitem>
         <listitem>
@@ -221,5 +225,6 @@
     </listitem>
 
-    <listitem>
+
+    <listitem revision="sysv">
       <para>June 15th, 2019</para>
       <itemizedlist>
@@ -341,6 +346,25 @@
         </listitem>
         <listitem>
+          <para>[dj] - Add lxpolkit and remove LXDE dependencies on
+          consolekit.</para>
+        </listitem>
+        <listitem>
           <para>[xry111] - Update to network-manager-applet-1.8.22. Fixes
           <ulink url="&blfs-ticket-root;12109">#12109</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[dj] - Install the gdm bootscript and change initdefault to
+          runlevel 5 for gdm.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[dj] - Bring back all Gnome Desktop packages.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[dj] - Remove NetworkManager required dependency on ConsoleKit
+          in favor of elogind.</para>
+        </listitem>
+   <listitem revision="sysv">
+          <para>[dj] - Add elogind-241.3 and adjust several packages to
+          utilize it.</para>
         </listitem>
       </itemizedlist>
@@ -1292,5 +1316,5 @@
         <listitem>
           <para>[pierre] - Archive w3m and allow Linux-pam documentation to
-	       be generated with lynx.</para>
+          be generated with lynx.</para>
         </listitem>
       </itemizedlist>
@@ -2173,5 +2197,5 @@
         <listitem>
           <para>[bdubbs] - Update xorg-libs: libXext-1.3.4, 
-          libXft-2.3.3,	libxkbfile-1.1.0,	libXmu-1.1.3, libXrandr-1.5.2,
+          libXft-2.3.3, libxkbfile-1.1.0, libXmu-1.1.3, libXrandr-1.5.2,
           xtrans-1.4.0, libXvMC-1.0.11, and libXxf86dga-1.1.5. Fixes
           <ulink url="&blfs-ticket-root;11814">#11814</ulink>,
@@ -2650,6 +2674,6 @@
       </itemizedlist>
     </listitem>
-    <listitem>
-
+
+    <listitem>
       <para>March 1st, 2019</para>
       <itemizedlist>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ kde/plasma5/plasma-all.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -307,5 +307,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/pam.d/kde &lt;&lt; "EOF" 
-# Begin /etc/pam.d/kde
+<literal># Begin /etc/pam.d/kde
 
 auth     requisite      pam_nologin.so
@@ -319,9 +319,9 @@
 session  include        system-session
 
-# End /etc/pam.d/kde
+# End /etc/pam.d/kde</literal>
 EOF
 
 cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF" 
-# Begin /etc/pam.d/kde-np
+<literal># Begin /etc/pam.d/kde-np
 
 auth     requisite      pam_nologin.so
@@ -335,14 +335,14 @@
 session  include        system-session
 
-# End /etc/pam.d/kde-np
+# End /etc/pam.d/kde-np</literal>
 EOF
 
 cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
-# Begin /etc/pam.d/kscreensaver
+<literal># Begin /etc/pam.d/kscreensaver
 
 auth    include system-auth
 account include system-account
 
-# End /etc/pam.d/kscreensaver
+# End /etc/pam.d/kscreensaver</literal>
 EOF</userinput></screen>
     </sect3>
@@ -369,11 +369,5 @@
     </para>
 
-<screen revision="sysv"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>ck-launch-session dbus-launch --exit-with-session $KF5_PREFIX/bin/startkde</literal>
-EOF
-
-startx</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 <literal>dbus-launch --exit-with-session $KF5_PREFIX/bin/startkde</literal>
 EOF
@@ -397,12 +391,4 @@
     <screen><userinput>startx &amp;&gt; ~/x-session-errors</userinput></screen>
 
-    <note revision="sysv">
-      <para>
-        You may wish to drop consolekit and/or dbus-launch, e.g., just using
-        startkde in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be possible, or the
-        reboot option may be absent or inoperative, among other problems.
-      </para>
-    </note>
     <para>
       When shutting down or rebooting, the shutdown messages appear on the vt
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ lxde/desktop/lxde-common.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -91,8 +91,6 @@
     <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
     <para role="recommended">
-      <phrase revision="sysv">
-         <xref role="runtime" linkend="consolekit"/> and
-      </phrase>
-      <xref role="runtime" linkend="dbus"/>
+      <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
+      <xref linkend="polkit-gnome"/>
     </para>
 
@@ -159,6 +157,5 @@
 
 <screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal revision="sysv"># No need to run dbus-launch, since it is run by startlxde
-ck-launch-session startlxde</literal><literal revision="systemd"># No need to run dbus-launch, since it is run by startlxde
+<literal># No need to run dbus-launch, since it is run by startlxde
 startlxde</literal>
 EOF
@@ -181,13 +178,4 @@
 
     <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <note revision="sysv">
-      <para>
-        You may wish to drop consolekit, just using
-        startlxde in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be available, or
-        the reboot option will be absent or inoperative, among other problems.
-      </para>
-    </note>
 
     <para>
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ lxde/desktop/lxsession.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -85,8 +85,4 @@
       <xref role="runtime" linkend="lsb-release"/> (may be used at runtime
       to display the distribution release in the logout dialog),
-      <phrase revision="sysv">
-        <xref role="runtime" linkend="consolekit"/> (used at runtime by
-        <command>lxsession-logout</command>),
-      </phrase>
       <xref linkend="gtk3"/>, and
       <xref linkend="libxslt"/> with
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ multimedia/libdriv/pulseaudio.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -76,14 +76,4 @@
     </itemizedlist>
 
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch if using glibc-2.27:
-          <ulink url="&patch-root;/pulseaudio-&pulseaudio-version;-glibc_2.27_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
     <bridgehead renderas="sect3">PulseAudio Dependencies</bridgehead>
 
@@ -97,4 +87,5 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="dbus"/>,
+      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <xref linkend="glib2"/>,
       <xref linkend="libcap-pam"/>,
@@ -107,6 +98,4 @@
       <xref linkend="avahi"/>,
       <xref linkend="bluez"/>,
-      <phrase revision="sysv">
-        <xref role="runtime" linkend="consolekit"/> (runtime),</phrase>
       <xref linkend="fftw"/>,
       <xref linkend="GConf"/>,
@@ -153,5 +142,15 @@
 sed -i "s:use-case.h:alsa/use-case.h:" src/modules/alsa/alsa-ucm.h</userinput></screen>
 
-<screen><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
+<screen revision="sysv"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
+./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --disable-bluez4             \
+            --disable-bluez5             \
+            --disable-rpath              \
+            --with-systemduserunitdir=no &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
 ./configure --prefix=/usr        \
             --sysconfdir=/etc    \
Index: multimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ multimedia/libdriv/sound-theme-freedesktop.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;" revision="systemd">
+<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;">
   <?dbhtml filename="sound-theme-freedesktop.html"?>
 
Index: networking/netlibs/uhttpmock.xml
===================================================================
--- networking/netlibs/uhttpmock.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ networking/netlibs/uhttpmock.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="uhttpmock" xreflabel="uhttpmock-&uhttpmock-version;" revision="systemd">
+<sect1 id="uhttpmock" xreflabel="uhttpmock-&uhttpmock-version;">
   <?dbhtml filename="uhttpmock.html"?>
 
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ networking/netutils/networkmanager.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -95,5 +95,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="curl"/>,
       <xref linkend="dhcpcd"/> or
@@ -106,4 +105,5 @@
       <xref linkend="polkit"/>,
       <xref linkend="pygobject3"/>,
+      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
       <xref linkend="upower"/>,
@@ -179,5 +179,5 @@
       -Dselinux=false            \
       -Dudev_dir=/lib/udev       \
-      -Dsession_tracking=no      \
+      -Dsession_tracking=elogind \
       -Dmodem_manager=false      \
       -Dsystemdsystemunitdir=no  \
@@ -244,6 +244,5 @@
 
     <para revision="sysv">
-      <parameter>-Dsession_tracking=no</parameter>,
-      <parameter>-Dsystemdsystemunitdir=no</parameter>, and
+      <parameter>-Dsystemdsystemunitdir=no</parameter> and
       <parameter>-Dsystemd_journal=false</parameter>: systemd is not
       used for sysv init systems.
@@ -267,4 +266,10 @@
       <application>ModemManager</application> is not installed. Omit if you
       have built <application>ModemManager</application>.
+    </para>
+
+    <para revision="sysv">
+      <parameter>-Dsession_tracking=elogind</parameter>: This switch
+      is used to set <command>elogind</command> as the default
+      program for session tracking.
     </para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ packages.ent	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -273,4 +273,5 @@
 <!ENTITY cups-pk-helper-version       "0.2.6">
 <!ENTITY dbus-version                 "1.12.16">   <!-- Even minors only -->
+<!ENTITY elogind-version              "241.3">
 <!ENTITY eudev-version                "1.7">
 <!ENTITY fcron-version                "3.2.1">
Index: postlfs/filesystems/fuse3.xml
===================================================================
--- postlfs/filesystems/fuse3.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/filesystems/fuse3.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -182,5 +182,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/fuse.conf &lt;&lt; "EOF"
-# Set the maximum number of FUSE mounts allowed to non-root users.
+<literal># Set the maximum number of FUSE mounts allowed to non-root users.
 # The default is 1000.
 #
@@ -190,5 +190,5 @@
 # mount options.
 #
-#user_allow_other
+#user_allow_other</literal>
 EOF</userinput></screen>
 
Index: postlfs/filesystems/initramfs.xml
===================================================================
--- postlfs/filesystems/initramfs.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/filesystems/initramfs.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -55,5 +55,5 @@
 
     <screen role="root"><userinput>cat &gt; /sbin/mkinitramfs &lt;&lt; "EOF"
-#!/bin/bash
+<literal>#!/bin/bash
 # This file based in part on the mkinitramfs script for the LFS LiveCD
 # written by Alexander E. Patrakov and Jeremy Huntwork.
@@ -244,5 +244,5 @@
 rm -rf $WDIR $unsorted
 printf "done.\n"
-
+</literal>
 EOF
 
@@ -251,5 +251,5 @@
     <screen role="root"><userinput>mkdir -p /usr/share/mkinitramfs &amp;&amp;
 cat &gt; /usr/share/mkinitramfs/init.in &lt;&lt; "EOF"
-#!/bin/sh
+<literal>#!/bin/sh
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -358,5 +358,5 @@
 
 exec switch_root /.root "$init" "$@"
-
+</literal>
 EOF</userinput></screen>
 
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/security/consolekit.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -219,5 +219,5 @@
 
 <screen role="root"><userinput>cat &gt; /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck &lt;&lt; "EOF"
-#!/bin/sh
+<literal>#!/bin/sh
 TAGDIR=/var/run/console
 
@@ -235,5 +235,5 @@
     sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
     [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
+fi</literal>
 EOF
 chmod -v 755 /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck</userinput></screen>
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/security/libcap.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -98,7 +98,7 @@
 <screen role="root"><userinput>mv -v /etc/pam.d/system-auth{,.bak} &amp;&amp;
 cat &gt; /etc/pam.d/system-auth &lt;&lt; "EOF" &amp;&amp;
-# Begin /etc/pam.d/system-auth
+<literal># Begin /etc/pam.d/system-auth
 
-auth      optional    pam_cap.so
+auth      optional    pam_cap.so</literal>
 EOF
 tail -n +3 /etc/pam.d/system-auth.bak &gt;&gt; /etc/pam.d/system-auth</userinput></screen>
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/security/linux-pam.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -190,8 +190,8 @@
 
 cat &gt; /etc/pam.d/other &lt;&lt; "EOF"
-auth     required       pam_deny.so
+<literal>auth     required       pam_deny.so
 account  required       pam_deny.so
 password required       pam_deny.so
-session  required       pam_deny.so
+session  required       pam_deny.so</literal>
 EOF</userinput></screen>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/security/polkit.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -72,15 +72,15 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/polkit-&polkit-version;-security_patch-3.patch"/>
+
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/polkit-&polkit-version;-fix_elogind_detection-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
 
@@ -91,15 +91,19 @@
     </para>
 
-    <bridgehead renderas="sect4" revision="systemd">Recommended</bridgehead>
-    <para role="recommended" revision="systemd">
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <note revision="systemd">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="linux-pam"/><phrase revision="sysv"> and
+      <xref linkend="elogind"/></phrase>
+    </para>
+
+    <note>
       <para>
-        Since <command>systemd-logind</command> uses PAM to register user
-        sessions, it is a good idea to build <application>Polkit</application>
-        with PAM support so <command>systemd-logind</command> can track
-        <application>Polkit</application> sessions.
+        Since <phrase revision="sysv"><command>elogind</command></phrase>
+        <phrase revision="systemd"><command>systemd-logind</command></phrase>
+        uses PAM to register user sessions, it is a good idea to build
+        <application>Polkit</application> with PAM support so
+        <phrase revision="sysv"><command>elogind</command></phrase>
+        <phrase revision="systemd"><command>systemd-logind</command></phrase>
+        can track <application>Polkit</application> sessions.
       </para>
     </note>
@@ -115,7 +119,6 @@
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>, <phrase revision="systemd">and </phrase>
-      <xref linkend="libxslt"/><phrase revision="sysv">, and
-      <xref linkend="linux-pam"/></phrase>
+      <xref linkend="gtk-doc"/>, and
+      <xref linkend="libxslt"/>
     </para>
 
@@ -169,24 +172,16 @@
 <screen><userinput>sed -i "s:/sys/fs/cgroup/systemd/:/sys:g" configure</userinput></screen>
     </note>
-<!--
-    <para>Fix an issue identified upstream after the package release:</para>
-
-<screen><userinput>sed -e '/JS_ReportWarningUTF8/s/,/, "%s",/'  \
-        -i  src/polkitbackend/polkitbackendjsauthority.cpp</userinput></screen> -->
-
+
+    <para revision="sysv">
+      Fix an issue introduced in recent <application>Polkit</application>
+      realeases with elogind:
+    </para>
+
+<screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
+autoreconf -fi</userinput></screen>
     <para>
       Install <application>Polkit</application> by running the following
       commands:
     </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                    \
-            --sysconfdir=/etc                \
-            --localstatedir=/var             \
-            --disable-static                 \
-            --enable-libsystemd-login=no     \
-            --enable-libelogind=no           \
-            --with-authfw=shadow             \
-            --with-os-type=LFS               &amp;&amp;
-make</userinput></screen>
 
 <screen revision="systemd"><userinput>./configure --prefix=/usr        \
@@ -197,4 +192,12 @@
 make</userinput></screen>
 
+<screen revision="sysv"><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static     \
+	    --with-os-type=LFS   \
+            --enable-libsystemd-login=no &amp;&amp;
+make</userinput></screen>
+
     <para>
       To test the results, issue: <command>make check</command>.
@@ -214,20 +217,5 @@
     <title>Command Explanations</title>
 
-    <para revision="sysv">
-      <parameter>--enable-libsystemd-login=no</parameter>: This parameter fixes
-      building without <application>systemd</application>, which is not part
-      of LFS/BLFS. If you use <application>systemd</application>,
-      replace "no" by "yes".
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-authfw=shadow</parameter>: This parameter configures the
-      package to use the <application>Shadow</application> rather than the
-      <application>Linux-PAM</application> Authentication framework. Change
-      the argument to 'pam' if you would like to use 
-      <application>Linux-PAM</application>.
-    </para>
-
-    <para revision="systemd">
+    <para>
       <option>--with-authfw=shadow</option>: This switch enables the
       package to use the <application>Shadow</application> rather than the
@@ -240,5 +228,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para revision="sysv">
+      <parameter>--enable-libsystemd-login=no</parameter>: This switch forces
+      polkit to build with elogind support (if available) rather than systemd.
+    </para>
 
   </sect2>
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ postlfs/virtualization/qemu.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -525,5 +525,5 @@
 <screen role="root"
         revision="systemd"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; EOF
-net.ipv4.ip_forward=1
+<literal>net.ipv4.ip_forward=1</literal>
 EOF</userinput></screen>
 
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ pst/scanning/sane.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -296,6 +296,6 @@
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/sane.d/net.conf &lt;&lt; "EOF"
-connect_timeout = 60
-&lt;server_ip&gt;
+<literal>connect_timeout = 60
+&lt;server_ip&gt;</literal>
 EOF</userinput></screen>
 
@@ -320,5 +320,5 @@
 
 cat &gt; /usr/share/applications/xscanimage.desktop &lt;&lt; "EOF" &amp;&amp;
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Name=XScanImage - Scanning
@@ -328,5 +328,5 @@
 Terminal=false
 Type=Application
-Categories=Application;Graphics
+Categories=Application;Graphics</literal>
 EOF
 
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/dm/lxdm.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -86,6 +86,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-     <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
-     <xref linkend="linux-pam"/>
+     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
+     <xref linkend="polkit-gnome"/>
     </para>
 
@@ -112,4 +112,5 @@
 auth     requisite      pam_nologin.so
 auth     required       pam_env.so
+auth     required       pam_succeed_if.so uid >= 1000 quiet
 auth     include        system-auth
 
@@ -302,4 +303,13 @@
 <screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
 sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
+
+      <para>
+          You should also disable default elogind power management:
+      </para>
+ 
+<screen role="root"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
+<literal>AllowSuspend=no
+AllowHibernation=no</literal>
+EOF</userinput></screen>
 
       <note>
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/installing/libinput.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -88,8 +88,5 @@
       <xref linkend="gtk3"/> (to build the GUI event viewer),
       <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink> (required for tests),
-      <ulink revision="sysv" url="https://sourceforge.net/projects/linuxwacom/files/libwacom/">libwacom</ulink>
-      <xref revision="systemd" linkend="libwacom"/>
-      <!-- commas outside the rev get rendered on either version -->
-      , and
+      <xref linkend="libwacom"/>, and
       <ulink url="https://pypi.org/project/pyparsing/">PyParsing</ulink> (for one non-root test)
     </para>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/installing/x7lib.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -155,4 +155,9 @@
       <xref linkend="fontconfig"/> and
       <xref linkend="libxcb"/>
+    </para>
+
+    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
+    <para role="recommended" revision="sysv">
+      <xref linkend="elogind"/>
     </para>
 
Index: x/installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/installing/xorg-config.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -268,10 +268,10 @@
 
 <screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/xkb-defaults.conf &lt;&lt; "EOF"
-Section "InputClass"
+<literal>Section "InputClass"
     Identifier "XKB Defaults"
     MatchIsKeyboard "yes"
     Option "XkbLayout" "fr"
     Option "XkbOptions" "terminate:ctrl_alt_bksp"
-EndSection
+EndSection</literal>
 EOF</userinput></screen>
 
@@ -294,5 +294,5 @@
 
 <screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/videocard-0.conf &lt;&lt; "EOF"
-Section "Device"
+<literal>Section "Device"
     Identifier  "Videocard0"
     Driver      "radeon"
@@ -300,5 +300,5 @@
     BoardName   "ATI Radeon 7500"
     Option      "NoAccel" "true"
-EndSection
+EndSection</literal>
 EOF</userinput></screen>
 
@@ -310,10 +310,10 @@
 
 <screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
-Section "ServerLayout"
+<literal>Section "ServerLayout"
     Identifier     "DefaultLayout"
     Screen      0  "Screen0" 0 0
     Screen      1  "Screen1" LeftOf "Screen0"
     Option         "Xinerama"
-EndSection
+EndSection</literal>
 EOF</userinput></screen>
 
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/installing/xorg-server.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -70,4 +70,5 @@
       </listitem>
     </itemizedlist>
+
 <!-- Prime support is now automatically added in DRI3, and this patch
      may break things on some setups.
@@ -92,13 +93,10 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="libepoxy"/> (required for glamor, see command
-      explanations below)
-    </para>
-    <para role="recommended" revision="systemd">
+    <para role="recommended">
       <xref linkend="libepoxy"/> (needed for glamor and Xwayland),
       <xref linkend="wayland"/> (needed for Xwayland),
       <xref linkend="wayland-protocols"/>, and
-      <xref linkend="systemd"/>
+      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
     </para>
 
@@ -115,6 +113,4 @@
       <xref linkend="xcb-util-wm"/> (all three to build Xephyr),
       <xref linkend="xmlto"/> (to build documentation),
-      <phrase revision="sysv"><xref linkend="wayland"/> (needed for Xwayland),
-      <xref linkend="wayland-protocols"/>,</phrase>
       <ulink url="http://download.savannah.gnu.org/releases/libunwind">libunwind</ulink>, and
       <ulink url="https://www.x.org/archive/individual/doc/">xorg-sgml-doctools</ulink> (to build documentation)
@@ -140,15 +136,8 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure $XORG_CONFIG            \
-           --enable-glamor          \
-           --enable-install-setuid  \
-           --enable-suid-wrapper    \
-           --disable-systemd-logind \
-           --with-xkb-output=/var/lib/xkb &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure $XORG_CONFIG          \
-            --enable-glamor       \
-            --enable-suid-wrapper \
+<screen><userinput>./configure $XORG_CONFIG            \
+            --enable-glamor         \
+            --enable-suid-wrapper   \
+            --enable-install-setuid \
             --with-xkb-output=/var/lib/xkb &amp;&amp;
 make</userinput></screen>
@@ -188,10 +177,4 @@
     </para>
 
-    <para revision="sysv">
-      <parameter>--enable-install-setuid</parameter>: The Xorg binary must run
-      as the root user. This switch ensures that the binary is installed
-      setuid when <command>make</command> is run by an unprivileged user.
-    </para>
-
     <para>
       <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
@@ -199,16 +182,11 @@
     </para>
 
-    <para revision="sysv">
-      <parameter>--disable-systemd-logind</parameter>: Do not build
-      systemd-logind support, otherwise, an error (EE), logged in
-      <filename>/var/log/Xorg.0.log</filename>, occurs when starting the X
-      server.  Systemd is not supported by this (sysv) version of BLFS.
-    </para>
-
-    <para revision="systemd">
+    <para>
       <option>--disable-systemd-logind --enable-install-setuid</option>:
-      These switches disable systemd-logind integration and restore the setuid
-      bit to the Xorg executable, allowing Xorg Server to work
-      without having the systemd PAM module installed and set up.
+      These switches disable <phrase revision="systemd">systemd-logind</phrase>
+      <phrase revision="sysv">elogind</phrase> integration and restore the
+      setuid bit to the Xorg executable, allowing Xorg Server to work
+      without having the <phrase revision="systemd">systemd</phrase>
+      <phrase revision="elogind">elogind</phrase> PAM module configured.
     </para>
 
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/installing/xorg7.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -125,7 +125,7 @@
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
-XORG_PREFIX="$XORG_PREFIX"
+<literal>XORG_PREFIX="$XORG_PREFIX"
 XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
-export XORG_PREFIX XORG_CONFIG
+export XORG_PREFIX XORG_CONFIG</literal>
 EOF
 chmod 644 /etc/profile.d/xorg.sh</userinput></screen>
@@ -154,5 +154,5 @@
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
-
+<literal>
 pathappend $XORG_PREFIX/bin             PATH
 pathappend $XORG_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
@@ -165,5 +165,5 @@
 ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
 
-export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
+export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH</literal>
 EOF</userinput></screen>
 
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/lib/clutter.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -92,9 +92,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk3"/>
-    </para>
-    <para role="recommended" revision="systemd">
+    <para role="recommended">
       <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk3"/>,
@@ -106,13 +102,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional" revision="sysv">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="libxkbcommon"/>,
-      <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>, and
-      <xref linkend="wayland"/>
-    </para>
-    <para role="optional" revision="systemd">
+    <para role="optional">
       <xref linkend="gtk-doc"/> and
       <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>
@@ -141,8 +129,5 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr --sysconfdir=/etc --enable-egl-backend &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr               \
+<screen><userinput>./configure --prefix=/usr               \
             --sysconfdir=/etc           \
             --enable-egl-backend        \
@@ -175,6 +160,5 @@
 
     <para>
-      <parameter revision="systemd">--enable-evdev-input</parameter><option
-      revision="sysv">--enable-evdev-input</option>: This switch enables
+      <parameter>--enable-evdev-input</parameter>: This switch enables
       the experimental Evdev input backend which is required for
       <application>GNOME</application> Wayland support.
@@ -182,10 +166,8 @@
 
     <para>
-      <parameter revision="systemd">--enable-wayland</parameter><option
-      revision="sysv">--enable-wayland</option> and <parameter
-      revision="systemd">--enable-wayland-compositor</parameter><option
-      revision="sysv">--enable-wayland-compositor</option>: These switches
-      enable the experimental <application>Wayland</application> API in
-      <application>Clutter</application> which is required for
+      <parameter>--enable-wayland</parameter> and
+      <parameter>--enable-wayland-compositor</parameter>: These
+      switches enable the experimental <application>Wayland</application> API
+      in <application>Clutter</application> which is required for
       <application>GNOME</application> Wayland support.
     </para>
Index: x/lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/lib/cogl.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -83,7 +83,7 @@
       <xref linkend="gdk-pixbuf"/>,
       <xref linkend="glu"/>,
-      <xref linkend="mesa"/>,<phrase revision="sysv"> and</phrase>
-      <xref linkend="pango"/><phrase revision="systemd">, and 
-      <xref linkend="wayland"/></phrase>
+      <xref linkend="mesa"/>,
+      <xref linkend="pango"/>, and 
+      <xref linkend="wayland"/>
     </para>
 
@@ -97,7 +97,6 @@
       <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="sdl"/>,<phrase revision="systemd"> and</phrase>
-      <xref linkend="sdl2"/><phrase revision="sysv">, and
-      <xref linkend="wayland"/></phrase>
+      <xref linkend="sdl"/>, and
+      <xref linkend="sdl2"/>
     </para>
 
@@ -125,10 +124,5 @@
     &parallel_issues;
 
-<screen revision="sysv"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
-
-./configure --prefix=/usr --enable-gles1 --enable-gles2         &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
+<screen><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
 
 ./configure --prefix=/usr --enable-gles1 --enable-gles2         \
@@ -166,8 +160,5 @@
 
     <para>
-      <phrase revision="sysv">
-      <option>--enable-{kms,wayland,xlib}-egl-platform</option>:</phrase>
-      <phrase revision="systemd">
-      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:</phrase>
+      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:
       These switches enable support for KMS, Wayland and Xlib EGL platforms.
       They are required for <application>GNOME</application> Wayland support.
@@ -175,8 +166,5 @@
 
     <para>
-      <phrase revision="sysv">
-      <option>--enable-wayland-egl-server</option>:</phrase>
-      <phrase revision="systemd">      
-      <parameter>--enable-wayland-egl-server</parameter>:</phrase> This switch
+      <parameter>--enable-wayland-egl-server</parameter>: This switch
       enables <application>Cogl</application>'s Wayland Server API which is
       required for <application>GNOME</application> Wayland support.
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/lib/gtk+2.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -212,6 +212,6 @@
 
 <screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
-include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"
+<literal>include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
+gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"</literal>
 EOF</userinput></screen>
 
@@ -229,6 +229,6 @@
 
 <screen role="root"><userinput>cat &gt; /etc/gtk-2.0/gtkrc &lt;&lt; "EOF"
-include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>elementary</replaceable>"
+<literal>include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
+gtk-icon-theme-name = "<replaceable>elementary</replaceable>"</literal>
 EOF</userinput></screen>
 
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/lib/gtk+3.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -103,14 +103,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional" revision="sysv">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="json-glib"/>,
-      <ulink url="http://icl.cs.utk.edu/papi/">PAPI</ulink>, and
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/rest/">rest</ulink>
-    </para>
-    <para role="optional" revision="systemd">
+    <para role="optional">
       <xref linkend="colord"/>,
       <xref linkend="cups"/>, 
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ x/lib/gtk-vnc.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;" revision="systemd">
+<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
   <?dbhtml filename="gtk-vnc.html"?>
 
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ xfce/core/xfce4-session.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -144,5 +144,4 @@
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,
@@ -150,13 +149,4 @@
       <xref linkend="openssh"/>
     </para>
-<!--
-    <para>
-      To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>. If you have <xref linkend="consolekit"/>
-      installed, use <command>startxfce4 -\-with-ck-launch</command>.
-      <application>ConsoleKit</application> is required to perform any
-      task that requires administrative access, including shut down
-      and reboot.
-    </para>-->
 
     <para>
@@ -187,6 +177,6 @@
     <para revision="systemd">
       You can start <application>Xfce4</application> from a TTY using
-      <xref linkend="xinit"/><!--, or from a graphical display manager, such as
-      <xref linkend="lightdm"/>-->.
+      <xref linkend="xinit"/>, or from a graphical display manager, such as
+      <xref linkend="lightdm"/>.
     </para>
 
@@ -196,11 +186,5 @@
     </para>
 
-<screen revision="sysv"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>ck-launch-session dbus-launch --exit-with-session startxfce4</literal>
-EOF
-
-startx</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
 <literal>dbus-launch --exit-with-session startxfce4</literal>
 EOF
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision e77adf78df0bf2742d25033585cc8633ebf654fa)
+++ xsoft/graphweb/seamonkey.xml	(revision 51dfb3e40097d532a9a463785093bac85a7dbe05)
@@ -409,5 +409,5 @@
 
 cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF"
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Type=Application
@@ -418,5 +418,5 @@
 Categories=Network;GTK;Application;Email;Browser;WebBrowser;News;
 StartupNotify=true
-Terminal=false
+Terminal=false</literal>
 EOF
 
