From fb386e05f17d44dc6322a1b3db172cc297ed5ce5 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Thu, 11 Jun 2020 12:55:28 +0000
Subject: Rename package entities to be independent of chapter numbering

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11921 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter08/acl.xml         | 4 ++--
 chapter08/attr.xml        | 4 ++--
 chapter08/autoconf.xml    | 6 +++---
 chapter08/automake.xml    | 4 ++--
 chapter08/bash.xml        | 4 ++--
 chapter08/bc.xml          | 4 ++--
 chapter08/binutils.xml    | 4 ++--
 chapter08/bison.xml       | 4 ++--
 chapter08/bzip2.xml       | 4 ++--
 chapter08/check.xml       | 4 ++--
 chapter08/coreutils.xml   | 4 ++--
 chapter08/dbus.xml        | 4 ++--
 chapter08/diffutils.xml   | 4 ++--
 chapter08/e2fsprogs.xml   | 4 ++--
 chapter08/eudev.xml       | 4 ++--
 chapter08/expat.xml       | 4 ++--
 chapter08/file.xml        | 4 ++--
 chapter08/findutils.xml   | 4 ++--
 chapter08/flex.xml        | 4 ++--
 chapter08/gawk.xml        | 4 ++--
 chapter08/gcc.xml         | 4 ++--
 chapter08/gdbm.xml        | 4 ++--
 chapter08/gettext.xml     | 4 ++--
 chapter08/glibc.xml       | 4 ++--
 chapter08/gmp.xml         | 4 ++--
 chapter08/gperf.xml       | 4 ++--
 chapter08/grep.xml        | 4 ++--
 chapter08/groff.xml       | 4 ++--
 chapter08/grub.xml        | 4 ++--
 chapter08/gzip.xml        | 4 ++--
 chapter08/iana-etc.xml    | 4 ++--
 chapter08/inetutils.xml   | 4 ++--
 chapter08/intltool.xml    | 4 ++--
 chapter08/iproute2.xml    | 4 ++--
 chapter08/kbd.xml         | 4 ++--
 chapter08/kmod.xml        | 4 ++--
 chapter08/less.xml        | 4 ++--
 chapter08/libcap.xml      | 4 ++--
 chapter08/libelf.xml      | 4 ++--
 chapter08/libffi.xml      | 4 ++--
 chapter08/libpipeline.xml | 4 ++--
 chapter08/libtool.xml     | 4 ++--
 chapter08/m4.xml          | 4 ++--
 chapter08/make.xml        | 4 ++--
 chapter08/man-db.xml      | 4 ++--
 chapter08/man-pages.xml   | 4 ++--
 chapter08/meson.xml       | 4 ++--
 chapter08/mpc.xml         | 4 ++--
 chapter08/mpfr.xml        | 4 ++--
 chapter08/ncurses.xml     | 4 ++--
 chapter08/ninja.xml       | 4 ++--
 chapter08/openssl.xml     | 4 ++--
 chapter08/patch.xml       | 4 ++--
 chapter08/perl.xml        | 4 ++--
 chapter08/pkgconfig.xml   | 4 ++--
 chapter08/procps.xml      | 4 ++--
 chapter08/psmisc.xml      | 4 ++--
 chapter08/python.xml      | 4 ++--
 chapter08/readline.xml    | 4 ++--
 chapter08/sed.xml         | 4 ++--
 chapter08/shadow.xml      | 4 ++--
 chapter08/sysklogd.xml    | 4 ++--
 chapter08/systemd.xml     | 4 ++--
 chapter08/sysvinit.xml    | 4 ++--
 chapter08/tar.xml         | 4 ++--
 chapter08/texinfo.xml     | 4 ++--
 chapter08/util-linux.xml  | 4 ++--
 chapter08/vim.xml         | 4 ++--
 chapter08/xml-parser.xml  | 4 ++--
 chapter08/xz.xml          | 4 ++--
 chapter08/zlib.xml        | 4 ++--
 chapter08/zstd.xml        | 4 ++--
 72 files changed, 145 insertions(+), 145 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/acl.xml b/chapter08/acl.xml
