Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/apr-util.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -131,5 +131,6 @@
 
     <para>
-      <parameter>--with-openssl=/usr --with-crypto</parameter>: These
+      <parameter>--with-openssl=/usr</parameter>
+      <parameter>--with-crypto</parameter>: These
       switches enable the
       <filename class="libraryfile">apr_crypto_openssl-1.so</filename>
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/boost.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -169,12 +169,7 @@
 
     <para>
-      <parameter>sed -i '/#include ...</parameter>: This removes the inclusion
+      <command>sed -i '/#include ...</command>: This removes the inclusion
       of <filename>boost/phoenix/stl/tuple.hpp</filename> from this header-only
       library, allowing applications which use it to link using recent C++.
-      <!-- FIXME: remove before 11.3 is we still use 1.81.0 and LO-7.4,
-      this alternative is only for people working through the development book.-->
-      An alternative is to edit
-      <filename>/usr/include/boost/phoenix/stl.hpp</filename> if this version of
-      boost has already been installed without this <command>sed</command>.
     </para>
 
Index: general/genlib/brotli.xml
===================================================================
--- general/genlib/brotli.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/brotli.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -157,7 +157,4 @@
       <application>Python3</application> binding instead.
     </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
Index: general/genlib/fftw.xml
===================================================================
--- general/genlib/fftw.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/fftw.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -158,5 +158,6 @@
 
       <para>
-        <parameter>--enable-shared --disable-static</parameter>: Use shared
+        <parameter>--enable-shared</parameter>
+        <parameter>--disable-static</parameter>: Use shared
         libs instead of static libs.
       </para>
@@ -200,5 +201,5 @@
         without AVX512F.  Use this option if the FFTW build will be used on
         a CPU with AVX512F.  This option is not compatible with
-        <option>--enable-long-double</option>.
+        <parameter>--enable-long-double</parameter>.
       </para>
   </sect2>
Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/libblockdev.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -154,6 +154,8 @@
 
     <para>
-      <parameter>--without-lvm --without-lvm_dbus
-      --without-tools</parameter>: The combination of these switches allows
+      <parameter>--without-lvm</parameter>
+      <parameter>--without-lvm_dbus</parameter>
+      <parameter>--without-tools</parameter>: The combination of these
+      switches allows
       building <application>libblockdev</application> without
       <xref linkend="parted"/> installed.  Remove it if you've installed
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/libpaper.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -103,6 +103,6 @@
 
     <para>
-      <option>--enable-relocatable</option>:
-      This option is needed to run the tests.
+      <parameter>--enable-relocatable</parameter>:
+      This switch is needed to run the tests.
     </para>
 
Index: general/genlib/libxmlb.xml
===================================================================
--- general/genlib/libxmlb.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/libxmlb.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -127,5 +127,5 @@
      user enable it if they want the documentation. -renodr -->
     <para>
-      <parameter>-Dgtkdoc=true</parameter>: This switch disables building the
+      <parameter>-Dgtkdoc=false</parameter>: This switch disables building the
       API documentation. Remove it if you have
       <xref linkend="gtk-doc" role="nodep"/> installed and wish to build the
Index: general/genlib/log4cplus.xml
===================================================================
--- general/genlib/log4cplus.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/log4cplus.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -105,5 +105,5 @@
 
     <para>
-      <parameter>--with-qt5</parameter>: This option enables
+      <option>--with-qt5</option>: This option enables
       compilation of a separate shared library (liblog4cplusqt5debugappender)
       that implements Qt5DebugAppender. It requires Qt5 and pkg-config
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision dd1672e8d71661ccd352296e6e1a7a188953b912)
+++ general/genlib/nspr.xml	(revision 875b3b57e80e1efb29db5340d9be7872c550a128)
@@ -127,6 +127,5 @@
 
     <para>
-      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</parameter>: The --enable-64bit parameter is
+      <parameter>--enable-64bit</parameter>: The --enable-64bit parameter is
       <emphasis>required</emphasis> on an x86_64 system to prevent
       <command>configure</command> failing with a claim that this is a system
