Changeset 1b5c73b for final-system

Timestamp:

May 16, 2006, 12:59:30 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

541137b

Parents:

3b0729a

Message:

r3528@server (orig r1610): chris | 2006-05-15 23:48:18 -0700
Reordered final-system build to make it more alphabetical

Location:

final-system

Files:

• alpha-chapter.xml (modified) (2 diffs)
• mips-chapter.xml (modified) (2 diffs)
• mips64-64-chapter.xml (modified) (2 diffs)
• mips64-chapter.xml (modified) (2 diffs)
• ppc-chapter.xml (modified) (2 diffs)
• ppc64-chapter.xml (modified) (2 diffs)
• sparc-chapter.xml (modified) (2 diffs)
• sparc64-64-chapter.xml (modified) (2 diffs)
• sparc64-chapter.xml (modified) (2 diffs)
• x86-chapter.xml (modified) (2 diffs)
• x86_64-64-chapter.xml (modified) (2 diffs)
• x86_64-chapter.xml (modified) (2 diffs)

final-system/alpha-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>

final-system/mips-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/dvhtool.xml"/>

final-system/mips64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>

final-system/mips64-chapter.xml

@@ -24 +24 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
@@ -87 +85 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>

final-system/ppc-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/parted.xml"/>

final-system/ppc64-chapter.xml

@@ -23 +23 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
@@ -75 +73 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/parted.xml"/>

final-system/sparc-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>

final-system/sparc64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>

final-system/sparc64-chapter.xml

@@ -23 +23 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
@@ -75 +73 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>

final-system/x86-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>

final-system/x86_64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
@@ -63 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>

final-system/x86_64-chapter.xml

@@ -23 +23 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
@@ -75 +73 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>