Changeset 00eeab8

Timestamp:

10/19/2022 03:09:09 PM (18 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

6219892

Parents:

85ec218a (diff), 347bbda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Files:

• chapter01/resources.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter08/man-pages.xml (modified) (1 diff)

chapter01/resources.xml

@@ -27 +27 @@
     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

chapter01/whatsnew.xml

@@ -15 +15 @@
   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

chapter08/man-pages.xml

@@ -24 +24 @@
     <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>