Changeset aae1c7c0

Timestamp:

04/24/2021 03:04:25 AM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

af548cd

Parents:

4612211 (diff), 61707b1 (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 branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

Files:

• INSTALL (modified) (4 diffs)
• chapter01/resources.xml (modified) (1 diff)
• chapter03/introduction.xml (modified) (1 diff)
• general.ent (modified) (2 diffs)
• prologue/architecture.xml (modified) (1 diff)

INSTALL

@@ -7 +7 @@
 submission to the lfs-book or lfs-dev mailing lists, then you do not need this 
 document.  Instead, you need to read the LFS Editor's Manual.  See the LFS 
-website at http://www.linuxfromscratch.org for more information.
+website at https://www.linuxfromscratch.org for more information.
 
 -------------------------------------------------------------------------------
@@ -14 +14 @@
 
 * libxml2
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
 
 * libxslt
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
 
 * DocBook DTD 
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
 
 * DocBook XSL Stylesheets 
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
 
 * HTMLTidy
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html
 
 ------------------------------------------------------------------------------- 
@@ -34 +34 @@
 
 * lynx
-  - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
 
 ------------------------------------------------------------------------------- 
@@ -42 +42 @@
 
 * JDK
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
 
 * FOP and JAI
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
+  - https://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html

chapter01/resources.xml

@@ -68 +68 @@
     <para>For additional information on the packages, useful tips are
     available in the LFS Package Reference page located at <ulink
-    url="http://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
+    url="https://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
 
   </sect2>  -->

chapter03/introduction.xml

@@ -61 +61 @@
       <para>For stable versions of the book, a tarball of all the needed files 
       can be downloaded from one of the LFS files mirrors listed at
-      <ulink url="http://www.linuxfromscratch.org/mirrors.html#files"/>.</para>
+      <ulink url="https://www.linuxfromscratch.org/mirrors.html#files"/>.</para>
     </listitem>
     <listitem>

general.ent

@@ -21 +21 @@
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
+<!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
@@ -39 +39 @@
 <!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
 
-<!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
+<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
 
 <!ENTITY anduin-sources  "http://anduin.linuxfromscratch.org/LFS">

prologue/architecture.xml

@@ -45 +45 @@
 straightforward base Linux system. Some LFS/BLFS editors maintain a fork
 of LFS for multilib, which is accessible at <ulink
-url="http://www.linuxfromscratch.org/~thomas/multilib/index.html"/>. But it
+url="https://www.linuxfromscratch.org/~thomas/multilib/index.html"/>. But it
 is an advanced topic.</para>