Added DJ Lucas to the list of authors.

Updated dependencies for Gawk. Merged from trunk r11036
Updated to linux-4.4.4. Merged from trunk r11034
Updated to mpfr-3.1.4. Merged from trunk r11034.
Updated to pkg-config-0.29.1. Merged from trunk r11034.
Updated to tcl-core-8.6.5. Merged from trunk r11034.
Removed pcprofiledump and libpcprofile.so from the installed files list on the Glibc page. Merged from trunk r11034.
Added the creation of /var/log/faillog. Merged from trunk r11034.
Removed the --disable-profile and --enable-obsolete-rpc options from glibc. Merged from trunk r11034.
Cleaned up patches file.
Cleaned up whatsnew file.
Cleaned up changelog of former changes.
Merged various spelling changes from r11030 and r11031.
Disable static libraries in texinfo and document installation of XSParagraph.so. Merged from trunk r11032.

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

16 files changed, 179 insertions, 127 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 7f14ee784..f77701eff 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -762,8 +762,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-         Patch, Sed and, Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
+         MPFR, Patch, Readline, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1748,7 +1748,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>GCC</seg>
+          <seg>Gawk, GCC</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2034,7 +2034,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Bash</seg>
+          <seg>Bash, Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fdaaee9c4..b61d2bfc0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,73 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>2016-03-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Added DJ Lucas to the list of authors.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated dependencies for Gawk. Merged from trunk r11036.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to linux-4.4.4. Merged from trunk r11034.</para>
+        </listitem>
+        <listitem> 
+          <para>[renodr] - Updated to mpfr-3.1.4. Merged from trunk r11034.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to pkg-config-0.29.1. Merged from trunk r11034.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to tcl-core-8.6.5. Merged from trunk r11034.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Removed pcprofiledump and libpcprofile.so from the
+          installed files list on the Glibc page. Merged from trunk r11034.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added the creation of /var/log/faillog. Merged from
+          trunk r11034.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Removed the --disable-profile and
+          --enable-obsolete-rpc options from Glibc. Merged from trunk r11034
+          </para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Cleaned up patches file.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Cleaned up whatsnew file.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Cleaned up changelog of former changes.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Merged various spelling changes from r11030,
+          r11031, </para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Disable static libraries in texinfo and
+          document installation of XSParagraph.so. Merged from trunk r11032.
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+    <listitem>
+      <para>2016-03-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - LFS 7.9-systemd released.</para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+<!-- LFS-7.9-systemd>
     <listitem>
       <para>2016-03-04</para>
       <itemizedlist>
@@ -55,6 +122,9 @@
       <para>2016-02-19</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - LFS-7.9-systemd-rc2 released.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to glibc-2.23 - Merged from trunk.</para>
         </listitem>
         <listitem>
@@ -95,7 +165,7 @@
           <para>[dj] - Updated to systemd-229.</para>
         </listitem>
         <listitem>
-          <para>[Chris] - Removed obsolete --dbus* switches from systemd
+          <para>[Chris] - Removed obsolete - -dbus* switches from systemd
           installation - current systemd sets reasonable defaults for D-Bus
           files.</para>
         </listitem>
@@ -236,7 +306,7 @@
           <para>[dj] - Change build order for systemd before procps-ng.</para>
         </listitem>
         <listitem>
-          <para>[dj] - Add --with-systemd to procps-ng configuration.</para>
+          <para>[dj] - Add - -with-systemd to procps-ng configuration.</para>
         </listitem>
         <listitem>
           <para>[dj] - Update to systemd-228.</para>
@@ -746,7 +816,7 @@
           before first use.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Use --with-glibc-version=2.11 in gcc-pass1.</para>
+          <para>[bdubbs] - Use - -with-glibc-version=2.11 in gcc-pass1.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to dejagnu-1.5.3. Fixes
@@ -859,6 +929,7 @@
         </listitem>
       </itemizedlist>
     </listitem>
