Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ networking/netprogs/wpa_supplicant.xml	(revision 2946338a6dd27423598bae7641d3da88dd6faaba)
@@ -170,5 +170,5 @@
       If you wish to use <application>WPA Supplicant</application> with
       <xref linkend="NetworkManager"/>, make sure that you have installed
-      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add
+      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
       following options to the <application>WPA Supplicant</application>
       build configuration file by running the following command:
@@ -191,5 +191,5 @@
     <para>
       If you have installed <xref linkend="qt"/> and wish to build
-      <application>WPA Supplicant</application> GUI program, run
+      the <application>WPA Supplicant</application> GUI program, run
       the following commands:
     </para>
@@ -205,11 +205,13 @@
 
     <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /sbin &amp;&amp;
-install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8</userinput></screen>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant}               \
+                 /sbin                                         &amp;&amp;
+install -v -m644 doc/docbook/wpa_supplicant.conf.5             \
+                 /usr/share/man/man5                           &amp;&amp;
+install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 \
+                 /usr/share/man/man8</userinput></screen>
 
     <para>
@@ -223,25 +225,29 @@
 <screen role="root"><userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
                  /usr/share/dbus-1/system-services &amp;&amp;
-install -v -m644 dbus/dbus-wpa_supplicant.conf /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
-
-    <para>
-      If you have built <application>WPA Supplicant</application> GUI
+install -v -m644 dbus/dbus-wpa_supplicant.conf \
+                 /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
+
+    <para>
+      If you have built the <application>WPA Supplicant</application> GUI
       program, install it by running the following commands as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>install -m755 wpa_gui-qt4/wpa_gui /usr/bin/ &amp;&amp;
-install -m644 doc/docbook/wpa_gui.8 /usr/share/man/man8/ &amp;&amp;
-install -m644 wpa_gui-qt4/wpa_gui.desktop /usr/share/applications/ &amp;&amp;
-install -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/</userinput></screen>
+<screen role="root"><userinput>
+install -v -m755 wpa_gui-qt4/wpa_gui           /usr/bin/ &amp;&amp;
+install -v -m644 doc/docbook/wpa_gui.8         /usr/share/man/man8/ &amp;&amp;
+install -v -m644 wpa_gui-qt4/wpa_gui.desktop   /usr/share/applications/ &amp;&amp;
+install -v -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/</userinput></screen>
 
     <note>
       <para>
-        You will need to restart system <application>D-Bus</application> daemon
-        before you can use <application>WPA Supplicant</application>
+        You will need to restart the system <application>D-Bus</application> daemon
+        before you can use the <application>WPA Supplicant</application>
         <application>D-Bus</application> interface.
       </para>
     </note>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-desktop-database.xml"/>
   </sect2>
 
@@ -263,5 +269,5 @@
 
       <para>
-        To connect to an access point that uses a password you need to put
+        To connect to an access point that uses a password, you need to put
         the pre-shared key in <filename>/etc/wpa_supplicant.conf</filename>. Use
         <command>wpa_passphrase</command> to generate this. SSID is the string