index f9f2eddbe..03f057cb3 100644
--- a/chapter08/acl.xml
+++ b/chapter08/acl.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&acl-ch6-sbu;</seg>
-        <seg>&acl-ch6-du;</seg>
+        <seg>&acl-fin-sbu;</seg>
+        <seg>&acl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/attr.xml b/chapter08/attr.xml
index 10c6eec53..0033ae58f 100644
--- a/chapter08/attr.xml
+++ b/chapter08/attr.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&attr-ch6-sbu;</seg>
-        <seg>&attr-ch6-du;</seg>
+        <seg>&attr-fin-sbu;</seg>
+        <seg>&attr-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index 6652747fd..c490a3994 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&autoconf-ch6-sbu;</seg>
-        <seg>&autoconf-ch6-du;</seg>
+        <seg>&autoconf-fin-sbu;</seg>
+        <seg>&autoconf-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -59,7 +59,7 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 <!--
-    <para>This takes a long time, about &autoconf-ch6-sbu-tests; SBUs. In addition,
+    <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition,
     several tests are skipped that use Automake. For full test coverage,
     Autoconf can be re-tested after Automake has been installed.  In addition,
     two tests fail due to changes in libtool-2.4.3 and later.</para>
diff --git a/chapter08/automake.xml b/chapter08/automake.xml
index 11dccfad3..5587d577d 100644
--- a/chapter08/automake.xml
+++ b/chapter08/automake.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&automake-ch6-sbu;</seg>
-        <seg>&automake-ch6-du;</seg>
+        <seg>&automake-fin-sbu;</seg>
+        <seg>&automake-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 650c33ade..60cb9b491 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&bash-ch6-sbu;</seg>
-        <seg>&bash-ch6-du;</seg>
+        <seg>&bash-fin-sbu;</seg>
+        <seg>&bash-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/bc.xml b/chapter08/bc.xml
index d848ad365..a499937e3 100644
--- a/chapter08/bc.xml
+++ b/chapter08/bc.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&bc-ch6-sbu;</seg>
-        <seg>&bc-ch6-du;</seg>
+        <seg>&bc-fin-sbu;</seg>
+        <seg>&bc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 04dbd199c..6f6f7be95 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&binutils-ch6-sbu;</seg>
-        <seg>&binutils-ch6-du;</seg>
+        <seg>&binutils-fin-sbu;</seg>
+        <seg>&binutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/bison.xml b/chapter08/bison.xml
index 23b6f0a95..687cdf9ee 100644
--- a/chapter08/bison.xml
+++ b/chapter08/bison.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&bison-ch6-sbu;</seg>
-        <seg>&bison-ch6-du;</seg>
+        <seg>&bison-fin-sbu;</seg>
+        <seg>&bison-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/bzip2.xml b/chapter08/bzip2.xml
index edf2f5bd4..6927df68e 100644
--- a/chapter08/bzip2.xml
+++ b/chapter08/bzip2.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&bzip2-ch6-sbu;</seg>
-        <seg>&bzip2-ch6-du;</seg>
+        <seg>&bzip2-fin-sbu;</seg>
+        <seg>&bzip2-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/check.xml b/chapter08/check.xml
index bd4306b28..fc28a9113 100644
--- a/chapter08/check.xml
+++ b/chapter08/check.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&check-ch5-sbu;</seg>
-        <seg>&check-ch5-du;</seg>
+        <seg>&check-fin-sbu;</seg>
+        <seg>&check-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 5a4079d78..d97b9558a 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&coreutils-ch6-sbu;</seg>
-        <seg>&coreutils-ch6-du;</seg>
+        <seg>&coreutils-fin-sbu;</seg>
+        <seg>&coreutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml
index bb4bffc76..0b06ad3e0 100644
--- a/chapter08/dbus.xml
+++ b/chapter08/dbus.xml
@@ -36,8 +36,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&dbus-ch6-sbu;</seg>
-        <seg>&dbus-ch6-du;</seg>
+        <seg>&dbus-fin-sbu;</seg>
+        <seg>&dbus-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/diffutils.xml b/chapter08/diffutils.xml
index 0d8bd5c77..8889077d5 100644
--- a/chapter08/diffutils.xml
+++ b/chapter08/diffutils.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&diffutils-ch6-sbu;</seg>
-        <seg>&diffutils-ch6-du;</seg>
+        <seg>&diffutils-fin-sbu;</seg>
+        <seg>&diffutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 984ba6db9..dbfc1e7e8 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -34,8 +34,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&e2fsprogs-ch6-sbu;</seg>
-        <seg>&e2fsprogs-ch6-du;</seg>
+        <seg>&e2fsprogs-fin-sbu;</seg>
+        <seg>&e2fsprogs-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml
index 71511c3e7..39c86ef1f 100644
--- a/chapter08/eudev.xml
+++ b/chapter08/eudev.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&eudev-ch6-sbu;</seg>
-        <seg>&eudev-ch6-du;</seg>
+        <seg>&eudev-fin-sbu;</seg>
+        <seg>&eudev-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
   </sect2>
