Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ general/genutils/imagemagick.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -155,5 +155,5 @@
     <para role="optional">
       <xref linkend="jasper"/>,
-      <xref linkend="lcms"/> or
+      <xref role="nodep" linkend="lcms"/> or
       <xref linkend="lcms2"/>,
       <xref linkend="libexif"/>,
Index: general/genutils/imagemagick6.xml
===================================================================
--- general/genutils/imagemagick6.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ general/genutils/imagemagick6.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -182,5 +182,5 @@
     <para role="optional">
       <xref linkend="jasper"/>,
-      <xref linkend="lcms"/> or
+      <xref role="nodep" linkend="lcms"/> or
       <xref linkend="lcms2"/>,
       <xref linkend="libexif"/>,
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ general/prog/git.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -116,5 +116,5 @@
     <para role="optional">
       <xref linkend="pcre2"/> (<emphasis>or</emphasis> the deprecated <xref
-      linkend="pcre"/>), in either case configured with
+      role="nodep" linkend="pcre"/>), in either case configured with
       <literal>--enable-jit</literal>,
       <xref linkend="python2"/>,
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ general/prog/python2.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -121,14 +121,5 @@
       <xref linkend="tk"/>
     </para>
-<!--
-    <note>
-      <para>
-        If you are building <xref linkend="thunderbird"/> or
-        <xref linkend="firefox"/>
-        you must install <application>openssl</application> before you build
-        <application>Python 2</application>.
-      </para>
-    </note>
--->
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/Python"/>
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ general/sysutils/pciutils.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -80,6 +80,6 @@
     <para role="recommended">
        <xref linkend="curl"/>,
-       <xref linkend="wget"/>,
-       OR <xref linkend="lynx"/>
+       <xref linkend="wget"/>, or
+       <xref linkend="lynx"/>
        (for the update-pciids script to function correctly).
     </para>
Index: lxde/desktop/libfm.xml
===================================================================
--- lxde/desktop/libfm.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ lxde/desktop/libfm.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -76,5 +76,5 @@
     <para role="required">
       <xref linkend="gtk3"/> or 
-      <xref linkend="gtk2"/> and
+      <xref role="nodep" linkend="gtk2"/>, and
       <xref linkend="menu-cache"/>
     </para>
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ lxde/desktop/lxde-common.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -89,12 +89,7 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
-      <xref linkend="polkit-gnome"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
     <para role="optional">
+      <xref role="runtime" linkend="polkit-gnome"/>,
       A notification daemon such as
       <xref role="runtime" linkend="notification-daemon"/> or
Index: lxde/desktop/pcmanfm.xml
===================================================================
--- lxde/desktop/pcmanfm.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ lxde/desktop/pcmanfm.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -81,5 +81,5 @@
     <para role="recommended">
       <xref linkend="adwaita-icon-theme"/> or
-      <xref linkend="oxygen-icons5"/> or
+      <xref role="nodep" linkend="oxygen-icons5"/> or
       <xref linkend="lxde-icon-theme"/>, and
       <xref linkend="fribidi"/>
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ multimedia/audioutils/audacious.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -113,5 +113,5 @@
     <para role="required">
       <xref linkend="gtk2"/> or
-      <xref linkend="qt5"/> (or both),
+      <xref role="nodep" linkend="qt5"/> (or both),
       <xref linkend="libxml2"/> (plugins),
       <xref linkend="xorg-env"/> (plugins), and
Index: multimedia/libdriv/libvpx.xml
===================================================================
--- multimedia/libdriv/libvpx.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ multimedia/libdriv/libvpx.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -62,5 +62,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="yasm"/> or <xref linkend="nasm"/>, and 
+      <xref linkend="yasm"/> or <xref role="nodep" linkend="nasm"/>, and 
+<!-- see
+http://lists.linuxfromscratch.org/pipermail/blfs-book/2019-August/083164.html
+and references therein -->
       <xref linkend="which"/> (so <command>configure</command> can find yasm)
     </para>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ multimedia/libdriv/xine-lib.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -69,5 +69,5 @@
       <xref linkend="ffmpeg"/>, and at least one of:
         <xref linkend="alsa"/>,
-        <xref linkend='pulseaudio'/> or
+        <xref linkend='pulseaudio'/>, or
         <ulink url="http://jackaudio.org/">JACK</ulink>
     </para>
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ networking/netlibs/neon.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -73,11 +73,5 @@
 
     <bridgehead renderas="sect3">neon Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/> or
-      <xref linkend="gnutls"/>
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ networking/netutils/networkmanager.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -97,5 +97,5 @@
       <xref linkend="curl"/>,
       <xref linkend="dhcpcd"/> or
-      <xref linkend="dhcp"/> (client only),
+      <xref role="nodep" linkend="dhcp"/> (client only),
       <xref linkend="gobject-introspection"/>,
       <xref linkend="iptables"/>,
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ postlfs/editors/bluefish.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -79,5 +79,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> or <xref linkend="gtk3"/>
+      <xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>
       (If both are installed, <command>configure</command> defaults to using
       <application>GTK+ 3</application>)
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ postlfs/editors/emacs.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -76,5 +76,5 @@
       <xref linkend="gsettings-desktop-schemas"/>,
       <xref linkend="gpm"/>,
-      <xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
+      <xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>,
       <xref linkend="imagemagick6"/> (see command explanations),
       <xref linkend="libjpeg"/>,
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ postlfs/security/shadow.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -112,5 +112,5 @@
       </para>
 
-<screen><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
+<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
     </important>
 
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ postlfs/virtualization/qemu.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -90,5 +90,5 @@
       <xref linkend="mesa"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="vte"/> or <xref linkend="vte2"/>, and
