From a65f8ca2b97488fd04217c5c0aab17c6ff87d044 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Thu, 23 Apr 2015 23:20:48 +0000
Subject: [PATCH] Merged some changes from the main book.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10897 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter06/binutils.xml  |  2 +-
 chapter06/flex.xml      |  3 +--
 packages.ent            | 18 +++++++++---------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4fe3bbb6a..b5287b5b0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2015-04-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.8.3. Fixes
+          <ulink url="&lfs-ticket-root;3778">#3778</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-04-16</para>
       <itemizedlist>
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index c87ab1ea9..c41d62289 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -110,7 +110,7 @@ cd ../binutils-build</userinput></screen>
 
     <para>Test the results:</para>
 
-<screen><userinput remap="test">make -k check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index f508fb0b2..7ed596a94 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -47,8 +47,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
-            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 9b911fac8..e38fcb7a5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -180,9 +180,9 @@
 <!ENTITY findutils-ch6-sbu "0.4 SBU">
 
 <!ENTITY flex-version "2.5.39">
-<!ENTITY flex-size "1,575 KB">
-<!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "77d44c6bb8c0705e0017ab9a84a1502b">
+<!ENTITY flex-size "1,316 KB">
+<!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.xz">
+<!ENTITY flex-md5 "477679c37ff8b28248a9b05f1da29a82">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!ENTITY flex-ch6-du "38 MB">
 <!ENTITY flex-ch6-sbu "0.3 SBU">
@@ -302,9 +302,9 @@
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY inetutils-version "1.9.2">
-<!ENTITY inetutils-size "2,188 KB">
-<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
-<!ENTITY inetutils-md5 "aa1a9a132259db83e66c1f3265065ba2">
+<!ENTITY inetutils-size "1,304 KB">
+<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
+<!ENTITY inetutils-md5 "90bab34d53376c8645499b51d4300bd1">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-ch6-du "34 MB">
 <!ENTITY inetutils-ch6-sbu "0.4 SBU">
@@ -421,10 +421,10 @@
 <!ENTITY man-db-ch6-du "33 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "3.82">
-<!ENTITY man-pages-size "1,326 KB">
+<!ENTITY man-pages-version "3.83">
+<!ENTITY man-pages-size "1,333 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "b3d4d949530d0ce13971040b53cf7a39">
+<!ENTITY man-pages-md5 "a8d21f07f4ee01a117f196ab2f5e260a">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "35 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">