diff --git a/chapter08/expat.xml b/chapter08/expat.xml
index df9f709c9..d978864c8 100644
--- a/chapter08/expat.xml
+++ b/chapter08/expat.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&expat-ch6-sbu;</seg>
-        <seg>&expat-ch6-du;</seg>
+        <seg>&expat-fin-sbu;</seg>
+        <seg>&expat-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/file.xml b/chapter08/file.xml
index b5e28f244..eb9f41a2b 100644
--- a/chapter08/file.xml
+++ b/chapter08/file.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&file-ch6-sbu;</seg>
-        <seg>&file-ch6-du;</seg>
+        <seg>&file-fin-sbu;</seg>
+        <seg>&file-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml
index 19989ecaa..f55e5cbb1 100644
--- a/chapter08/findutils.xml
+++ b/chapter08/findutils.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&findutils-ch6-sbu;</seg>
-        <seg>&findutils-ch6-du;</seg>
+        <seg>&findutils-fin-sbu;</seg>
+        <seg>&findutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/flex.xml b/chapter08/flex.xml
index bd4bd545f..fc8574c1d 100644
--- a/chapter08/flex.xml
+++ b/chapter08/flex.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&flex-ch6-sbu;</seg>
-        <seg>&flex-ch6-du;</seg>
+        <seg>&flex-fin-sbu;</seg>
+        <seg>&flex-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml
index b112eb10d..940fe3833 100644
--- a/chapter08/gawk.xml
+++ b/chapter08/gawk.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gawk-ch6-sbu;</seg>
-        <seg>&gawk-ch6-du;</seg>
+        <seg>&gawk-fin-sbu;</seg>
+        <seg>&gawk-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index ad9f5418f..6902211ca 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gcc-ch6-sbu;</seg>
-        <seg>&gcc-ch6-du;</seg>
+        <seg>&gcc-fin-sbu;</seg>
+        <seg>&gcc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gdbm.xml b/chapter08/gdbm.xml
index f953b63f9..06403ff56 100644
--- a/chapter08/gdbm.xml
+++ b/chapter08/gdbm.xml
@@ -34,8 +34,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gdbm-ch6-sbu;</seg>
-        <seg>&gdbm-ch6-du;</seg>
+        <seg>&gdbm-fin-sbu;</seg>
+        <seg>&gdbm-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml
index 2c4683804..dd5bebbe9 100644
--- a/chapter08/gettext.xml
+++ b/chapter08/gettext.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gettext-ch6-sbu;</seg>
-        <seg>&gettext-ch6-du;</seg>
+        <seg>&gettext-fin-sbu;</seg>
+        <seg>&gettext-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index a422c8d3c..7d993d509 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&glibc-ch6-sbu;</seg>
-        <seg>&glibc-ch6-du;</seg>
+        <seg>&glibc-fin-sbu;</seg>
+        <seg>&glibc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml
index 4bc361a56..dfa2fd6e4 100644
--- a/chapter08/gmp.xml
+++ b/chapter08/gmp.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gmp-ch6-sbu;</seg>
-        <seg>&gmp-ch6-du;</seg>
+        <seg>&gmp-fin-sbu;</seg>
+        <seg>&gmp-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gperf.xml b/chapter08/gperf.xml
index d8c5b6594..aa42fe18b 100644
--- a/chapter08/gperf.xml
+++ b/chapter08/gperf.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gperf-ch6-sbu;</seg>
-        <seg>&gperf-ch6-du;</seg>
+        <seg>&gperf-fin-sbu;</seg>
+        <seg>&gperf-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/grep.xml b/chapter08/grep.xml
index 44707152c..ef6357281 100644
--- a/chapter08/grep.xml
+++ b/chapter08/grep.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&grep-ch6-sbu;</seg>
-        <seg>&grep-ch6-du;</seg>
+        <seg>&grep-fin-sbu;</seg>
+        <seg>&grep-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/groff.xml b/chapter08/groff.xml
index aad0cbf85..032130217 100644
--- a/chapter08/groff.xml
+++ b/chapter08/groff.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&groff-ch6-sbu;</seg>
-        <seg>&groff-ch6-du;</seg>
+        <seg>&groff-fin-sbu;</seg>
+        <seg>&groff-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 25a61077b..51726e87f 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&grub-ch6-sbu;</seg>
-        <seg>&grub-ch6-du;</seg>
+        <seg>&grub-fin-sbu;</seg>
+        <seg>&grub-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/gzip.xml b/chapter08/gzip.xml
index 09eebbdf7..3d7783316 100644
--- a/chapter08/gzip.xml
+++ b/chapter08/gzip.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&gzip-ch6-sbu;</seg>
-        <seg>&gzip-ch6-du;</seg>
+        <seg>&gzip-fin-sbu;</seg>
+        <seg>&gzip-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/iana-etc.xml b/chapter08/iana-etc.xml
index 42ab25c34..65530f9d8 100644
--- a/chapter08/iana-etc.xml
+++ b/chapter08/iana-etc.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&iana-etc-ch6-sbu;</seg>
-        <seg>&iana-etc-ch6-du;</seg>
+        <seg>&iana-etc-fin-sbu;</seg>
+        <seg>&iana-etc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/inetutils.xml b/chapter08/inetutils.xml
index c8fdd456f..bbdc54955 100644
--- a/chapter08/inetutils.xml
+++ b/chapter08/inetutils.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&inetutils-ch6-sbu;</seg>
-        <seg>&inetutils-ch6-du;</seg>
+        <seg>&inetutils-fin-sbu;</seg>
+        <seg>&inetutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/intltool.xml b/chapter08/intltool.xml
index 9e9ebad20..f402fec67 100644
--- a/chapter08/intltool.xml
+++ b/chapter08/intltool.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&intltool-ch6-sbu;</seg>
-        <seg>&intltool-ch6-du;</seg>
+        <seg>&intltool-fin-sbu;</seg>
+        <seg>&intltool-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index 8b868df65..64682a918 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&iproute2-ch6-sbu;</seg>
-        <seg>&iproute2-ch6-du;</seg>
+        <seg>&iproute2-fin-sbu;</seg>
+        <seg>&iproute2-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml
index 2f9cfd3f1..7d85e4db5 100644
--- a/chapter08/kbd.xml
+++ b/chapter08/kbd.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&kbd-ch6-sbu;</seg>
-        <seg>&kbd-ch6-du;</seg>
+        <seg>&kbd-fin-sbu;</seg>
+        <seg>&kbd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml
index 6cc3eb168..b1fe24911 100644
--- a/chapter08/kmod.xml
+++ b/chapter08/kmod.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&kmod-ch6-sbu;</seg>
-        <seg>&kmod-ch6-du;</seg>
+        <seg>&kmod-fin-sbu;</seg>
+        <seg>&kmod-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/less.xml b/chapter08/less.xml
index 087b2e6a3..237cf1e15 100644
--- a/chapter08/less.xml
+++ b/chapter08/less.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&less-ch6-sbu;</seg>
-        <seg>&less-ch6-du;</seg>
+        <seg>&less-fin-sbu;</seg>
+        <seg>&less-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml
index 8126dfaae..c2c59831c 100644
--- a/chapter08/libcap.xml
+++ b/chapter08/libcap.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libcap-ch6-sbu;</seg>
-        <seg>&libcap-ch6-du;</seg>
+        <seg>&libcap-fin-sbu;</seg>
+        <seg>&libcap-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index b559e6aa2..2ecf7fc58 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&elfutils-ch6-sbu;</seg>
-        <seg>&elfutils-ch6-du;</seg>
+        <seg>&elfutils-fin-sbu;</seg>
+        <seg>&elfutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index 6a6f8a458..825b09a57 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libffi-ch6-sbu;</seg>
-        <seg>&libffi-ch6-du;</seg>
+        <seg>&libffi-fin-sbu;</seg>
+        <seg>&libffi-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml
index eb5a19438..5d275d381 100644
--- a/chapter08/libpipeline.xml
+++ b/chapter08/libpipeline.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libpipeline-ch6-sbu;</seg>
-        <seg>&libpipeline-ch6-du;</seg>
+        <seg>&libpipeline-fin-sbu;</seg>
+        <seg>&libpipeline-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml
index 3093b4164..affeaca95 100644
--- a/chapter08/libtool.xml
+++ b/chapter08/libtool.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libtool-ch6-sbu;</seg>
-        <seg>&libtool-ch6-du;</seg>
+        <seg>&libtool-fin-sbu;</seg>
+        <seg>&libtool-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/m4.xml b/chapter08/m4.xml
index 7fe282ee7..a5911b576 100644
--- a/chapter08/m4.xml
+++ b/chapter08/m4.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&m4-ch6-sbu;</seg>
-        <seg>&m4-ch6-du;</seg>
+        <seg>&m4-fin-sbu;</seg>
+        <seg>&m4-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/make.xml b/chapter08/make.xml
index 561bdd812..887950b4b 100644
--- a/chapter08/make.xml
+++ b/chapter08/make.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&make-ch6-sbu;</seg>
-        <seg>&make-ch6-du;</seg>
+        <seg>&make-fin-sbu;</seg>
+        <seg>&make-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml
index f2f46b891..dd8b6f970 100644
--- a/chapter08/man-db.xml
+++ b/chapter08/man-db.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&man-db-ch6-sbu;</seg>
-        <seg>&man-db-ch6-du;</seg>
+        <seg>&man-db-fin-sbu;</seg>
+        <seg>&man-db-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/man-pages.xml b/chapter08/man-pages.xml
index 3d2c52046..1fe3f4287 100644
--- a/chapter08/man-pages.xml
+++ b/chapter08/man-pages.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&man-pages-ch6-sbu;</seg>
-        <seg>&man-pages-ch6-du;</seg>
+        <seg>&man-pages-fin-sbu;</seg>
+        <seg>&man-pages-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index 0b49c5441..1060fa2d4 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -30,8 +30,8 @@
       <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
       <seglistitem>