+      <xref role="nodep" linkend="vte"/> or <xref linkend="vte2"/>, and
 <!-- libcacard has been a standalone project since qemu-2.5.-->
       <ulink url="https://www.spice-space.org/page/Libcacard">libcacard</ulink>
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/dm/lxdm.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -87,5 +87,5 @@
     <para role="recommended">
      <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
-     <xref linkend="polkit-gnome"/>
+     <xref role="nodep" linkend="polkit-gnome"/>
     </para>
 
Index: x/icons/gnome-icon-theme.xml
===================================================================
--- x/icons/gnome-icon-theme.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/icons/gnome-icon-theme.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -78,5 +78,5 @@
     <para role="required">
       <xref linkend="gtk3"/> or
-      <xref linkend="gtk2"/>,
+      <xref role="nodep" linkend="gtk2"/>,
       <xref linkend="hicolor-icon-theme"/>, and
       <xref linkend="icon-naming-utils"/>
Index: x/icons/gnome-themes-extra.xml
===================================================================
--- x/icons/gnome-themes-extra.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/icons/gnome-themes-extra.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -78,5 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> or
+      <xref role="nodep" linkend="gtk2"/> or
       <xref linkend="gtk3"/> with
       <xref linkend="librsvg"/> or both
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/installing/libevdev.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -74,10 +74,5 @@
 
       <bridgehead renderas="sect4">libevdev Dependencies</bridgehead>
-<!--
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> or <xref linkend="python3"/>
-      </para>
--->
+
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/installing/libinput.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -195,10 +195,10 @@
 
     <para>
-      <option>-Dudev-dir=/lib/udev</option>: This switch
+      <parameter>-Dudev-dir=/lib/udev</parameter>: This switch
       specifies where UDev rules and hwdb files will be installed.
     </para>
 
     <para>
-      <option>-Ddebug-gui=false</option>: This switch
+      <parameter>-Ddebug-gui=false</parameter>: This switch
       disables creation of a visual debug helper for libinput. Remove
       if you want it, and you have <xref linkend="gtk3"/> installed.
@@ -206,12 +206,13 @@
 
     <para>
-      <option>-Dtests=false</option>: This switch disables compilation of the
-      main tests.  Even with the tests defined as false, you can still run the
-      first four minor tests, as a regular user, but one will be skipped if
-      <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not installed.
-    </para>
-
-    <para>
-      <option>-Ddocumentation=false</option>: This switch disables
+      <parameter>-Dtests=false</parameter>: This switch disables compilation of
+      the main tests.  Even with the tests defined as false, you can still run
+      the first four minor tests, as a regular user, but one will be skipped if
+      <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not
+      installed.
+    </para>
+
+    <para>
+      <parameter>-Ddocumentation=false</parameter>: This switch disables
       generation of the documentation. Remove if you want to generate it, and
       you have <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
@@ -219,11 +220,6 @@
     </para>
 
-    <para revision="sysv">
-      <option>-Dlibwacom=false</option>: Remove this 
-      option if you have the external library libwacom installed.
-    </para>
-
-    <para revision="systemd">
-      <option>-Dlibwacom=false</option>: Remove this option if you
+    <para>
+      <parameter>-Dlibwacom=false</parameter>: Remove this option if you
       have <xref linkend="libwacom"/> installed, or if you are installing
       GNOME.
Index: x/lib/libnotify.xml
===================================================================
--- x/lib/libnotify.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ x/lib/libnotify.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -94,5 +94,5 @@
     <para role="required">
       <xref role="runtime" linkend="notification-daemon"/> or
-      <xref role="runtime" linkend="xfce4-notifyd"/>
+      <xref role="nodep" linkend="xfce4-notifyd"/>
     </para>
 
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ xsoft/office/gnumeric.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -84,5 +84,5 @@
       an icon theme such as
       <xref role="runtime" linkend="adwaita-icon-theme"/>,
-      <xref role="runtime" linkend="oxygen-icons5"/> or
+      <xref role="nodep" linkend="oxygen-icons5"/>, or
       <xref role="runtime" linkend="gnome-icon-theme"/>,
       <xref role="runtime" linkend="x-window-system"/>, and
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ xsoft/other/inkscape.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -102,5 +102,5 @@
       <xref linkend="imagemagick6"/>,
       <xref linkend="lcms2"/> or
-      <xref linkend="lcms"/>,
+      <xref role="nodep" linkend="lcms"/>,
       <xref linkend="libcanberra"/> (to eliminate plugin warnings),
       <xref linkend="potrace"/> (for the bucket-fill tool),
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ xsoft/other/pidgin.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -84,5 +84,5 @@
       <xref linkend="gstreamer10"/> (required for audio support), and
       <xref linkend="gnutls"/> or
-      <xref linkend="nss"/>
+      <xref role="nodep" linkend="nss"/>
     </para>
 
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ xsoft/other/xarchiver.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -95,5 +95,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> or
+      <xref role="nodep" linkend="gtk2"/> or
       <xref linkend="gtk3"/>
     </para>
Index: xsoft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision 5f3089417850127703a9b23f6664b256fdb50749)
+++ xsoft/other/xdg-utils.xml	(revision cac7f93e441593af661197bfc8912b2c552842dc)
@@ -79,5 +79,5 @@
       <xref linkend="xmlto"/> with one of
       <xref linkend="lynx"/>,
-      <xref linkend="Links"/>, or
+      <xref role="nodep" linkend="Links"/>, or
       <ulink url="&w3m-url;">W3m</ulink>
     </para>