+-->
 
   </itemizedlist>
 </sect1>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f72ffc56c..477f57418 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -40,9 +40,9 @@
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bison &bison-version;</para>
     </listitem>-->
@@ -52,60 +52,60 @@
     <!--<listitem>
       <para>Check &check-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>D-Bus-&dbus-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Expat-&expat-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>File &file-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Findutils &findutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Flex &flex-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>GMP &gmp-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Grep &grep-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
@@ -124,42 +124,42 @@
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Less &less-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libpipeline &libpipeline-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Linux &linux-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>M4 &m4-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Man-pages &man-pages-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>MPC &mpc-version;</para>
     </listitem>-->
@@ -172,12 +172,12 @@
     <!--<listitem>
       <para>Patch &patch-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Perl &perl-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Pkg-config &pkgconfig-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Procps-ng &procps-ng-version;</para>
     </listitem>-->
@@ -193,33 +193,33 @@
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Systemd &systemd-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Tar &tar-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Tcl-core-&tcl-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Tzdata &tzdata-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>XZ-Utils &xz-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Zlib &zlib-version;</para>
     </listitem>-->
@@ -237,22 +237,19 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-
+<!--
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
 
     <listitem>
       <para>&binutils-upstream-patch;</para>
-    </listitem>
+    </listitem>-->
 <!--
     <listitem>
       <para>&gcc-upstream-patch;</para>
     </listitem>
 -->
-    <listitem>
-      <para>&mpfr-upstream-patch;</para>
-    </listitem>
 
   </itemizedlist>
 
@@ -265,7 +262,7 @@
     </listitem>-->
 
     <listitem>
-      <para>glibc-2.22-upstream_i386_fix-1.patch</para>
+      <para>mpfr-3.1.3-upstream_fixes-2.patch</para>
     </listitem>
 
   </itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0d5fe9e43..7527485d1 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -57,14 +57,6 @@
       </listitem>
     </varlistentry>
 
-<!--    <varlistentry>
-      <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gcc-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry> -->
-
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -72,15 +64,7 @@
         <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Glibc i386 Patch - <token>&glibc-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
@@ -90,14 +74,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>MPFR Upstream Fixes Patch - <token>&mpfr-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&mpfr-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&mpfr-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 15cebd6b0..c5cf8520b 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -59,9 +59,7 @@ cd       build</userinput></screen>
       --prefix=/tools                    \
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
-      --disable-profile                  \
       --enable-kernel=&min-kernel;             \
-      --enable-obsolete-rpc              \
       --with-headers=/tools/include      \
       libc_cv_forced_unwind=yes          \
       libc_cv_ctors_header=yes           \
@@ -79,13 +77,15 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!--
       <varlistentry>
-        <term><parameter>--disable-profile</parameter></term>
+        <term><parameter>- -disable-profile</parameter></term>
         <listitem>
           <para>This builds the libraries without profiling information. Omit
           this option if profiling on the temporary tools is necessary.</para>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry>
         <term><parameter>--enable-kernel=&min-kernel;</parameter></term>
@@ -96,14 +96,16 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!--
       <varlistentry>
-        <term><parameter>--enable-obsolete-rpc</parameter></term>
+        <term><parameter>- -enable-obsolete-rpc</parameter></term>
         <listitem>
           <para>This installs NIS and RPC related headers that are not
           installed by default. They are required to build GCC and by
           several BLFS packages.</para>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry>
         <term><parameter>--with-headers=/tools/include</parameter></term>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 26ef70464..09d8160a0 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -43,7 +43,7 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>First, ensure that gawk is found first during configuration:</para>
+    <para>First, ensure that <command>gawk</command> is found first during configuration:</para>
 
 <screen><userinput remap="pre">sed -i s/mawk// configure</userinput></screen>
 
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 4d304874b..75a42a238 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -53,7 +53,7 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>This takes a long time, about &autoconf-ch6-sbu; SBUs. In addition, 
+    <para>This takes a long time, about &autoconf-ch6-sbu-tests; SBUs. In addition, 
     several steps are skipped that use Automake. For full test coverage,
     Autoconf can be re-tested after Automake has been installed. In addition,
     two tests fail due to changes in libtool-2.4.3 and later.</para>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 1d8f74d87..921684344 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -237,15 +237,16 @@ EOF</userinput></screen>
   do not already exist. Initialize the log files and give them
   proper permissions:</para>
 
