Changeset adcb9c0

Timestamp:

05/25/2021 03:45:10 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

f081763

Parents:

8fbd2fb (diff), 1432cda (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:

Automatic merge of trunk into multilib

Files:

• Makefile (modified) (1 diff)
• chapter01/resources.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

Makefile

@@ -167 +167 @@
 wget-list: $(BASEDIR)/wget-list
 $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                      packages.ent patches.ent
+                      packages.ent patches.ent general.ent
         @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)

chapter01/resources.xml

@@ -57 +57 @@
     Relay Chat (IRC). Before using this support, please make sure that your
     question is not already answered in the LFS FAQ or the mailing list
-    archives. You can find the IRC network at <uri>irc.freenode.net</uri>.
+    archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
     The support channel is named #LFS-support.</para>
 

general.ent

@@ -41 +41 @@
 <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
 
-<!ENTITY anduin-sources  "http://anduin.linuxfromscratch.org/LFS">
+<!ENTITY anduin-sources  "https://anduin.linuxfromscratch.org/LFS">
 
 <!ENTITY buildtime       "Approximate build time">