Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ general/prog/gcc.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -164,6 +164,6 @@
         url="http://gcc.gnu.org/ml/gcc-testresults/"/>. You may also want to
         refer to the information found in the <application>GCC</application>
-        section of Chapter 6 in the LFS book (<ulink
-        url="&lfs-root;/chapter06/gcc.html"/>).
+        section of Chapter 8 in the LFS book (<ulink
+        url="&lfs-root;/chapter08/gcc.html"/>).
       </para>
     </important>
@@ -343,5 +343,5 @@
       Some program and library names and descriptions are not listed here,
       but can be found at
-      <ulink url="&lfs-root;/chapter06/gcc.html#contents-gcc"/> as they were
+      <ulink url="&lfs-root;/chapter08/gcc.html#contents-gcc"/> as they were
       initially installed during the building of LFS.
     </para>
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ general/sysutils/dbus.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -689,5 +689,5 @@
         A list of the installed files, along with their short
         descriptions can be found at
-        <ulink url="&lfs-rootd;/chapter06/dbus.html#contents-dbus"/>.
+        <ulink url="&lfs-rootd;/chapter08/dbus.html#contents-dbus"/>.
       </para>
 
Index: general/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ general/sysutils/lsb-tools.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -100,9 +100,9 @@
       <para>
         The configuration for this package was done in <phrase revision="sysv">
-        <ulink url="&lfs-website;/lfs/view/stable/chapter09/theend.html">LFS</ulink>.</phrase>
+        <ulink url="&lfs-website;/lfs/view/stable/chapter11/theend.html">LFS</ulink>.</phrase>
         <phrase revision="systemd">
-        <ulink url="&lfs-website;/lfs/view/systemd/chapter09/theend.html">LFS</ulink>
+        <ulink url="&lfs-website;/lfs/view/systemd/chapter11/theend.html">LFS</ulink>
         and
-        <ulink url="&lfs-website;/lfs/view/systemd/chapter06/systemd.html">Systemd</ulink>.</phrase>
+        <ulink url="&lfs-website;/lfs/view/systemd/chapter08/systemd.html">Systemd</ulink>.</phrase>
         The file <filename>/etc/lsb-release</filename> should already exist.
         Be sure that the DISTRIB_CODENAME entry has been set properly.
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ general/sysutils/systemd.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -371,5 +371,5 @@
         A list of the installed files, along with their short
         descriptions can be found at
-        <ulink url="&lfs-root;/chapter06/systemd.html#contents-systemd"/>.
+        <ulink url="&lfs-root;/chapter08/systemd.html#contents-systemd"/>.
       </para>
 
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ introduction/important/bootscripts.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -28,5 +28,5 @@
   using the BLFS Bootscripts package in conjunction with a compatible
   LFS-Bootscripts package. Refer to
-  <ulink url="&lfs-root;/chapter07/bootscripts.html"/> for more
+  <ulink url="&lfs-root;/chapter09/bootscripts.html"/> for more
   information on the LFS-Bootscripts package.</para>
 
Index: introduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ introduction/important/locale-issues.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -257,5 +257,5 @@
     <para>LFS expects that manual pages are in the language-specific (usually
     8-bit) encoding, as specified on the <ulink
-    url="&lfs-root;/chapter06/man-db.html">LFS Man DB page</ulink>. However,
+    url="&lfs-root;/chapter08/man-db.html">LFS Man DB page</ulink>. However,
     some packages install translated manual pages in UTF-8 encoding (e.g.,
     Shadow, already dealt with), or manual pages in languages not in the table.
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ networking/netprogs/wpa_supplicant.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -554,5 +554,5 @@
       <para revision="systemd">
         To assign a network address to your wireless interface, consult the
-        <ulink url="&lfs-root;/chapter07/network.html">General Network Configuration</ulink>
+        <ulink url="&lfs-root;/chapter09/network.html">General Network Configuration</ulink>
         page in LFS.
       </para>
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ postlfs/config/bootdisk.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -84,6 +84,6 @@
       The instructions for using GRUB2 to make a custom rescue CD-ROM are
       also available in <ulink
-      url='http://www.&lfs-domainname;/lfs/view/stable/chapter08/grub.html'>LFS
-      Chapter 8</ulink>.
+      url='http://www.&lfs-domainname;/lfs/view/stable/chapter10/grub.html'>LFS
+      Chapter 10</ulink>.
     </para>
 
Index: postlfs/config/console-fonts.xml
===================================================================
--- postlfs/config/console-fonts.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ postlfs/config/console-fonts.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -52,9 +52,9 @@
       'video=' parameter between the 'root=/dev/sdXn' and 'ro', for example
       <literal>root=/dev/sda2 video=1024x768 ro</literal> based on the
-      example in LFS section 8.4.4 :
+      example in LFS section 10.4.4 :
       <phrase revision="sysv">
-      <ulink url="&lfs-root;/chapter08/grub.html"/></phrase>
+      <ulink url="&lfs-root;/chapter10/grub.html"/></phrase>
       <phrase revision="systemd">
-      <ulink url="&lfs-rootd;/chapter08/grub.html"/></phrase>.
+      <ulink url="&lfs-rootd;/chapter10/grub.html"/></phrase>.
     </para>
 
@@ -156,10 +156,10 @@
       <phrase revision="sysv">
       <filename>/etc/sysconfig/console</filename> as described in
-      LFS section 7.6.5
-      <ulink url="&lfs-root;/chapter07/usage.html"/>.</phrase>
+      LFS section 9.6.5
+      <ulink url="&lfs-root;/chapter09/usage.html"/>.</phrase>
       <phrase revision="systemd">
       <filename>/etc/vconsole.conf</filename> as described in
-      LFS section 7.6
-      <ulink url="&lfs-rootd;/chapter07/console.html"/>.</phrase>.
+      LFS section 9.6
+      <ulink url="&lfs-rootd;/chapter09/console.html"/>.</phrase>.
     </para>
 
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ postlfs/config/profile.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -428,5 +428,5 @@
         native language support. A full discussion on determining this
         variable can be found on the <ulink
-        url="&lfs-root;/chapter07/profile.html">LFS Bash Shell
+        url="&lfs-root;/chapter09/profile.html">LFS Bash Shell
         Startup Files</ulink> page.
       </para>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ postlfs/editors/vim.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -364,5 +364,5 @@
       A list of the reinstalled files, along with their short
       descriptions can be found in the <ulink
-      url="&lfs-root;/chapter06/vim.html#contents-vim">LFS Vim Installation
+      url="&lfs-root;/chapter08/vim.html#contents-vim">LFS Vim Installation
       Instructions</ulink>
     </para>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 170e30838136947a4c08cccb8b2afdb5dc51064b)
+++ postlfs/security/shadow.xml	(revision f0dc9578a42242ccd0b008e6205bf89813e570ae)
@@ -558,7 +558,7 @@
       found at
       <phrase revision="sysv">
-      <ulink url="&lfs-root;/chapter06/shadow.html#contents-shadow"/></phrase>
+      <ulink url="&lfs-root;/chapter08/shadow.html#contents-shadow"/></phrase>
       <phrase revision="systemd">
-      <ulink url="&lfs-rootd;/chapter06/shadow.html#contents-shadow"/></phrase>.
+      <ulink url="&lfs-rootd;/chapter08/shadow.html#contents-shadow"/></phrase>.
     </para>
 
