Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision be1c36358cbdea1dc5e035abeb9576e22c5c756e)
+++ BOOK/appendices/dependencies/common.xml	(revision ee7cd32ebe6d4c10b7f2dfbde20afeb9da82fa9d)
@@ -39,21 +39,21 @@
         <seglistitem>
          <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Coreutils, Gettext, Libcap, Sed, and Systemd</seg>
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Coreutils, Gettext, Libcap, Sed, Systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -67,21 +67,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>ACL, Coretutils, Gettext, Libcap, Sed, and Systemd</seg>
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>ACL, Coretutils, Gettext, Libcap, Sed, Systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -180,5 +180,5 @@
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC, Grep, Make,
-          and Readline</seg>
+         , Readline</seg>
         </seglistitem>
       </segmentedlist>
@@ -208,13 +208,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, File, Gawk, GCC,
-         Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU and Expect</seg>
+         Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>DejaGNU, Expect</seg>
         </seglistitem>
       </segmentedlist>
@@ -317,5 +317,5 @@
 
         <seglistitem>
-         <seg>GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -345,5 +345,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         GMP, ISL, Make, MPC, MPFR, Sed and Texinfo</seg>
+         GMP, ISL, Make, MPC, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -373,5 +373,5 @@
         <seglistitem>
          <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP,
-         Grep, Libcap, Make, Patch, Perl, Sed and Texinfo</seg>
+         Grep, Libcap, Make, Patch, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -401,5 +401,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
-         Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo</seg>
+         Gettext, Grep, Make, Man, Pkg-config, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -428,5 +428,5 @@
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -483,5 +483,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
+         Make, Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -511,5 +511,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Make, Perl, Sed and Texinfo</seg>
+         Grep, Gzip, Make, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -539,5 +539,5 @@
         <seglistitem>
          <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -567,21 +567,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus and XML::Parser</seg>
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>D-Bus, XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
@@ -595,5 +595,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep, Make,
-         Patch, Sed and Tcl</seg>
+         Patch, Sed, Tcl</seg>
         </seglistitem>
       </segmentedlist>
@@ -623,13 +623,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Pkg-config-lite, Sed, Texinfo and Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bzip2 and Diffutils</seg>
+         Make, Pkg-config-lite, Sed, Texinfo, Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Bzip2, Diffutils</seg>
         </seglistitem>
       </segmentedlist>
@@ -651,5 +651,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed and Zlib</seg>
+         Make, Sed, Zlib</seg>
         </seglistitem>
       </segmentedlist>
@@ -679,13 +679,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU, Diffutils and Expect</seg>
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>DejaGNU, Diffutils, Expect</seg>
         </seglistitem>
       </segmentedlist>
@@ -707,21 +707,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>IPRoute2, Kbd and Man</seg>
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Bison, Diffutils, Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>IPRoute2, Kbd, Man</seg>
         </seglistitem>
       </segmentedlist>
@@ -734,5 +734,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -763,13 +763,13 @@
          <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, Glibc,
          Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
-         Tar and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Check, DejaGNU, and Expect</seg>
+         Tar, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Check, DejaGNU, Expect</seg>
         </seglistitem>
       </segmentedlist>
@@ -790,5 +790,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -818,13 +818,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Tar and Tcl</seg>
+         GCC, Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Tar, Tcl</seg>
         </seglistitem>
       </segmentedlist>
@@ -873,5 +873,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -901,5 +901,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed and Texinfo</seg>
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -929,13 +929,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gawk</seg>
+         Make, Patch, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
@@ -957,21 +957,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Perl
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man and Perl</seg>
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Man, Perl</seg>
         </seglistitem>
       </segmentedlist>
@@ -985,5 +985,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1012,5 +1012,5 @@
 
         <seglistitem>
-         <seg>Coreutils, Gawk and Make</seg>
+         <seg>Coreutils, Gawk, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1039,5 +1039,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed and XML::Parser</seg>
+         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed, XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
@@ -1094,5 +1094,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap and Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1122,5 +1122,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         GMP, Make, MPC, MPFR, Sed and Texinfo</seg>
+         GMP, Make, MPC, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1149,6 +1149,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gzip, Make, and
-         Check</seg>
+         <seg>Bash, Binutils, Check, Coreutils, Glibc, Gawk, GCC, Gzip, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1178,5 +1177,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Glibc, Flex, Gawk, GCC,
-         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils, and Zlib.
+         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils, Zlib.
          </seg>
         </seglistitem>
@@ -1207,5 +1206,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Ncurses and Sed</seg>
+         Ncurses, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1234,5 +1233,5 @@
 
         <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep and Make</seg>
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1262,5 +1261,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Make, Sed, and Texinfo</seg>
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1290,5 +1289,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
+         GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1317,5 +1316,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl and Sed</seg>
+         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1345,5 +1344,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, GCC, Grep,
-         Gzip, Make, KMOD, Ncurses, Perl and Sed</seg>
+         Gzip, Make, KMOD, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1373,5 +1372,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed
-         and Texinfo</seg>
+        , Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1389,5 +1388,5 @@
 
         <seglistitem>
-          <seg>Autoconf and Bison</seg>
+          <seg>Autoconf, Bison</seg>
         </seglistitem>
       </segmentedlist>
