Optimize building merged books

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

17 files changed, 29 insertions, 47 deletions

diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 76bde3d03..8c4c1695e 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-bootscripts" role="wrap">
+<sect1 id="ch-scripts-bootscripts" role="wrap" revision="sysv">
   <?dbhtml filename="bootscripts.html"?>
 
   <sect1info condition="script">
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index e1abbc637..e3cdcd721 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -16,16 +16,23 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hosts.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysd-custom.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hostname.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="setclock.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="console.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="site.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udevd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinksd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
+
+  <!-- common -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
 
+  <!-- systemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
+
 </chapter>
diff --git a/chapter07/chapter07d.xml b/chapter07/chapter07d.xml
deleted file mode 100644
index a2c30abe0..000000000
--- a/chapter07/chapter07d.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Chapter 7">
-  <?dbhtml dir="chapter07"?>
-  <?dbhtml filename="chapter07.html"?>
-
-  <title>Basic System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udevd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinksd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshellsd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
-
-</chapter>
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index 0dbdc7eaf..f5e710ebe 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-clock">
+<sect1 id="ch-scripts-clock" revision="systemd">
   <?dbhtml filename="clock.html"?>
 
   <title>Configuring the system clock</title>
diff --git a/chapter07/consoled.xml b/chapter07/consoled.xml
index ea1062c23..f9d2ea0d5 100644
--- a/chapter07/consoled.xml
+++ b/chapter07/consoled.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-console">
+<sect1 id="ch-scripts-console" revision="systemd">
   <?dbhtml filename="console.html"?>
 
   <title>Configuring the Linux Console</title>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 8ee7384cd..810c927cc 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-introduction">
+<sect1 id="ch-scripts-introduction" revision="sysv">
   <?dbhtml filename="introduction.html"?>
 
   <title>Introduction</title>
diff --git a/chapter07/introductiond.xml b/chapter07/introductiond.xml
index 59d618b8b..dbd6705ce 100644
--- a/chapter07/introductiond.xml
+++ b/chapter07/introductiond.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-introduction">
+<sect1 id="ch-scripts-introduction" revision="systemd">
   <?dbhtml filename="introduction.html"?>
 
   <title>Introduction</title>
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 76dbb7251..3e6c2aa7a 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-locale">
+<sect1 id="ch-scripts-locale" revision="systemd">
   <?dbhtml filename="locale.html"?>
 
   <title>Configuring the System Locale</title>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index f70f23c41..f95f0e26d 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-network">
+<sect1 id="ch-scripts-network" revision="sysv">
   <?dbhtml filename="network.html"?>
 
   <title>General Network Configuration</title>
diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml
index 86dcb3e53..17e879fb7 100644
--- a/chapter07/networkd.xml
+++ b/chapter07/networkd.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-network">
+<sect1 id="ch-scripts-network" revision="systemd">
   <?dbhtml filename="network.html"?>
 
   <title>General Network Configuration</title>
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index a3b066fd0..8bbcb8eae 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-profile">
+<sect1 id="ch-scripts-profile" revision="sysv">
   <?dbhtml filename="profile.html"?>
 
   <title>The Bash Shell Startup Files</title>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 0993f2305..e80f839dd 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-symlinks">
+<sect1 id="ch-scripts-symlinks" revision="sysv">
   <?dbhtml filename="symlinks.html"?>
 
   <title>Managing Devices</title>
diff --git a/chapter07/symlinksd.xml b/chapter07/symlinksd.xml
index 354ae319a..b0d6460cf 100644
--- a/chapter07/symlinksd.xml
+++ b/chapter07/symlinksd.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-symlinks">
+<sect1 id="ch-scripts-symlinks" revision="systemd">
   <?dbhtml filename="symlinks.html"?>
 
   <title>Creating Custom Symlinks to Devices</title>
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 0c8ca75b9..3f2f84f3f 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-systemd-custom">
+<sect1 id="ch-scripts-systemd-custom" revision="systemd">
   <?dbhtml filename="systemd-custom.html"?>
 
   <title>Systemd Usage and Configuration</title>
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 7d1f9b59c..f42260fb6 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-udev">
+<sect1 id="ch-scripts-udev" revision="sysv">
   <?dbhtml filename="udev.html"?>
 
   <title>Overview of Device and Module Handling</title>
diff --git a/chapter07/udevd.xml b/chapter07/udevd.xml
index 548a2d2ee..d63592415 100644
--- a/chapter07/udevd.xml
+++ b/chapter07/udevd.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-udev">
+<sect1 id="ch-scripts-udev" revision="systemd">
   <?dbhtml filename="udev.html"?>
 
   <title>Device and Module Handling on an LFS System</title>
diff --git a/chapter07/usage.xml b/chapter07/usage.xml
index f0e62b6c3..b710e484b 100644
--- a/chapter07/usage.xml
+++ b/chapter07/usage.xml
@@ -6,7 +6,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-usage">
+<sect1 id="ch-scripts-usage" revision="sysv">
   <?dbhtml filename="usage.html"?>
 
   <title>System V Bootscript Usage and Configuration</title>