Index: networking/netutils/networkmanager-systemd.xml
===================================================================
--- networking/netutils/networkmanager-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ networking/netutils/networkmanager-systemd.xml	(revision 96733af191561eac5e91635281794abcfa4d5c6d)
@@ -102,4 +102,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="bluez"/> (runtime),
       <xref linkend="gtk-doc"/>,
       <xref linkend="qt4"/>,
@@ -119,18 +120,11 @@
     <title>Installation of NetworkManager</title>
 
-    <para>
-      If <xref linkend="qt4"/> and  <xref linkend="qt5"/> are installed, you
-      need to choose <application>Qt4</application> with
-      <command>source setqt4</command>, before starting. Install
-      <application>NetworkManager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --with-nmtui         \
-            --disable-ppp        \
-            --with-systemdsystemunitdir=no &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                   \
+            --sysconfdir=/etc               \
+            --localstatedir=/var            \
+            --disable-ppp                   \
+            --with-nmtui                    \
+            --with-session-tracking=systemd \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
 make</userinput></screen>
 
@@ -152,18 +146,26 @@
 
     <para>
-      <parameter>--with-nmtui</parameter>: This parameter enables build of
-      <command>nmtui</command>.
-    </para>
-
-    <para>
-      <parameter>--with-systemdsystemunitdir=no</parameter>: This parameter is
-      used for sysv init systems. If you use systemd, replace "no" by the
-      proper directory.
-    </para>
-
-    <para>
-      <parameter>--disable-ppp</parameter>: This parameter disables parameteral
+      <parameter>--disable-ppp</parameter>: This switch disables
       <application>PPP</application> support in
-      <application>NetworkManager</application>.
+      <application>NetworkManager</application> because
+      <application>PPP</application> isn't part of BLFS.
+    </para>
+
+    <para>
+      <parameter>--with-nmtui</parameter>: This switch enables building
+      of the <command>nmtui</command> program. Remove it if you have
+      not installed <xref linkend="newt"/>.
+    </para>
+
+    <para>
+      <parameter>--with-session-tracking=systemd</parameter>: This switch
+      is used to set <command>systemd-logind</command> as the default
+      program for session tracking.
+    </para>
+
+    <para>
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      This switch is used to set the correct installation directory for
+      systemd units.
     </para>
 
@@ -190,6 +192,5 @@
 
       <indexterm zone="NetworkManager NetworkManager-config">
-        <primary
-        sortas="e-etc-NetworkManager-NetworkManager.conf">
+        <primary sortas="e-etc-NetworkManager-NetworkManager.conf">
         /etc/NetworkManager/NetworkManager.conf</primary>
       </indexterm>
@@ -200,10 +201,10 @@
 
       <para>
-        For <application>NetworkManager</application> to work, at least
-        minimal configuration file must be present. Such file is not
-        installed with <command>make install</command>. Issue following
+        For <application>NetworkManager</application> to work, at least a
+        basic configuration file must be present. Such file is not
+        installed with <command>make install</command>. Run the following
         command as the
-        <systemitem class="username">root</systemitem> user to create
-        minimal <filename>NetworkManager.conf</filename> file:
+        <systemitem class="username">root</systemitem> user to create a
+        basic <filename>NetworkManager.conf</filename> file:
       </para>
 
@@ -214,5 +215,5 @@
 
       <para>
-        You can add <option>dns=none</option> to suppress changes to
+         You can add <option>dns=none</option> to suppress changes to
          <filename>/etc/resolv.conf</filename>. See
          <command>man 5 NetworkManager.conf</command>
@@ -223,11 +224,10 @@
 
     <sect3 id="NetworkManager-init">
-      <title>Boot Script</title>
+      <title>Systemd Units</title>
 
       <para>
-        To automatically start the <command>NetworkManager</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/networkmanager</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
+        To start the <command>NetworkManager</command> daemon at boot, enable
+        the previously installed systemd unit by running the following command
+        as the <systemitem class="username">root</systemitem> user:
       </para>
 
@@ -236,5 +236,16 @@
       </indexterm>
 
-<screen role="root"><userinput>make install-networkmanager</userinput></screen>
+<screen role="root"><userinput>systemctl enable NetworkManager</userinput></screen>
+
+      <para>
+        <application>NetworkManager</application> also ships a systemd unit
+        called <filename>NetworkManager-wait-online.service</filename> which
+        can be used to prevent services that require network connectivity
+        from starting until <application>NetworkManager</application> has
+        established the connection. To enable it, run the following command
+        as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>systemctl enable NetworkManager-wait-online</userinput></screen>
 
     </sect3>
@@ -252,11 +263,9 @@
       <seglistitem>
         <seg>
-          NetworkManager, nm-avahi-autoipd.action, nm-dhcp-helper,
-          nm-dispatcher, nm-online, nmcli, and, hardlinked to each other:
-          nmtui, nmtui-connect, nmtui-edit, and nmtui-hostname
+          NetworkManager, nm-online, nmcli, nmtui, nmtui-connect,
+          nmtui-edit, and nmtui-hostname
         </seg>
         <seg>
-          libnm-glib.so, libnm-glib-vpn.so, libnm-util.so, and
-          modules under /usr/lib/NetworkManager
+          libnm-glib.so, libnm-glib-vpn.so, and libnm-util.so
         </seg>
         <seg>
@@ -310,5 +319,5 @@
         <listitem>
           <para>
-            interactive ncurses based interface for
+            is an interactive ncurses based interface for
             <application>nmcli</application>.
           </para>
@@ -323,5 +332,6 @@
         <listitem>
           <para>
-            interactive ncurses based interface connection activate/deactivate.
+            is an interactive ncurses based interface connection
+            activate/deactivate.
           </para>
           <indexterm zone="NetworkManager nmtui-connect">
@@ -335,5 +345,6 @@
         <listitem>
           <para>
-            interactive ncurses based interface connection editor.
+            is an interactive ncurses based interface connection
+            editor.
           </para>
           <indexterm zone="NetworkManager nmtui-edit">
@@ -347,5 +358,6 @@
         <listitem>
           <para>
-            interactive ncurses based interface hostname editor.
+            is an interactive ncurses based interface hostname
+            editor.
           </para>
           <indexterm zone="NetworkManager nmtui-hostname">