@@ -1401,13 +1400,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Perl and Procps-ng</seg>
+         Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Perl, Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
@@ -1429,5 +1428,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC,
-         Grep, Groff, Gzip, Less, XZ Utils, Make and Sed</seg>
+         Grep, Groff, Gzip, Less, XZ Utils, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1456,5 +1455,5 @@
 
         <seglistitem>
-         <seg>Bash, Coreutils, and Make</seg>
+         <seg>Bash, Coreutils, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1484,5 +1483,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, MPFR, Sed and Texinfo</seg>
+         Make, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1512,5 +1511,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, Sed and Texinfo</seg>
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1540,5 +1539,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1557,5 +1556,5 @@
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
-          Util-linux and Vim</seg>
+          Util-linux, Vim</seg>
         </seglistitem>
       </segmentedlist>
@@ -1568,5 +1567,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1596,13 +1595,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip, Iana-Etc and Procps-ng, Tar</seg>
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Gzip, Iana-Etc, Procps-ng, Tar</seg>
         </seglistitem>
       </segmentedlist>
@@ -1624,5 +1623,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1651,5 +1650,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1679,5 +1678,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses
-         and Sed</seg>
+        , Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1707,5 +1706,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
-         Patch, Sed and Texinfo</seg>
+         Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1735,21 +1734,21 @@
         <seglistitem>
          <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, File, Libtool and Shadow</seg>
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>E2fsprogs, File, Libtool, Shadow</seg>
         </seglistitem>
       </segmentedlist>
@@ -1763,5 +1762,5 @@
         <seglistitem>
          <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
-         Findutils, Gawk, GCC, Gettext, Grep, Make and Sed</seg>
+         Findutils, Gawk, GCC, Gettext, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1792,5 +1791,5 @@
          <seg>ACL, Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, Glibc,
          Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
-         Pkg-config, Sed, Util-linux and XML::Parser</seg>
+         Pkg-config, Sed, Util-linux, XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
@@ -1820,13 +1819,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC,
-         Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk and Gzip</seg>
+         Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Findutils, Gawk, Gzip</seg>
         </seglistitem>
       </segmentedlist>
@@ -1848,5 +1847,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make and Sed</seg>
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1876,13 +1875,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make,
-         Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gzip</seg>
+         Ncurses, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gzip</seg>
         </seglistitem>
       </segmentedlist>
@@ -1904,5 +1903,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Ncurses, Pkg-config-lite, Sed, Texinfo and Zlib</seg>
+         Make, Ncurses, Pkg-config-lite, Sed, Texinfo, Zlib</seg>
         </seglistitem>
       </segmentedlist>
@@ -1932,5 +1931,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
+         Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1959,5 +1958,5 @@
 
         <seglistitem>
-         <seg>Coreutils, Expat, Make and Perl</seg>
+         <seg>Coreutils, Expat, Make, Perl</seg>
         </seglistitem>
       </segmentedlist>
@@ -1987,5 +1986,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Grep, Make and Sed</seg>
+         Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -2014,21 +2013,21 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>File, KMOD and Util-linux</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>File, KMOD, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/mips.xml
===================================================================
--- BOOK/appendices/dependencies/mips.xml	(revision be1c36358cbdea1dc5e035abeb9576e22c5c756e)
+++ BOOK/appendices/dependencies/mips.xml	(revision ee7cd32ebe6d4c10b7f2dfbde20afeb9da82fa9d)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Dvhtool, GCC, Make and Sed</seg>
+         <seg>Binutils, Coreutils, Dvhtool, GCC, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -48,5 +48,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Gzip and Make</seg>
+         <seg>Binutils, Coreutils, GCC, Gzip, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -75,5 +75,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC and Make</seg>
+         <seg>Binutils, Coreutils, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/ppc.xml
===================================================================
--- BOOK/appendices/dependencies/ppc.xml	(revision be1c36358cbdea1dc5e035abeb9576e22c5c756e)
+++ BOOK/appendices/dependencies/ppc.xml	(revision ee7cd32ebe6d4c10b7f2dfbde20afeb9da82fa9d)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC and Make</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -48,5 +48,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses and
+         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses,
          Readline</seg>
         </seglistitem>
@@ -76,5 +76,5 @@
 
         <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
+         <seg>Binutils, GCC, Make, Patch</seg>
         </seglistitem>
       </segmentedlist>
@@ -103,5 +103,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch and Sed</seg>
+         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch, Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/sparc.xml
===================================================================
--- BOOK/appendices/dependencies/sparc.xml	(revision be1c36358cbdea1dc5e035abeb9576e22c5c756e)
+++ BOOK/appendices/dependencies/sparc.xml	(revision ee7cd32ebe6d4c10b7f2dfbde20afeb9da82fa9d)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
+         <seg>Binutils, GCC, Make, Patch</seg>
         </seglistitem>
       </segmentedlist>
@@ -49,5 +49,5 @@
         <seglistitem>
          <seg>Binutils, Coreutils, Glibc, Elftoaout, Gawk, GCC, Grep, Gzip,
-         Make, Patch and Sed</seg>
+         Make, Patch, Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision be1c36358cbdea1dc5e035abeb9576e22c5c756e)
+++ BOOK/appendices/dependencies/x86.xml	(revision ee7cd32ebe6d4c10b7f2dfbde20afeb9da82fa9d)
@@ -22,5 +22,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Bison Coreutils, Diffutils, Glibc, Gawk, GCC, Gettext,
-         Grep, Make, Ncurses, Sed and Texinfo</seg>
+         Grep, Make, Ncurses, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