-        <seg>&meson-ch6-sbu;</seg>
-        <seg>&meson-ch6-du;</seg>
+        <seg>&meson-fin-sbu;</seg>
+        <seg>&meson-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/mpc.xml b/chapter08/mpc.xml
index 2d518c8c1..ad46b7e43 100644
--- a/chapter08/mpc.xml
+++ b/chapter08/mpc.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&mpc-ch6-sbu;</seg>
-        <seg>&mpc-ch6-du;</seg>
+        <seg>&mpc-fin-sbu;</seg>
+        <seg>&mpc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/mpfr.xml b/chapter08/mpfr.xml
index ff8e323b7..f2344facb 100644
--- a/chapter08/mpfr.xml
+++ b/chapter08/mpfr.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&mpfr-ch6-sbu;</seg>
-        <seg>&mpfr-ch6-du;</seg>
+        <seg>&mpfr-fin-sbu;</seg>
+        <seg>&mpfr-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index b37f1f69c..d0036c7de 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&ncurses-ch6-sbu;</seg>
-        <seg>&ncurses-ch6-du;</seg>
+        <seg>&ncurses-fin-sbu;</seg>
+        <seg>&ncurses-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml
index e998c64fb..15d45cacf 100644
--- a/chapter08/ninja.xml
+++ b/chapter08/ninja.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&ninja-ch6-sbu;</seg>
-        <seg>&ninja-ch6-du;</seg>
+        <seg>&ninja-fin-sbu;</seg>
+        <seg>&ninja-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index f2ff1fa80..c620ae629 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&openssl-ch6-sbu;</seg>
-        <seg>&openssl-ch6-du;</seg>
+        <seg>&openssl-fin-sbu;</seg>
+        <seg>&openssl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/patch.xml b/chapter08/patch.xml
index 6c6c6852b..174aa9192 100644
--- a/chapter08/patch.xml
+++ b/chapter08/patch.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&patch-ch6-sbu;</seg>
-        <seg>&patch-ch6-du;</seg>
+        <seg>&patch-fin-sbu;</seg>
+        <seg>&patch-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index 284464d87..1841b819e 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&perl-ch6-sbu;</seg>
-        <seg>&perl-ch6-du;</seg>
+        <seg>&perl-fin-sbu;</seg>
+        <seg>&perl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/pkgconfig.xml b/chapter08/pkgconfig.xml
index 3c311e389..aa39b72e0 100644
--- a/chapter08/pkgconfig.xml
+++ b/chapter08/pkgconfig.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&pkgconfig-ch6-sbu;</seg>
-        <seg>&pkgconfig-ch6-du;</seg>
+        <seg>&pkgconfig-fin-sbu;</seg>
+        <seg>&pkgconfig-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/procps.xml b/chapter08/procps.xml
index 59bf0864c..a7080f247 100644
--- a/chapter08/procps.xml
+++ b/chapter08/procps.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&procps-ng-ch6-sbu;</seg>
-        <seg>&procps-ng-ch6-du;</seg>
+        <seg>&procps-ng-fin-sbu;</seg>
+        <seg>&procps-ng-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/psmisc.xml b/chapter08/psmisc.xml
index b01303131..febf90748 100644
--- a/chapter08/psmisc.xml
+++ b/chapter08/psmisc.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&psmisc-ch6-sbu;</seg>
-        <seg>&psmisc-ch6-du;</seg>
+        <seg>&psmisc-fin-sbu;</seg>
+        <seg>&psmisc-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/python.xml b/chapter08/python.xml
index cc440903d..54b0eeab3 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&python-ch6-sbu;</seg>
-        <seg>&python-ch6-du;</seg>
+        <seg>&python-fin-sbu;</seg>
+        <seg>&python-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/readline.xml b/chapter08/readline.xml
index 87571ea9d..c59cdcf97 100644
--- a/chapter08/readline.xml
+++ b/chapter08/readline.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&readline-ch6-sbu;</seg>
-        <seg>&readline-ch6-du;</seg>
+        <seg>&readline-fin-sbu;</seg>
+        <seg>&readline-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/sed.xml b/chapter08/sed.xml
index 030e77a0b..77d30479b 100644
--- a/chapter08/sed.xml
+++ b/chapter08/sed.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&sed-ch6-sbu;</seg>
-        <seg>&sed-ch6-du;</seg>
+        <seg>&sed-fin-sbu;</seg>
+        <seg>&sed-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml
index 425112cbd..49d2789dc 100644
--- a/chapter08/shadow.xml
+++ b/chapter08/shadow.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&shadow-ch6-sbu;</seg>
-        <seg>&shadow-ch6-du;</seg>
+        <seg>&shadow-fin-sbu;</seg>
+        <seg>&shadow-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/sysklogd.xml b/chapter08/sysklogd.xml
index e96980cb4..26f57020b 100644
--- a/chapter08/sysklogd.xml
+++ b/chapter08/sysklogd.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&sysklogd-ch6-sbu;</seg>
-        <seg>&sysklogd-ch6-du;</seg>
+        <seg>&sysklogd-fin-sbu;</seg>
+        <seg>&sysklogd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 2cf2d1d1b..319f107a1 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&systemd-ch6-sbu;</seg>
-        <seg>&systemd-ch6-du;</seg>
+        <seg>&systemd-fin-sbu;</seg>
+        <seg>&systemd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
   </sect2>
