Index: general/genlib/libusb-kernel.xml
===================================================================
--- general/genlib/libusb-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/genlib/libusb-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>Device Drivers ---&gt;
+  [*] USB support ---&gt;                                             [USB_SUPPORT]
+    # Select any USB hardware device drivers you may need below:
+    &lt;*/M&gt; Support for Host-side USB                                        [USB]</literal></screen>
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/genlib/libusb.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -76,4 +76,26 @@
   </sect2>
 
+  <sect2 role="kernel">
+    <title>Configuring Libusb</title>
+
+    <para id="libusb-kernel">
+      To access raw USB devices (those not treated as a disk by the mass-storage
+      driver), appropriate support must be available in the kernel.  Check your
+      kernel configuration:
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="libusb-kernel.xml"/>
+
+    <indexterm zone="libusb libusb-kernel">
+      <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
+    </indexterm>
+
+    <para>
+      For more details on setting up USB devices, see <xref
+      linkend="usb-device-issues"/>.
+    </para>
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of libusb</title>
@@ -128,29 +150,4 @@
   </sect2>
 -->
-  <sect2 role="configuration">
-    <title>Configuring Libusb</title>
-
-    <para id="libusb-kernel">
-      To access raw USB devices (those not treated as a disk by the mass-storage
-      driver), appropriate support must be available in the kernel.  Check your
-      kernel configuration:
-    </para>
-
-<screen><literal>Device Drivers ---&gt;
-  [*] USB support ---&gt;                   [CONFIG_USB_SUPPORT]
-    &lt;*/M&gt; Support for Host-side USB      [CONFIG_USB]
-    (Select any USB hardware device drivers you may need on the same page)</literal></screen>
-
-    <indexterm zone="libusb libusb-kernel">
-      <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
-    </indexterm>
-
-    <para>
-      For more details on setting up USB devices, see <xref
-      linkend="usb-device-issues"/>.
-    </para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
Index: general/genutils/lsof-test-kernel.xml
===================================================================
--- general/genutils/lsof-test-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/genutils/lsof-test-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>General setup ---&gt;
+  [*] POSIX Message Queues                                        [POSIX_MQUEUE]</literal></screen>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/genutils/lsof.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -92,6 +92,10 @@
     </para>
 
-<screen><literal>General setup  ---&gt;
-  [*] POSIX Message Queues    [CONFIG_POSIX_MQUEUE]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="lsof-test-kernel.xml"/>
+
+    <indexterm zone="lsof lsof-kernel">
+      <primary sortas="d-lsof">lsof (testing)</primary>
+    </indexterm>
 
   </sect2>
Index: general/sysutils/autofs-kernel.xml
===================================================================
--- general/sysutils/autofs-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/autofs-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>File systems ---&gt;
+  &lt;*/M&gt; Kernel automounter support (supports v3, v4 and v5)          [AUTOFS_FS]</literal></screen>
Index: general/sysutils/autofs-optional-kernel.xml
===================================================================
--- general/sysutils/autofs-optional-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/autofs-optional-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>File systems ---&gt;
+  [*] Network File Systems ---&gt;                            [NETWORK_FILESYSTEMS]
+    &lt;*/M&gt; NFS client support                                            [NFS_FS]
+    &lt;*/M&gt; SMB3 and CIFS support (advanced network filesystem)             [CIFS]</literal></screen>
Index: general/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/autofs.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -100,6 +100,6 @@
     </para>
 
-<screen><literal>File systems ---&gt;
-  &lt;*/M&gt; Kernel automounter support (supports v3, v4, and v5) [CONFIG_AUTOFS_FS]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="autofs-kernel.xml"/>
 
     <para>
@@ -107,8 +107,6 @@
     </para>
 
