From 1118b1757d67c5e7deb4c9e4b864b00f9d8a8b0c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 24 May 2016 21:24:59 +0000
Subject: Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  6 ++++++
 chapter01/how.xml       |  2 +-
 chapter01/whatsnew.xml  | 12 +++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'chapter01')

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 430fb33a1..ed0d08870 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -18,6 +18,8 @@
   <para>Below is a list of changes made since the previous release of the
   book.</para>
 
+  <para revision="systemd">A test</para>
+
   <itemizedlist>
     <title>Changelog Entries:</title>
 
@@ -34,6 +36,10 @@
         </listitem>
       </itemizedlist>
     </listitem>
+
+    Note:  If a change is only specific to sysv or systemd, then use
+    <listitem revision="sysv"> or <listitem revision="systemd"> as
+    appropriate for the entry or if needed the entire day's listitem.
 -->
     <listitem>
       <para>2016-05-16</para>
diff --git a/chapter01/how.xml b/chapter01/how.xml
index c4f3a0a8b..a92a3fad7 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -81,7 +81,7 @@
   for package compilations to complete, you can continue using your computer as
   normal.</para>
 
-  <para>To finish the installation, the LFS-Bootscripts are set up in
+  <para>To finish the installation, the basic system configuration is set up in
   <xref linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
   up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
   contains information on continuing the LFS experience beyond this book.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e043ec2a4..04b2f10c0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -58,10 +58,13 @@
     <listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>
+    <!--<listitem revision="systemd">
+      <para>D-Bus-&dbus-version;</para>
+    </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <!--<listitem revision="sysv">
       <para>Eudev &eudev-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -196,10 +199,13 @@
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <!--<listitem revision="sysv">
       <para>Sysklogd &sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <!--<listitem revision="systemd">
+      <para>Systemd &systemd-version;</para>
+    </listitem>-->
+    <!--<listitem revision="sysv">
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
     <listitem>
-- 
cgit v1.2.3-54-g00ecf