From a966c4672f80b699d85d8fb16a7b94a0aed81f5b Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sat, 21 Dec 2013 20:02:39 +0000
Subject: Make new packages contents consistent with other lfs packages.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10406 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/acl.xml        | 2 +-
 chapter06/attr.xml       | 2 +-
 chapter06/dbus.xml       | 4 ++--
 chapter06/intltool.xml   | 2 +-
 chapter06/libdbus.xml    | 2 +-
 chapter06/systemd.xml    | 4 ++--
 chapter06/xml-parser.xml | 6 +-----
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 9acbf9cf9..488d9479b 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -87,7 +87,7 @@ ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
       <seglistitem>
         <seg>chacl, getfacl, and setacl</seg>
         <seg>libacl.{so,a}</seg>
-        <seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
+        <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 27a3311ee..07a80a0e0 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -91,7 +91,7 @@ ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
       <seglistitem>
         <seg>attr, getfattr, and setattr</seg>
         <seg>libattr.{so,a}</seg>
-        <seg>/usr/include/attr and /usr/share/doc/attr-&attr-version;</seg>
+        <seg>/usr/include/attr, /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 565c547df..06acab4da 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -107,10 +107,10 @@
 
       <seglistitem>
         <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-        dbus-send and dbus-uuidgen</seg>
+        dbus-send, and dbus-uuidgen</seg>
         <seg>libdbus-1.so</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version; and
+        /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version;,
         /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index 781bf5629..f8ae439ea 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -71,7 +71,7 @@ install -v -Dm644 doc/I18N-HOWTO \
       <seglistitem>
         <seg>intltool-extract, intltool-merge, intltool-prepare,
         intltool-update, and intltoolize</seg>
-        <seg>/usr/share/doc/intltool-&intltool-version; and
+        <seg>/usr/share/doc/intltool-&intltool-version;,
         /usr/share/intltool</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/libdbus.xml b/chapter06/libdbus.xml
index bef756e8f..ff70ab9c8 100644
--- a/chapter06/libdbus.xml
+++ b/chapter06/libdbus.xml
@@ -85,7 +85,7 @@ make install-pkgconfigDATA</userinput></screen>
       <seglistitem>
         <seg>none</seg>
         <seg>libdbus-1.so</seg>
-        <seg>/usr/include/dbus-1.0 and /usr/lib/dbus-1.0</seg>
+        <seg>/usr/include/dbus-1.0, /usr/lib/dbus-1.0</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 5c62d9b77..3175d6e7f 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -144,14 +144,14 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
         systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent, telinit,
         timedatectl, and udevadm</seg>
         <seg>libnss_myhostname.so.2, libsystemd-daemon.so, libsystemd-id128.so,
-        libsystemd-journal.so, libsystemd-login.so, and libudev.so</seg>
+        libsystemd-journal.so, libsystemd-login.so, libudev.so</seg>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
         /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d, /usr/lib/rpm,
         /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
         /usr/share/doc/systemd-&systemd-version;, /usr/share/systemd,
-        /var/lib/systemd and /var/log/journal</seg>
+        /var/lib/systemd, /var/log/journal</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/xml-parser.xml b/chapter06/xml-parser.xml
index 08155ecdf..2571e1a23 100644
--- a/chapter06/xml-parser.xml
+++ b/chapter06/xml-parser.xml
@@ -63,14 +63,10 @@
     <title>Contents of XML::Parser</title>
 
     <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed Perl module</segtitle>
 
       <seglistitem>
-        <seg>none</seg>
         <seg>Expat.so</seg>
-        <seg>none</seg>
       </seglistitem>
     </segmentedlist>
 
-- 
cgit v1.2.3-54-g00ecf