Changeset 8977314

Timestamp:

09/01/2021 10:54:17 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib, xry111/multilib

Children:

185615a, f8265ff

Parents:

d2e7db4 (diff), 6711c422 (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:

• chapter11/reboot.xml (modified) (2 diffs)
• chapter11/whatnow.xml (modified) (1 diff)
• general.ent (modified) (2 diffs)

chapter11/reboot.xml

@@ -21 +21 @@
   <itemizedlist>
 
-    <listitem><para>A text mode browser such as <ulink
-    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
+    <listitem><para>A text mode browser such as <ulink revision="sysv"
+    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
 
-    <listitem><para>The
-    <ulink url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
+    <listitem><para>The <ulink revision="sysv"
+    url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
     will allow you to set up local trusted anchor certificates, allowing
     the system to verify SSL certificates provided by remote servers (for
     example, a website using HTTPS).</para></listitem>
 
-    <listitem><para>The <ulink
-    url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
+    <listitem><para>The <ulink revision="sysv"
+    url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
@@ -45 +48 @@
     useful.</para></listitem>
 
-    <listitem><para>Installing <ulink
-    url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
+    <listitem><para>Installing <ulink revision="sysv"
+    url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
     building packages as a non-root user and easily installing the resulting
-    packages in your new system.  </para></listitem>
+    packages in your new system.</para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
-    within a comfortable GUI environment, install <ulink
-    url='&blfs-book;postlfs/openssh.html'>openssh</ulink>. 
+    within a comfortable GUI environment, install <ulink revision="sysv"
+    url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd"
+    url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>. 
     </para></listitem>
 
     <listitem><para>To make fetching files over the internet easier, install
-    <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
+    <ulink
+    revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
+    revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
     <listitem><para>To connect to a wireless access point for networking,
-    install
-    <ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
+    install <ulink revision="sysv"
+    url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink
+    revision="systemd"
+    url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     </para></listitem>
 
     <listitem><para>Finally, a review of the following configuration files
-    is also appropriate at this point.  </para>
+    is also appropriate at this point.</para>
 
       <itemizedlist>

chapter11/whatnow.xml

@@ -58 +58 @@
       <para>The Beyond Linux From Scratch book covers installation
       procedures for a wide range of software beyond the scope of the LFS
-      Book. The BLFS project is located at <ulink url="&blfs-book;"/>.</para>
+      Book. The BLFS project is located at <ulink revision="sysv"
+      url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
+      </para>
     </listitem>
 

general.ent

@@ -18 +18 @@
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY short-versiond  "systemd">
+<!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
 <!ENTITY generic-versiond "systemd"> 
 
@@ -24 +24 @@
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
+<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">