-<screen><literal>File systems  ---&gt;
-  [*] Network File Systems  ---&gt;                                      [CONFIG_NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; NFS client support                                          [CONFIG_NFS_FS]
-    &lt;*/M&gt; SMB3 and CIFS support (advanced network filesystem)         [CONFIG_CIFS]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="autofs-optional-kernel.xml"/>
 
     <para>
Index: general/sysutils/bluez-kernel.xml
===================================================================
--- general/sysutils/bluez-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/bluez-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>General setup ---&gt;
+  # If it is disabled, [TIMERFD] and [EVENTFD] will be hidden and
+  # enabled implicitly.  We DO NOT recommend to enable [EXPERT]
+  # unless you are really an expert user:
+  [ /*] Configure standard kernel features (expert users) ---&gt;          [EXPERT]
+    [*] Enable timerfd() system call                                   [TIMERFD]
+    [*] Enable eventfd() system call                                   [EVENTFD]
+[*] Networking support ---&gt;                                                [NET]
+  &lt;*/M&gt; Bluetooth subsystem support ---&gt;                                    [BT]
+    [*]   Bluetooth Classic (BR/EDR) features                         [BT_BREDR]
+    &lt;*/M&gt;   RFCOMM protocol support                                  [BT_RFCOMM]
+    [*]       RFCOMM TTY support                                 [BT_RFCOMM_TTY]
+    &lt;*/M&gt;   BNEP protocol support                                      [BT_BNEP]
+    [*]       Multicast filter support                       [BT_BNEP_MC_FILTER]
+    [*]       Protocol filter support                     [BT_BNEP_PROTO_FILTER]
+    &lt;*/M&gt;   HIDP protocol support                                      [BT_HIDP]
+    Bluetooth device drivers ---&gt;
+      # Select the appropriate drivers for your bluetooth hardware.
+      # There are more vendor-specific drivers not listed here:
+      &lt; /*/M&gt; HCI USB driver                                       [BT_HCIBTUSB]
+      &lt; /*/M&gt; HCI SDIO driver                                     [BT_HCIBTSDIO]
+      &lt; /*/M&gt; HCI UART driver                                       [BT_HCIUART]
+  &lt;*/M&gt; RF switch subsystem support ---&gt;                                [RFKILL]
+-*- Cryptographic API ---&gt;                                              [CRYPTO]
+  Crypto core or helper ---&gt;
+    &lt;*/M&gt; Userspace cryptographic algorithm configuration          [CRYPTO_USER]
+  Block ciphers ---&gt;
+    &lt;*/M&gt; AES (Advanced Encryption Standard)                        [CRYPTO_AES]
+  AEAD (authenticated encryption with associated data) ciphers ---&gt;
+    &lt;*/M&gt; CCM (Counter with Cipher Block Chaining-MAC)              [CRYPTO_CCM]
+  Hashes, digests, and MACs ---&gt;
+    &lt;*/M&gt; CMAC (Cipher-based MAC)                                  [CRYPTO_CMAC]
+  Userspace interface ---&gt;
+    &lt;*/M&gt; Hash algorithms                                 [CRYPTO_USER_API_HASH]
+    &lt;*/M&gt; Symmetric key cipher algorithms             [CRYPTO_USER_API_SKCIPHER]
+    &lt;*/M&gt; AEAD cipher algorithms                          [CRYPTO_USER_API_AEAD]</literal></screen>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/bluez.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -104,50 +104,7 @@
     </para>
 
-<screen><literal>General Setup ---&gt;
-  [ /*] Configure standard kernel features (expert users)   [CONFIG_EXPERT]
-    (Note: if CONFIG_EXPERT is disabled, the following options will be
-           hidden and enabled implicitly.  We DO NOT recommend to enable
-           CONFIG_EXPERT unless you are really an expert user.)
-    [*] Enable timerfd() system call                        [CONFIG_TIMERFD]
-    [*] Enable eventfd() system call                        [CONFIG_EVENTFD]
-
-[*] Networking support ---&gt;                [CONFIG_NET]
-  &lt;*/M&gt; Bluetooth subsystem support ---&gt;   [CONFIG_BT]
-    &lt;*/M&gt; RFCOMM protocol support          [CONFIG_BT_RFCOMM]
-    [*]   RFCOMM TTY support               [CONFIG_BT_RFCOMM_TTY]
-    &lt;*/M&gt; BNEP protocol support            [CONFIG_BT_BNEP]
-    [*]   Multicast filter support         [CONFIG_BT_BNEP_MC_FILTER]
-    [*]   Protocol filter support          [CONFIG_BT_BNEP_PROTO_FILTER]
-    &lt;*/M&gt; HIDP protocol support            [CONFIG_BT_HIDP]
-        Bluetooth device drivers ---&gt;
-          (Select the appropriate drivers for your Bluetooth hardware)
-
-   &lt;*/M&gt; RF switch subsystem support ----  [CONFIG_RFKILL]
-
--*- Cryptographic API ---&gt;
-   Crypto core or helper --- &gt;
-      &lt;*/M&gt; User-space cryptographic algorithm configuration   [CONFIG_CRYPTO_USER]
-   Block ciphers ---&gt;
-      &lt;*/M&gt; AES (Advanced Encryption Standard)                 [CONFIG_CRYPTO_AES]
-   AEAD (authenticated encryption with associated data) ciphers ---&gt;
-      &lt;*/M&gt; CCM (Counter with Cipher Block Chaining-MAC)       [CONFIG_CRYPTO_CCM]
-   Hashes, digests, and MACs ---&gt;
-      &lt;*/M&gt; CMAC (Cipher-based MAC)                            [CONFIG_CRYPTO_CMAC]
-   Userspace interface ---&gt;
-      &lt;*/M&gt; Hash algorithms                                    [CONFIG_CRYPTO_USER_API_HASH]
-      &lt;*/M&gt; Symmetric key cipher algorithms                    [CONFIG_CRYPTO_USER_API_SKCIPHER]
-      &lt;*/M&gt; AEAD cipher algorithms                             [CONFIG_CRYPTO_USER_API_AEAD]</literal></screen>
-
-<!--
-    <para>
-      If you wish to run the test suite (even if treating this package as a build
-      dependency), you will need to enable the following options in the kernel
-      configuration and recompile the kernel if necessary:
-    </para>
-
-<screen><literal>-*- Cryptographic API - - -&gt;                                      [CONFIG_CRYPTO]
-  &lt;*/M&gt; User-space interface for hash algorithms                 [CONFIG_CRYPTO_USER_API_HASH]
-  &lt;*/M&gt; User-space interface for symmetric key cipher algorithms [CONFIG_CRYPTO_USER_API_SKCIPHER]</literal></screen>
--->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="bluez-kernel.xml"/>
+
     <indexterm zone="bluez bluez-kernel">
       <primary sortas="d-bluez">bluez</primary>
Index: general/sysutils/elogind-kernel.xml
===================================================================
--- general/sysutils/elogind-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/elogind-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>File systems ---&gt;
+  [*] Inotify support for userspace                               [INOTIFY_USER]
+  Pseudo filesystems ---&gt;
+    [*] Tmpfs virtual memory file system support (former shm fs)         [TMPFS]
+    [*]   Tmpfs POSIX Access Control Lists                     [TMPFS_POSIX_ACL]</literal></screen>
Index: general/sysutils/elogind-test-kernel.xml
===================================================================
--- general/sysutils/elogind-test-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/elogind-test-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>-*- Cryptographic API ---&gt;                                              [CRYPTO]
+  Crypto core or helper ---&gt;
+    &lt;*/M&gt; Userspace cryptographic algorithm configuration          [CRYPTO_USER]
+  Userspace interface ---&gt;
+    &lt;*/M&gt; Hash algorithms                                 [CRYPTO_USER_API_HASH]</literal></screen>
Index: general/sysutils/elogind.xml
===================================================================
--- general/sysutils/elogind.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/elogind.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -111,11 +111,6 @@
     </para>
 
-<!-- Spaces are significant in <screen> sections -->
-<screen><literal>General setup ---&gt;
-    [*]     Control Group support                        [CONFIG_CGROUPS]
-File systems ---&gt;
-    [*]     Inotify support for userspace                [CONFIG_INOTIFY_USER]
-            Pseudo filesystems ---&gt;
-                [*]    Tmpfs POSIX Access Control Lists  [CONFIG_TMPFS_POSIX_ACL]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="elogind-kernel.xml"/>
 
     <para>
@@ -124,9 +119,6 @@
     </para>
 
-<screen><literal>-*- Cryptographic API ---&gt;                                  [CONFIG_CRYPTO]
-    Crypto core or helper  --->
-      &lt;M/*&gt; Userspace cryptographic algorithm configuration [CONFIG_CRYPTO_USER]
-    Userspace interface  --->  
-      &lt;M/*&gt; Hash algorithms                                 [CONFIG_CRYPTO_USER_API_HASH]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="elogind-test-kernel.xml"/>
 
     <indexterm zone="elogind elogind-kernel">
Index: general/sysutils/gpm-kernel.xml
===================================================================
--- general/sysutils/gpm-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/gpm-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>Device Drivers ---&gt;
+  Input device support ---&gt;
+    -*-   Generic input layer (needed for keyboard, mouse, ...)          [INPUT]
+    &lt;*/M&gt;   Mouse interface                                     [INPUT_MOUSEDEV]</literal></screen>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/gpm.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -97,7 +97,6 @@
      </para>
 
-<screen><literal>Device Drivers  ---&gt;
-  Input device support ---&gt; [CONFIG_INPUT]
-    &lt;*/M&gt; Mouse interface   [CONFIG_INPUT_MOUSEDEV]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="gpm-kernel.xml"/>
 
      <indexterm zone="gpm gpm-kernel">
Index: general/sysutils/pm-utils-kernel.xml
===================================================================
--- general/sysutils/pm-utils-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/pm-utils-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen><literal>Power management and ACPI options ---&gt;
+  [*] Suspend to RAM and standby                                       [SUSPEND]
+  [*] Hibernation (aka 'suspend to disk')                          [HIBERNATION]</literal></screen>
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/pm-utils.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -119,7 +119,6 @@
     </para>
 
-    <screen><literal>Power management and ACPI options ---&gt;
-    &lt;*&gt; Suspend to RAM and standby            [CONFIG_SUSPEND]
-    &lt;*&gt; Hibernation (aka 'suspend to disk')   [CONFIG_HIBERNATION]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="pm-utils-kernel.xml"/>
 
     <para>
Index: general/sysutils/upower-systemd-kernel.xml
===================================================================
--- general/sysutils/upower-systemd-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
+++ general/sysutils/upower-systemd-kernel.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- Automatically generated by kernel-config.py
+     DO NOT EDIT! -->
+<screen revision="systemd"><literal>General setup ---&gt;
+  -*- Namespaces support ---&gt;                                       [NAMESPACES]
+    [*] User namespace                                                 [USER_NS]</literal></screen>
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 08c3c252049eb72e84ee548c8c50c7173e877742)
+++ general/sysutils/upower.xml	(revision e7cd19a120f0b0dd311e8343d4184ecdb52b8318)
@@ -107,7 +107,6 @@
     </para>
 
- <screen><literal>General Setup ---&gt;
-    [*] Namespaces support ---&gt;     [CONFIG_NAMESPACES]
-       [*] User namespace           [CONFIG_USER_NS]</literal></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="upower-systemd-kernel.xml"/>
 
     <indexterm zone="upower upower-kernel">
