Index: networking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/connect/dhcpcd.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -61,10 +61,10 @@
 
     <bridgehead renderas="sect3">dhcpcd Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="llvm"/> (with Clang)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/dhcpcd"/></para>
Index: networking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/mailnews/mailx.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -75,5 +75,5 @@
 
     <bridgehead renderas="sect3">Heirloom mailx Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openssl10"/> or
@@ -85,5 +85,5 @@
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mailx"/></para>
-
+-->
   </sect2>
 
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netlibs/libtirpc.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -74,10 +74,10 @@
 
     <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="mitkrb"/> for the GSSAPI
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libtirpc"/>
@@ -87,18 +87,9 @@
   <sect2 role="installation">
     <title>Installation of libtirpc</title>
-
+<!--
     <note><para>If updating this package, you will also need to update 
     any existing version of <xref linkend='rpcbind'/></para></note>
-<!--  Looks like this is incorporated in version 1.0.3
-    <para>
-      Fix a symbol name needed by NIS libraries:
-    </para>
+-->
 
-<screen><userinput>sed '/key_secret_is/s/secret/secretkey/' -i src/libtirpc.map</userinput></screen>
-    <para>
-      Install <application>libtirpc</application> by running the following
-      commands:
-    </para>
--->
 <screen><userinput>./configure --prefix=/usr                                   \
             --sysconfdir=/etc                               \
@@ -126,11 +117,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
+<!--
     <para>
-      <parameter>--disable-gssapi</parameter>: This switch is needed if
+      <parameter>- -disable-gssapi</parameter>: This switch is needed if
       no GSSAPI is installed. Remove this switch if you have one
       installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
     </para>
-
+-->
     <para>
       <command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netprogs/ntp.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -78,6 +78,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libevent"/>, 
+<!--      <xref linkend="libcap-pam"/>,
+      <xref linkend="libevent"/>, -->
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>, and
       <ulink url="https://www.gnu.org/software/autogen/">libopts from AutoGen</ulink>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netprogs/rsync.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -89,8 +89,8 @@
 <screen><userinput>./configure --prefix=/usr --without-included-zlib &amp;&amp;
 make</userinput></screen>
-
+<!--
     <para>If you have <xref linkend="doxygen"/> installed and wish to
     build HTML API documentation, issue <command>doxygen</command>.</para>
-
+-->
     <para>To test the results, issue: <command>make check</command>.</para>
 
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netprogs/wget.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -79,5 +79,5 @@
       <xref role="runtime" linkend="make-ca"/> (runtime)
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -92,5 +92,5 @@
       <xref linkend="valgrind"/> (for the test suite)
     </para>
-
+-->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/wget"/>
@@ -133,5 +133,5 @@
     <para>
       <parameter>--with-ssl=openssl</parameter>: This allows the program to use
-      openssl instead of <xref linkend="gnutls"/>.
+      openssl instead of <!--<xref linkend="gnutls"/>. -->
     </para>
 
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netprogs/wpa_supplicant.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -93,5 +93,5 @@
       <xref linkend="libnl"/> 
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -100,5 +100,5 @@
       <xref linkend="qt5"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/wpa_supplicant"/>
@@ -175,5 +175,5 @@
 CFLAGS += -I/usr/include/libnl3</literal>
 EOF</userinput></screen>
-
+<!--
     <para>
       If you wish to use <application>WPA Supplicant</application> with
@@ -183,5 +183,5 @@
       build configuration file by running the following command:
     </para>
-
+-->
 <screen><userinput>cat &gt;&gt; wpa_supplicant/.config &lt;&lt; "EOF"
 <literal>CONFIG_CTRL_IFACE_DBUS=y
@@ -198,5 +198,5 @@
 cd wpa_supplicant                                         &amp;&amp;
 make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
-
+<!--
     <para>
       If you have installed <xref linkend="qt5"/> and wish to build
@@ -207,5 +207,5 @@
     <note><para>The following directory name is labelled qt4, but 
     is compatible with <xref linkend="qt5"/>.</para></note>
-
+-->
 <screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
 qmake wpa_gui.pro &amp;&amp;
@@ -276,8 +276,8 @@
       </para>
     </note>
-
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-desktop-database.xml"/>
-
+-->
   </sect2>
 
@@ -389,5 +389,5 @@
       <para revision="sysv">
         If your router/access point uses DHCP to allocate IP addresses, you
-        can install <xref linkend="dhcp"/> client and use it to
+        can install<!-- <xref linkend="dhcp"/> -->client and use it to
         automatically obtain network addresses. Create the
         <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
@@ -419,5 +419,5 @@
       <para revision="sysv">
         If you prefer <xref linkend="dhcpcd"/> instead of
-        <xref linkend="dhcp"/> client, then create the
+<!--        <xref linkend="dhcp"/>--> client, then create the
         <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
         </filename> by running the following command as the
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/netutils/bind-utils.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -32,5 +32,5 @@
     <para><application>BIND Utilities</application> is not a separate
     package, it is a collection of the client side programs that are included
-    with <xref linkend="bind"/>. The <application>BIND</application>
+    with <!--<xref linkend="bind"/>-->. The <application>BIND</application>
     package includes the client side programs <command>nslookup</command>,
     <command>dig</command> and <command>host</command>. If you install
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect3">BIND Utilities Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -71,5 +71,5 @@
       <xref linkend="libxml2"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/bind-utils"/></para>
@@ -127,5 +127,5 @@
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
-    <para>See the program descriptions in the <xref linkend="bind"/>
+    <para>See the program descriptions in the <!-- <xref linkend="bind"/> -->
     section.</para>
 
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision 475b404e1cd495916bacd187d9868d213956b167)
+++ networking/textweb/links.xml	(revision e1100dac3170bcd5045521de30e4942de3b5102e)
@@ -64,4 +64,5 @@
     <para role="recommended"><xref linkend="openssl"/></para>
 -->
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">Graphics mode requires at least one of
@@ -80,5 +81,5 @@
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/LinksBrowser"/></para>
-
+-->
   </sect2>
 