-<screen><userinput>touch /var/log/{btmp,lastlog,wtmp}
+<screen><userinput>touch /var/log/{btmp,lastlog,faillog,wtmp}
 chgrp -v utmp /var/log/lastlog
 chmod -v 664  /var/log/lastlog
 chmod -v 600  /var/log/btmp</userinput></screen>
 
   <para>The <filename>/var/log/wtmp</filename> file records all logins and
   logouts. The <filename>/var/log/lastlog</filename> file records when each
-  user last logged in. The <filename>/var/log/btmp</filename> file records the
-  bad login attempts.</para>
+  user last logged in. The <filename>/var/log/faillog</filename> file records 
+  failed login attempts. The <filename>/var/log/btmp</filename> file records 
+  the bad login attempts.</para>
 
   <note><para>The <filename>/run/utmp</filename> file records the users that
   are currently logged in.  This file is created dynamically in the boot
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index fb219ad87..8a803a392 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -88,7 +88,6 @@ cd       build</userinput></screen>
     <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr          \
-             --disable-profile      \
              --enable-kernel=&min-kernel; \
              --enable-obsolete-rpc</userinput></screen>
 
@@ -402,7 +401,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
 
       <seglistitem>
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
-        ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd, pcprofiledump,
+        ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
         pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
@@ -410,7 +409,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         libcrypt.{a,so}, libdl.{a,so}, libg.a, libieee.a, libm.{a,so},
         libmcheck.a, libmemusage.so, libnsl.{a,so}, libnss_compat.so,
         libnss_dns.so, libnss_files.so, libnss_hesiod.so, libnss_nis.so,
-        libnss_nisplus.so, libpcprofile.so, libpthread.{a,so},
+        libnss_nisplus.so, libpthread.{a,so},
         libpthread_nonshared.a, libresolv.{a,so}, librpcsvc.a, librt.{a,so},
         libthread_db.so, and libutil.{a,so}</seg>
         <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
@@ -576,6 +575,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!--
       <varlistentry id="pcprofiledump">
         <term><command>pcprofiledump</command></term>
         <listitem>
@@ -585,6 +585,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="pldd">
         <term><command>pldd</command></term>
@@ -851,6 +852,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!--
       <varlistentry id="libpcprofile">
         <term><filename class="libraryfile">libpcprofile</filename></term>
         <listitem>
@@ -861,6 +863,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="libpthread">
         <term><filename class="libraryfile">libpthread</filename></term>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 582e76bbe..df9c3c522 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -41,11 +41,13 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
 
+<!--
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&mpfr-upstream-patch;</userinput></screen>
-
+-->
+    
     <para>Prepare MPFR for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index ad4070400..7c7e6f0f3 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -41,7 +41,7 @@
   linkend="ch-system-bindmount"/> and <xref
   linkend="ch-system-kernfsmount"/>.</para>
 
-  <para>Finally, there were several static libraries that were not supressed earlier
+  <para>Finally, there were several static libraries that were not suppressed earlier
   in the chapter in order to satisfy the regression tests in several packages. These 
   libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
   remove them now:</para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index c4308f337..7da34a5e0 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -43,7 +43,7 @@
 
     <para>Prepare Texinfo for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -98,12 +98,14 @@ popd</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>info, install-info, makeinfo (link to texi2any),
         pdftexi2dvi, pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
