From b6b928669b8fa26656ebefa212f8ec2c793304bc Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Tue, 29 Oct 2019 07:22:16 +0000
Subject: [PATCH] MultiLib: Merge changes from trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11690 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 9 +++++++++
 general.ent             | 6 +++---
 packages.ent            | 2 +-
 prologue/why.xml        | 3 +--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 556ed1d4b..fce436766 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
        -->
+    <listitem>
+      <para>2019-10-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to lfs-bootscripts-20191025.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-10-17</para>
       <itemizedlist>
diff --git a/general.ent b/general.ent
index a78b13b5d..fedee0710 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20191017">
+<!ENTITY version         "SVN-20191025">
 <!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        "20191017-systemd">
+<!ENTITY versiond        "20191025-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "October 17th, 2019">
+<!ENTITY releasedate     "October 25th, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">
diff --git a/packages.ent b/packages.ent
index 45d69d506..d0dc1525c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -388,7 +388,7 @@
 <!ENTITY less-ch6-du "4.1 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20190908">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20191025">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">  
diff --git a/prologue/why.xml b/prologue/why.xml
index 3cb365d2e..31cc87620 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -95,8 +95,7 @@
       <listitem>
         <para>Check</para>
 
-        <para>This package contains a test harness for other programs.
-        It is only installed in the temporary toolchain.</para>
+        <para>This package contains a test harness for other programs.</para>
       </listitem>
 
       <listitem>