Merge lfs-svn, fix timedatectl command.

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

6 files changed, 34 insertions, 28 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f20e03cb4..d834b805b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,10 +36,21 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-08-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140815.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-08-15</para>
       <itemizedlist>
         <listitem>
-          <para>[krejzi] - Merged LFS SVN-20140814.</para>
+          <para>[bdubbs] - Remove redundant wording in checking 
+          toolchain values.  Fixes 
+          <ulink url="&lfs-ticket-root;3654">#3654</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index d0bc248de..cdb9ffce9 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -597,20 +597,20 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term>
+      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&tzdata-home;"/></para>
-        <para>Download: <ulink url="&tzdata-url;"/></para>
-        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
+        <para>Home page: <ulink url="&texinfo-home;"/></para>
+        <para>Download: <ulink url="&texinfo-url;"/></para>
+        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
+      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&texinfo-home;"/></para>
-        <para>Download: <ulink url="&texinfo-url;"/></para>
-        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
+        <para>Home page: <ulink url="&tzdata-home;"/></para>
+        <para>Download: <ulink url="&tzdata-url;"/></para>
+        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 49612eba7..f035784c9 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -196,12 +196,12 @@ cd ../gcc-build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
         --disable-libatomic, --disable-libgomp, --disable-libitm,
-        --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+        --disable-libquadmath, --disable-libsanitizer,
         --disable-libssp, --disable-libvtv, --disable-libcilkrts,
         --disable-libstdc++-v3</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libatomic, libgomp, libitm, libmudflap,
+          extension, threading, libatomic, libgomp, libitm, 
           libquadmath, libsanitizer, libssp, libvtv, libcilkrts
           and the C++ standard library respectively. These features will fail
           to compile when building a cross-compiler and are not necessary for
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 933bebb44..f6b00971d 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -46,7 +46,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
 cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-  <para os="b">If everything is working correctly, there should be no errors,
+  <para os="b">There should be no errors,
   and the output of the last command will be (allowing for
   platform-specific differences in dynamic linker name):</para>
 
@@ -59,8 +59,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
 
-  <para os="f">If everything is working correctly, there should be no errors,
-    and the output of the last command will be:</para>
+  <para os="f">The output of the last command should be:</para>
 
 <screen><computeroutput>/usr/lib/crt1.o succeeded
 /usr/lib/crti.o succeeded
@@ -71,7 +70,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen><userinput>grep -B1 '^ /usr/include' dummy.log</userinput></screen>
 
-  <para os="h">This command should return successfully with the following output:</para>
+  <para os="h">This command should return the following output:</para>
 
 <screen><computeroutput>#include &lt;...&gt; search starts here:
  /usr/include</computeroutput></screen>
@@ -80,9 +79,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
 
-  <para os="k">If everything is working correctly, there should be no errors,
-  and the output of the last command
-  will be:</para>
+  <para os="k">The output of the last command should be:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/lib")
 SEARCH_DIR("/lib");</computeroutput></screen>
@@ -91,9 +88,8 @@ SEARCH_DIR("/lib");</computeroutput></screen>
 
 <screen os="m"><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
 
-  <para os="n">If everything is working correctly, there should be no errors,
-  and the output of the last command (allowing for a lib64 directory on 64-bit hosts)
-  will be:</para>
+  <para os="n">The output of the last command (allowing for a lib64 directory 
+  on 64-bit hosts) should be:</para>
 
 <screen os="o"><computeroutput>attempt to open /lib/libc.so.6 succeeded</computeroutput></screen>
 
@@ -101,10 +97,9 @@ SEARCH_DIR("/lib");</computeroutput></screen>
 
 <screen os="q"><userinput>grep found dummy.log</userinput></screen>
 
-  <para os="r">If everything is working correctly, there should be no errors,
-  and the output of the last command will be (allowing for
-  platform-specific differences in dynamic linker name and a lib64 directory
-  on 64-bit hosts):</para>
+  <para os="r"> The output of the last command should be (allowing for
+  platform-specific differences in dynamic linker name and a lib64 directory on
+  64-bit hosts):</para>
 
 <screen os="s"><computeroutput>found ld-linux.so.2 at /lib/ld-linux.so.2</computeroutput></screen>
 
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index 583b1a088..455b75a8f 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -57,7 +57,7 @@ EOF</userinput></screen>
 
   <para>To change your current system time, issue:</para>
 
-<screen role="nodump"><userinput>timedatectl set-time YYYY:MM:DD HH:MM:SS</userinput></screen>
+<screen role="nodump"><userinput>timedatectl set-time YYYY-MM-DD HH:MM:SS</userinput></screen>
 
   <para>Hardware clock will also be updated accordingly.</para>
 
diff --git a/general.ent b/general.ent
index 9b4db837e..f327abb4f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20140815-systemd">
+<!ENTITY version         "20140816-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "August 15, 2014">
+<!ENTITY releasedate     "August 16, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->