-        <seg>/usr/share/texinfo</seg>
+        <seg>XSParagraph.so</seg>
+        <seg>/usr/share/texinfo and /usr/lib/texinfo</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/general.ent b/general.ent
index 7e9b233d8..b9fb888b2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,9 +1,9 @@
-<!ENTITY version         "20160304-systemd">
+<!ENTITY version         "20160330-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "March 04, 2016">
+<!ENTITY releasedate     "March 30th, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone       "7.9">
-<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
+<!ENTITY milestone       "7.10">
+<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
diff --git a/packages.ent b/packages.ent
index 545696881..4469dc6d8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -28,7 +28,8 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-ch6-du "18 MB">
-<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about 3.5 SBU with tests)">
+<!ENTITY autoconf-ch6-sbu-tests "3.6">
+<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
 
 <!ENTITY automake-version "1.15">
 <!ENTITY am-minor-version "1.15">
@@ -375,12 +376,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "4">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "85,249 KB">
+<!ENTITY linux-size "85,262 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d1b8be99e6c12cbc52b2af0520d550bb">
+<!ENTITY linux-md5 "73d1835cfb6dd348d87c8c2413190c21">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -437,10 +438,10 @@
 <!ENTITY mpc-ch6-du "18 MB">
 <!ENTITY mpc-ch6-sbu "0.4 SBU">
 
-<!ENTITY mpfr-version "3.1.3">
-<!ENTITY mpfr-size "1,087 KB">
+<!ENTITY mpfr-version "3.1.4">
+<!ENTITY mpfr-size "1,096 KB">
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
-<!ENTITY mpfr-md5 "6969398cd2fbc56a6af570b5273c56a9">
+<!ENTITY mpfr-md5 "064b2c18185038e404a401b830d59be8">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch6-du "47 MB">
 <!ENTITY mpfr-ch6-sbu "0.8 SBU">
@@ -475,10 +476,10 @@
 <!ENTITY perl-ch6-du "240 MB">
 <!ENTITY perl-ch6-sbu "6.2 SBU">
 
-<!ENTITY pkgconfig-version "0.29">
-<!ENTITY pkgconfig-size "1,928 KB">
+<!ENTITY pkgconfig-version "0.29.1">
+<!ENTITY pkgconfig-size "1,967 KB">
 <!ENTITY pkgconfig-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-<!ENTITY pkgconfig-md5 "77f27dce7ef88d0634d0d6f90e03a77f">
+<!ENTITY pkgconfig-md5 "f739a28cae4e0ca291f82d1d41ef107d">
 <!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-ch6-du "31 MB">
 <!ENTITY pkgconfig-ch6-sbu "0.3 SBU">
@@ -543,11 +544,11 @@
 <!ENTITY tar-ch6-du "40 MB">
 <!ENTITY tar-ch6-sbu "1.9 SBU">
 
-<!ENTITY tcl-version "8.6.4">
+<!ENTITY tcl-version "8.6.5">
 <!ENTITY tcl-major-version "8.6">
-<!ENTITY tcl-size "5,677 KB">
+<!ENTITY tcl-size "5,710 KB">
 <!ENTITY tcl-url "http://sourceforge.net/projects/tcl/files/Tcl/&tcl-version;/tcl-core&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "8b8c9d85469d8dbe32e51117b8ef11e3">
+<!ENTITY tcl-md5 "611d34844a2e9158b721e3e3daa6f127">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
 <!ENTITY tcl-ch5-du "41 MB">
 <!ENTITY tcl-ch5-sbu "0.4 SBU">
diff --git a/patches.ent b/patches.ent
index f5d8d107d..99a4d67c2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -30,10 +30,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY mpfr-upstream-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
-<!ENTITY mpfr-upstream-patch-md5 "ef2f0b72f7e2dcc7775303bd3b850bca">
-<!ENTITY mpfr-upstream-patch-size "128 KB">
-
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
 <!ENTITY readline-fixes-patch-size "8 KB">
diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml
index 059509ea7..a64750a42 100644
--- a/prologue/bookinfo.xml
+++ b/prologue/bookinfo.xml
@@ -17,6 +17,7 @@
     </author>
     <author>
       <firstname>Edited by Douglas R. Reno</firstname>
+      <surname>and DJ Lucas.</surname>
     </author>
   </authorgroup>