From 46fb0f972ddc08eac89716314f18837d27ff0604 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 3 Feb 2022 21:48:51 +0100
Subject: [PATCH] Changes so that X does not appear as the only graphic system

---
 pst/typesetting/tl-installer.xml |  2 +-
 x/installing/installing.xml      | 32 ++++++++++++++++++++++++++++----
 x/lib/lib.xml                    |  2 +-
 x/x.xml                          |  4 ++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/pst/typesetting/tl-installer.xml b/pst/typesetting/tl-installer.xml
index 25401a6bd1..2d6562922e 100644
--- a/pst/typesetting/tl-installer.xml
+++ b/pst/typesetting/tl-installer.xml
@@ -120,7 +120,7 @@
       <xref role="runtime" linkend="libxcb"/> are needed for inimf, mf,
       pdfclose, pdfopen and xdvi-xaw. But if you are using asy, or using a
       <application>TeX</application> engine to create a PDF file, you will
-      need an <xref role="runtime" linkend="x-window-system"/> (for PDF files,
+      need <xref role="runtime" linkend="x-window-system"/> (for PDF files,
       this is to support a PDF viewer of your choice, for example
        <xref role="nodep" linkend="epdfview"/>).
     </para>
diff --git a/x/installing/installing.xml b/x/installing/installing.xml
index 54336c8cc4..b202eaf616 100644
--- a/x/installing/installing.xml
+++ b/x/installing/installing.xml
@@ -5,16 +5,17 @@
   %general-entities;
 ]>
 
-<chapter id="x-window-system" xreflabel="X Window System">
+<chapter id="x-window-system" xreflabel="a graphical environment">
   <?dbhtml filename="installing.html" ?>
 
-  <title>X Window System Environment</title>
+  <title>Graphical Environments</title>
 
   <para>
     This chapter contains instructions to build and configure a graphical
     user environment.
   </para>
 
+<!-- Historical but not very useful now
   <para>
     <application>Xorg</application>, in addition to clearing up some
     licensing issues with <ulink url="http://www.xfree86.org/">XFree86</ulink>,
@@ -41,7 +42,6 @@
     the upstream developers.
   </para>
 
-  <!--
   <para>
     Additionally, the BLFS book appends a build number
     to the end of version string to indicate whether a group of incremental
@@ -51,7 +51,31 @@
     Xorg-&xorg-version;-2 would indicate that individual package updates have
     been applied to the katamari.
   </para>
-  -->
+-->
+
+  <para>
+    For a long time the only graphical environment usable with GNU/Linux has
+    been the <emphasis>X Window System</emphasis>. It uses a client/server
+    model which allows to write applications completely independent on
+    the graphical hardware. This has the drawback that accessing modern
+    hardware acceleration is difficult, so that other approaches are developed.
+    Two new systems are available: <emphasis>Wayland</emphasis> and
+    <emphasis>Vulkan</emphasis>. The former is a simpler replacement for
+    X, easier to develop and maintain, using the OpenGL framework. The main
+    desktop environments GNOME and KDE have been ported to it. The later allows
+    direct access to graphical hardware through a portable interface. It is
+    newer and not yet included in BLFS.
+  </para>
+
+  <para>
+    This chapter provides the basic components of the X Window System and
+    Wayland. For X, the chosen implementation is Xorg, which is a modular
+    implementation and requires more than 100 packages to be installed.
+    The distribution of Xorg is given a release number by the developers,
+    in this case Xorg-&xorg-version;, and is referred to as the "katamari" by
+    the upstream developers. Individual packages are updated as needed without
+    changing this number.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-macros.xml"/>
diff --git a/x/lib/lib.xml b/x/lib/lib.xml
index 598bb5b563..f2f29acc8c 100644
--- a/x/lib/lib.xml
+++ b/x/lib/lib.xml
@@ -8,7 +8,7 @@
 <chapter id="x-lib">
   <?dbhtml filename="lib.html" ?>
 
-  <title>X Libraries</title>
+  <title>Graphical Environment Libraries</title>
 
   <para>
     This chapter does not contain libraries that are required to run
diff --git a/x/x.xml b/x/x.xml
index 2fa935f7a8..e5e073b38b 100644
--- a/x/x.xml
+++ b/x/x.xml
@@ -5,10 +5,10 @@
   %general-entities;
 ]>
 
-<part id="x" xreflabel="X plus Window and Display Managers">
+<part id="x" xreflabel="Graphical Components">
   <?dbhtml filename="x.html" dir="x"?>
 
-  <title>X + Window and Display Managers</title>
+  <title>Graphical Components</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing/installing.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lib/lib.xml"/>