Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2021-05-25 05:45:10 +02:00
commit adcb9c035c
3 changed files with 3 additions and 3 deletions

View File

@ -166,7 +166,7 @@ profile-html:
wget-list: $(BASEDIR)/wget-list wget-list: $(BASEDIR)/wget-list
$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ $(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 ..." @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)

View File

@ -56,7 +56,7 @@
<para>Several members of the LFS community offer assistance on Internet <para>Several members of the LFS community offer assistance on Internet
Relay Chat (IRC). Before using this support, please make sure that your 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 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> The support channel is named #LFS-support.</para>
</sect2> </sect2>

View File

@ -40,7 +40,7 @@
<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/"> <!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"> <!ENTITY buildtime "Approximate build time">
<!ENTITY diskspace "Required disk space"> <!ENTITY diskspace "Required disk space">