From 26c031abf9658f0bb8b0ea335c56b23671f49942 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 4 Sep 2023 17:49:55 +0800
Subject: [PATCH 1/2] dependencies: Add patchutils as check optional dependency

The configure script says:

    configure: WARNING: filterdiff not installed; build will not be
    reproducible.

The filterdiff program is a part of patchutils.
---
 appendices/dependencies.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 31796da9b..6f03da578 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -437,6 +437,9 @@
         <seglistitem>
           <seg>
             <ulink url='&github;/testing-cabal/subunit'>libsubunit</ulink>
+            and
+            <ulink url='http://cyberelk.net/tim/software/patchutils/'>
+              patchutils</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>

From 1ec60f1daf34b0021d903405899a217e4d214b93 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 4 Sep 2023 15:08:43 -0500
Subject: [PATCH 2/2] Move a caution to a better page. Move caution regarding
 building by mixing different versions of LFS to General Compilation
 Instructions.

---
 chapter01/changelog.xml            | 11 +++++++++++
 chapter01/whatsnew.xml             | 29 +----------------------------
 part3intro/generalinstructions.xml | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3677af3d9..46215237f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,17 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-09-04</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Move caution regarding building by mixing
+           different version of LFS to General Compilation Instructions. Fixes
+           <ulink url='&lfs-ticket-root;5338'>#5338</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-09-02</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0f72bd434..d7c391796 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -11,36 +11,9 @@
 
   <title>What's new since the last release</title>
 
-<!--
-
-This does not belong on this page.  I don't want to address this now.
-At first I thought it would go on another page, but nothing seems to fit.
-Perhaps a new page - somthing like 'Upgrading an Existing LFS System'.
-  - Bruce 9/1/23
-
-  <caution>
-    <para>
-      During a development cycle of LFS, the instructions in the book is
-      often modified to adapt for a package update or take the advantage of
-      new features from updated packages.  Mixing up the instructions of
-      different versions of the LFS book can cause subtle breakages.  This
-      kind of issue is generally a result from reusing some script created
-      for a prior LFS release.  Such a reuse is strongly discouraged.  If
-      you are reusing scripts for a prior LFS release for any reason, you'll
-      need to be very careful to update the scripts to match current version
-      of the LFS book.
-    </para>
-  </caution>
-
-  <para>In the 12.0 release, <parameter>- -disable-fixincludes</parameter>
-  is set for GCC.  It's a configure switch newly added in GCC 13.1 to
-  prevent GCC from <quote>fixing</quote> the system headers.  Such a
-  <quote>fix</quote> is unnecessary for a modern Linux system and may cause
-  issues if a package is updated after installing GCC.</para>
-
   <para>Here is a list of the packages updated since the previous
   release of LFS.</para>
--->
+
   <!--
     Every package in the book is listed in the "Upgraded to:" section.
     Comment/uncomment as needed. DO NOT delete any of these lines unless that
diff --git a/part3intro/generalinstructions.xml b/part3intro/generalinstructions.xml
index f3285bc17..fe368d8d8 100644
--- a/part3intro/generalinstructions.xml
+++ b/part3intro/generalinstructions.xml
@@ -11,6 +11,20 @@
 
   <title>General Compilation Instructions</title>
 
+  <caution>
+    <para>
+      During a development cycle of LFS, the instructions in the book are
+      often modified to adapt for a package update or take the advantage of
+      new features from updated packages.  Mixing up the instructions of
+      different versions of the LFS book can cause subtle breakages.  This
+      kind of issue is generally a result from reusing some script created
+      for a prior LFS release.  Such a reuse is strongly discouraged.  If
+      you are reusing scripts for a prior LFS release for any reason, you'll
+      need to be very careful to update the scripts to match current version
+      of the LFS book.
+    </para>
+  </caution>
+
   <para>Here are some things you should know about building each package:</para>
 
   <itemizedlist>