Fix references to both 32-bit and 64-bit systems to list 64-bit examples first.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11377 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 21 insertions, 11 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5925585af..6b14ead31 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,17 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
     <listitem>
+      <para>2018-02-26</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Fix references to both 32-bit and 
+           64-bit systems to list 64-bit examples first. Fixes
+          <ulink url="&lfs-ticket-root;4225">#4225</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
       <para>2018-02-14</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 82d2eb552..1ecdce9da 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -197,11 +197,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
     <para>If everything is working correctly, there should be no errors,
     and the output of the last command will be of the form:</para>
 
-<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /tools/lib64/ld-linux.so.2]</computeroutput></screen>
 
-    <para>Note that <filename class="directory">/tools/lib</filename>, or
-    <filename class="directory">/tools/lib64</filename> for 64-bit machines
-    appears as the prefix of the dynamic linker.</para>
+    <para>Note that <filename class="directory">/tools/lib</filename> wiil
+    be the prefix of the dynamic linker for 32-bit machines.</para>
 
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 8002fae35..09636a1e3 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -159,10 +159,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
     <para>If everything is working correctly, there should be no errors,
     and the output of the last command will be of the form:</para>
 
-<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /tools/lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-    <para>Note that for 64-bit machines, the interpreter name will be
-    <filename>/tools/lib64/ld-linux-x86-64.so.2</filename>.</para>
+    <para>Note that for 32-bit machines, the interpreter name will be
+    <filename>/tools/lib/ld-linux.so.2</filename>.</para>
 
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
diff --git a/general.ent b/general.ent
index ccab51d86..8c8e7acaf 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180214">
+<!ENTITY version         "SVN-20180226">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180214-systemd">
+<!ENTITY versiond        "20180226-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 14, 2018">
+<!ENTITY releasedate     "February 26, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.2">
diff --git a/packages.ent b/packages.ent
index 50178a52a..8ded2250c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -618,7 +618,7 @@
 <!ENTITY systemd-man-url  "http://anduin.linuxfromscratch.org/LFS/systemd-man-pages-&systemd-version;.tar.xz">
 <!ENTITY systemd-man-md5  "8b1b53cff433d99288ce17be775bc44c">
 <!ENTITY systemd-ch6-du   "297 MB">
-<!ENTITY systemd-ch6-sbu  "0.2 SBU">
+<!ENTITY systemd-ch6-sbu  "1.1 SBU">
 
 <!ENTITY sysvinit-version "2.88dsf">
 <!ENTITY sysvinit-size "108 KB">