From b00c7d9905aaf0ae3a6cc2cb19f2bc02057e640f Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 18 Oct 2022 09:59:00 +0200
Subject: [PATCH 1/3] Clarify why pie might be disabled

Just reading a textbook and LFS does not imply anything for compilation...
---
 chapter01/whatsnew.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b36765261..5d246c861 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -14,10 +14,10 @@
   <para>In the 11.3 release, <parameter>--enable-default-pie</parameter>
   and <parameter>--enable-default-ssp</parameter> are enabled for GCC.
   These techniques can mitigate some malicious attacks, but they do not provide
-  perfect security.  If you are reading LFS and a programming textbook,
+  perfect security.  Note that some textbooks assume these options are
+  disabled, so that if you run examples from such a textbook on an LFS system,
   you may need to disable PIE and SSP with the GCC options
-  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>,
-  because some textbooks assume these options are disabled by default.</para>
+  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>.</para>
 
   <para>Here is a list of the packages updated since the previous
   release of LFS.</para>

From 6c172931d1ce4d996b6cc71510875620d7257643 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 18 Oct 2022 10:10:14 +0200
Subject: [PATCH 2/3] Use FAQ page instead of just FAQ

so that whether FAQ is plural or singular is not important :)
---
 chapter01/resources.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chapter01/resources.xml b/chapter01/resources.xml
index ad20950b2..d3bc7860e 100644
--- a/chapter01/resources.xml
+++ b/chapter01/resources.xml
@@ -26,9 +26,9 @@
     <para>The <systemitem class='domainname'>linuxfromscratch.org</systemitem>
     server hosts a number of mailing
     lists used for the development of the LFS project. These lists include the
-    main development and support lists, among others. If the FAQ do not solve
-    the problem you are having, the next step would be to search the mailing
-    lists at <ulink url="&lfs-root;search.html"/>.</para>
+    main development and support lists, among others. If you cannot find an
+    answer to your problem on the FAQ page, the next step would be to search
+    the mailing lists at <ulink url="&lfs-root;search.html"/>.</para>
 
     <para>For information on the different lists, how to subscribe, archive
     locations, and additional information, visit

From 347bbda9c10cb821d0369e173f8a3e33ea4cd1e2 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 18 Oct 2022 17:14:41 +0800
Subject: [PATCH 3/3] man-pages: update the number of provided pages for 6.00

$ find -name '*.[0-9]' | wc -l
2438
---
 chapter08/man-pages.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/man-pages.xml b/chapter08/man-pages.xml
index d571eefc9..9d7c86bd9 100644
--- a/chapter08/man-pages.xml
+++ b/chapter08/man-pages.xml
@@ -23,7 +23,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Man-pages package contains over 2,200 man pages.</para>
+    <para>The Man-pages package contains over 2,400 man pages.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>