Index: chapter08/fstab.xml
===================================================================
--- chapter08/fstab.xml	(revision 9ec44363661ebcb1892a5fc78d49e09d59f037fe)
+++ chapter08/fstab.xml	(revision 6c558c4080ff7700b6f0ff1155297c3e8b034592)
@@ -105,5 +105,5 @@
   <filename>/etc/fstab</filename>.  To check if the disk drive supports
   this option, run
-  <ulink url="http://www.linuxfromscratch.org/blfs/view/cvs/general/hdparm.html">hdparm</ulink>
+  <ulink url="&blfs-root;view/&short-version;/general/hdparm.html">hdparm</ulink>
   on the applicable disk drive.  For example, if:</para>
 
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 9ec44363661ebcb1892a5fc78d49e09d59f037fe)
+++ chapter08/grub.xml	(revision 6c558c4080ff7700b6f0ff1155297c3e8b034592)
@@ -32,5 +32,5 @@
     below to work, you need to jump ahead to BLFS and install
     <userinput>xorriso</userinput> from the <ulink
-    url="http://www.linuxfromscratch.org/blfs/view/&short-version;/multimedia/libisoburn.html">
+    url="&blfs-root;view/&short-version;/multimedia/libisoburn.html">
     libisoburn</ulink> package.</para>
 
Index: chapter09/reboot.xml
===================================================================
--- chapter09/reboot.xml	(revision 9ec44363661ebcb1892a5fc78d49e09d59f037fe)
+++ chapter09/reboot.xml	(revision 6c558c4080ff7700b6f0ff1155297c3e8b034592)
@@ -22,10 +22,10 @@
 
     <listitem><para>A text mode browser such as <ulink
-    url='&blfs-root;/view/&short-version;/basicnet/lynx.html'>Lynx</ulink>
+    url='&blfs-root;view/&short-version;/basicnet/lynx.html'>Lynx</ulink>
     will allow you to easily view the BLFS book in one virtual terminal, while
     building packages in another.</para></listitem>
 
     <listitem><para>The <ulink
-    url='&blfs-root;/view/&short-version;/general/gpm.html'>GPM</ulink> package will allow
+    url='&blfs-root;view/&short-version;/general/gpm.html'>GPM</ulink> package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
@@ -33,11 +33,11 @@
     <listitem><para>If you are in a situation where static IP configuration
     does not meet your networking requirements, installing a package
-    such as <ulink url='&blfs-root;/view/&short-version;/basicnet/dhcpcd.html'>dhcpcd</ulink>
+    such as <ulink url='&blfs-root;view/&short-version;/basicnet/dhcpcd.html'>dhcpcd</ulink>
     or the client portion of <ulink
-    url='&blfs-root;/view/&short-version;/basicnet/dhcp.html'>dhcp</ulink> may be
+    url='&blfs-root;view/&short-version;/basicnet/dhcp.html'>dhcp</ulink> may be
     useful.</para></listitem>
 
     <listitem><para>Installing <ulink
-    url='&blfs-root;/view/&short-version;/postlfs/sudo.html'>sudo</ulink> may be useful for
+    url='&blfs-root;view/&short-version;/postlfs/sudo.html'>sudo</ulink> may be useful for
     building packages as a non-root user and easily installing the resulting
     packages in your new system.  </para></listitem>
@@ -45,17 +45,17 @@
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink
-    url='&blfs-root;/view/&short-version;/postlfs/openssh.html'>openssh</ulink> and its
+    url='&blfs-root;view/&short-version;/postlfs/openssh.html'>openssh</ulink> and its
     prerequsite, <ulink
-    url='&blfs-root;/view/&short-version;/postlfs/openssl.html'>openssl</ulink>.
+    url='&blfs-root;view/&short-version;/postlfs/openssl.html'>openssl</ulink>.
     </para></listitem>
 
     <listitem><para>To make fetching files over the internet easier, install
-    <ulink url='&blfs-root;/view/&short-version;/basicnet/wget.html'>wget</ulink>.
+    <ulink url='&blfs-root;view/&short-version;/basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
     <listitem><para>If one or more of your disk drives have a GUID partition
     table (GPT), either <ulink
-    url='&blfs-root;/view/&short-version;/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
-    url='&blfs-root;/view/&short-version;/postlfs/parted.html'>parted</ulink> will be useful.
+    url='&blfs-root;view/&short-version;/postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
+    url='&blfs-root;view/&short-version;/postlfs/parted.html'>parted</ulink> will be useful.
     </para></listitem>
 
