[lfs] 01/01: Merge branch 'trunk' into multilib

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit 754e385e0cc4c2c28d12f3acffa7de1e91ce7a90
Merge: 0c4007598 a79c109cf
Author: Zeckmathederg <[email protected]>
AuthorDate: Sat Apr 25 13:07:40 2026 -0600

    Merge branch 'trunk' into multilib

 chapter11/theend.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc chapter11/theend.xml
index 49ed108ac,2bc4056ff..e82733761
--- a/chapter11/theend.xml
+++ b/chapter11/theend.xml
@@@ -43,8 -43,8 +43,8 @@@
  
  <screen><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
  DISTRIB_ID="Linux From Scratch"
 -DISTRIB_RELEASE="&version;"
 +DISTRIB_RELEASE="MLFS &version;"
- DISTRIB_CODENAME="&lt;your name here&gt;"
+ DISTRIB_CODENAME="<replaceable>&lt;your name here&gt;</replaceable>"
  DISTRIB_DESCRIPTION="Linux From Scratch"
  EOF</userinput></screen>
  
@@@ -54,10 -54,10 +54,10 @@@
  
  <screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
  NAME="Linux From Scratch"
 -VERSION="&version;"
 +VERSION="MLFS &version;"
  ID=lfs
 -PRETTY_NAME="Linux From Scratch &version;"
 +PRETTY_NAME="Multilib Linux From Scratch &version;"
- VERSION_CODENAME="&lt;your name here&gt;"
+ VERSION_CODENAME="<replaceable>&lt;your name here&gt;</replaceable>"
  HOME_URL="&lfs-root;lfs/"
  RELEASE_TYPE="&os-release-type;"
  EOF</userinput></screen>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page