diff --git a/chapter08/sysvinit.xml b/chapter08/sysvinit.xml
index 0c171acf5..4a68cc37b 100644
--- a/chapter08/sysvinit.xml
+++ b/chapter08/sysvinit.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&sysvinit-ch6-sbu;</seg>
-        <seg>&sysvinit-ch6-du;</seg>
+        <seg>&sysvinit-fin-sbu;</seg>
+        <seg>&sysvinit-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/tar.xml b/chapter08/tar.xml
index 56883628c..0af1216ee 100644
--- a/chapter08/tar.xml
+++ b/chapter08/tar.xml
@@ -33,8 +33,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&tar-ch6-sbu;</seg>
-        <seg>&tar-ch6-du;</seg>
+        <seg>&tar-fin-sbu;</seg>
+        <seg>&tar-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml
index d61df477b..2f428bf47 100644
--- a/chapter08/texinfo.xml
+++ b/chapter08/texinfo.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&texinfo-ch6-sbu;</seg>
-        <seg>&texinfo-ch6-du;</seg>
+        <seg>&texinfo-fin-sbu;</seg>
+        <seg>&texinfo-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 519c3b171..b2b6f2c0e 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&util-linux-ch6-sbu;</seg>
-        <seg>&util-linux-ch6-du;</seg>
+        <seg>&util-linux-fin-sbu;</seg>
+        <seg>&util-linux-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/vim.xml b/chapter08/vim.xml
index 263122bd7..4ec0d1a3b 100644
--- a/chapter08/vim.xml
+++ b/chapter08/vim.xml
@@ -30,8 +30,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&vim-ch6-sbu;</seg>
-        <seg>&vim-ch6-du;</seg>
+        <seg>&vim-fin-sbu;</seg>
+        <seg>&vim-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/xml-parser.xml b/chapter08/xml-parser.xml
index 54d5bcb35..62053d566 100644
--- a/chapter08/xml-parser.xml
+++ b/chapter08/xml-parser.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&xml-parser-ch6-sbu;</seg>
-        <seg>&xml-parser-ch6-du;</seg>
+        <seg>&xml-parser-fin-sbu;</seg>
+        <seg>&xml-parser-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/xz.xml b/chapter08/xz.xml
index 5a342b2ff..b8a9f9206 100644
--- a/chapter08/xz.xml
+++ b/chapter08/xz.xml
@@ -34,8 +34,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&xz-ch6-sbu;</seg>
-        <seg>&xz-ch6-du;</seg>
+        <seg>&xz-fin-sbu;</seg>
+        <seg>&xz-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/zlib.xml b/chapter08/zlib.xml
index 2dcc49413..90c343ca5 100644
--- a/chapter08/zlib.xml
+++ b/chapter08/zlib.xml
@@ -31,8 +31,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&zlib-ch6-sbu;</seg>
-        <seg>&zlib-ch6-du;</seg>
+        <seg>&zlib-fin-sbu;</seg>
+        <seg>&zlib-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml
index 71e7794b6..9ed863659 100644
--- a/chapter08/zstd.xml
+++ b/chapter08/zstd.xml
@@ -32,8 +32,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&zstd-ch6-sbu;</seg>
-        <seg>&zstd-ch6-du;</seg>
+        <seg>&zstd-fin-sbu;</seg>
+        <seg>&zstd-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
 
-- 
cgit v1.2.3-54-g00ecf