aboutsummaryrefslogtreecommitdiffstats
path: root/chapter01
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-24 21:24:59 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-24 21:24:59 +0000
commit1118b1757d67c5e7deb4c9e4b864b00f9d8a8b0c (patch)
treecf1411feb617804f8468b98348eff7f377b2ee07 /chapter01
parent11ebea60aa77e5a8b24f08971e153d05c12a4406 (diff)
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
Diffstat (limited to 'chapter01')
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter01/how.xml2
-rw-r--r--chapter01/whatsnew.xml12
3 files changed, 16 insertions, 4 deletions
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>