Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/applications.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/evolution.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-color-manager.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-disk-utility.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-logs.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-maps.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-power-manager.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-tweaks.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/gnome-weather.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/network-manager-applet.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/vinagre.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/applications/vino.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/gnome.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/evolution-data-server.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/folks.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gdm.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/geocode-glib.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gfbgraph.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gjs.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-backgrounds.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-bluetooth.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-control-center.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-menus.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-online-accounts.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-session.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-settings-daemon.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-shell-extensions.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-shell.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gnome-user-docs.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/grilo.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/gvfs.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/libchamplain.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/libgdata.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/libgee.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/libgweather.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/mutter.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/platform.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/rest.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -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 26ce221d0e36d73f2f3adc6ecaa63f1bd1b47ca8)
+++ gnome/platform/zenity.xml	(revision a643159ded489414219b92dc41c129ee0f4e0173)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="zenity" xreflabel="Zenity-&zenity-version;" revision="systemd">
+<sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
   <?dbhtml filename="zenity.html"?>
 
