Index: x/installing/libXau.xml
===================================================================
--- x/installing/libXau.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libXau.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libXdmcp.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libevdev.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libva.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -49,5 +49,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libvdpau.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -54,5 +54,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libxcb.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/libxcvt.xml
===================================================================
--- x/installing/libxcvt.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/libxcvt.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/mesa.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -41,5 +41,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -272,5 +272,6 @@
     <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
-      <command>ninja test</command>.
+      <command>ninja test</command>. One test,
+      <application>mesa: intel/anv_state_pool</application>, is known to fail.
 <!-- All tests passed for me for 21.2.4 [pierre]
       All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
Index: x/installing/twm.xml
===================================================================
--- x/installing/twm.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/twm.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/util-macros.xml
===================================================================
--- x/installing/util-macros.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/util-macros.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7app.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -148,5 +148,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7driver-evdev.xml
===================================================================
--- x/installing/x7driver-evdev.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7driver-evdev.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -38,5 +38,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7driver-fbdev.xml
===================================================================
--- x/installing/x7driver-fbdev.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7driver-fbdev.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -40,5 +40,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7driver-nouveau.xml
===================================================================
--- x/installing/x7driver-nouveau.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7driver-nouveau.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -39,5 +39,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7driver-synaptics.xml
===================================================================
--- x/installing/x7driver-synaptics.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7driver-synaptics.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -40,5 +40,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7driver-wacom.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.40.0">
+  <!ENTITY xorg-wacom-driver-version "1.0.0">
 
   <!ENTITY xorg-wacom-driver-download-http "https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-&xorg-wacom-driver-version;/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "e97a5230d1875d288010b3df1b332ed5">
+  <!ENTITY xorg-wacom-driver-md5sum        "f6376b606412f803599e45cb7e938af4">
   <!ENTITY xorg-wacom-driver-size          "616 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "12 MB (with tests)">
+  <!ENTITY xorg-wacom-driver-buildsize     "8.5 MB (with tests)">
   <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with tests)">
 ]>
@@ -39,5 +39,5 @@
       </para>
 
-      &lfs110a_checked;
+      &lfs111_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7font.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -64,5 +64,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7legacy.xml
===================================================================
--- x/installing/x7legacy.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7legacy.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -85,5 +85,5 @@
     </note>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/x7lib.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -129,5 +129,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xbitmaps.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-proto.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-cursor.xml
===================================================================
--- x/installing/xcb-util-cursor.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util-cursor.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util-image.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-keysyms.xml
===================================================================
--- x/installing/xcb-util-keysyms.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util-keysyms.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util-renderutil.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-wm.xml
===================================================================
--- x/installing/xcb-util-wm.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util-wm.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcb-util.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xclock.xml
===================================================================
--- x/installing/xclock.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xclock.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xcursor-themes.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xinit.xml
===================================================================
--- x/installing/xinit.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xinit.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xkeyboard-config.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xorg-server.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xorgproto.xml
===================================================================
--- x/installing/xorgproto.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xorgproto.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xterm.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -37,5 +37,5 @@
     &not-katamari;
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xwayland.xml
===================================================================
--- x/installing/xwayland.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/installing/xwayland.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -7,8 +7,8 @@
   <!ENTITY xwayland-download-http "&xorg-download-http;/xserver/xwayland-&xwayland-version;.tar.xz">
   <!ENTITY xwayland-download-ftp  "&xorg-download-ftp;/xserver/xwayland-&xwayland-version;.tar.xz">
-  <!ENTITY xwayland-md5sum        "ff45f0bb14c3ab2f984f0a83c880fce6">
+  <!ENTITY xwayland-md5sum        "347de197b11c7f80fd8c2c10fa2d6973">
   <!ENTITY xwayland-size          "1.2 MB">
-  <!ENTITY xwayland-buildsize     "71 MB (add 350 MB for test)">
-  <!ENTITY xwayland-time          "0.2 SBU (with paralellism=4; add 0.8 SBU for test, not including clone time)">
+  <!ENTITY xwayland-buildsize     "65 MB (add 376 MB for tests)">
+  <!ENTITY xwayland-time          "0.2 SBU (with paralellism=4; add 2.2 SBU for tests, not including clone time)">
 ]>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,4 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="libxcvt"/>,
       <xref linkend="pixman"/>,
       <xref linkend="wayland-protocols"/>, and
@@ -92,4 +93,5 @@
       <xref linkend="libgcrypt"/>,
       <xref linkend="nettle"/>,
+      <xref linkend="xmlto"/>,
       <xref linkend="xorg7-legacy"/>
          (only bdftopcf, for building fonts required for the tests),
@@ -138,5 +140,5 @@
       graphical environment, you'll need to enable <command>Xvfb</command>
       by removing the <parameter>-Dxvfb=false</parameter> above. The
-      instructions below suppose this has been done.
+      instructions below expect this has been done.
     </para>
 
@@ -158,5 +160,5 @@
 
 export DISPLAY=:22           &amp;&amp;
-hw/vfb/Xvfb $DISPLAY &amp;
+../hw/vfb/Xvfb $DISPLAY &amp;
 VFB_PID=$!                   &amp;&amp;
 cd xts                       &amp;&amp;
@@ -173,4 +175,5 @@
 <screen remap="test"><userinput>XTEST_DIR=$(pwd)/tools/xts PIGLIT_DIR=$(pwd)/tools/piglit ninja test</userinput></screen>
 
+    <!-- The xfontset tests fail on my system -renodr -->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -200,5 +203,5 @@
       <parameter>-Dxvfb=false</parameter>: Prevents building the
       <command>xvfb</command> program, which is also installed by
-      <xref linkend="xorg-server"/>. Remove if you do not plan to
+      <xref linkend="xorg-server"/>. Remove this option if you do not plan to
       install the X server.
     </para>
@@ -250,5 +253,5 @@
         <listitem>
           <para>
-            Allows X client to run under wayland.
+            Allows X clients to run under wayland
           </para>
           <indexterm zone="xwayland Xwayland">
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/lib/libdrm.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -7,9 +7,11 @@
   <!ENTITY libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.xz">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "376523fcbba8b9e194bcb5adff142d5d">
-  <!ENTITY libdrm-size          "424 KB">
-  <!ENTITY libdrm-buildsize     "8.1 MB (with tests)">
-  <!ENTITY libdrm-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY libdrm-md5sum        "ef6449de30a41ecdf69dc7ae78e676a9">
+  <!ENTITY libdrm-size          "428 KB">
+  <!ENTITY libdrm-buildsize     "12 MB (with tests)">
+  <!ENTITY libdrm-time          "0.2 SBU (with tests)">
   <!-- With version 2.4.102, the tests add 1 second to my build. -->
+  <!-- The 'threaded' test adds about 15 seconds if you're on an NVIDIA system
+       due to it directly interacting with the GPU. -->
 ]>
 
@@ -38,5 +40,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/lib/libepoxy.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 2c871871fb5ce59b5eec21da0a4cb315c3d882dd)
+++ x/wm/fluxbox.xml	(revision f1a479c7e7617280ce3645f1d9e2d2ac61faa9ea)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
