Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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 195b2466880dbd5e55c7fc25a073cbb7f145fd78)
+++ 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>
 
