Use an entity for BLFS URL's.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10818 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

14 files changed, 27 insertions, 26 deletions

diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index 6d291c9e8..33f351930 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -59,10 +59,10 @@
 
   <note><para>For experienced users, other partitioning schemes are possible.
   The new LFS system can be on a software <ulink
-  url="&blfs-root;view/&short-version;/postlfs/raid.html">RAID</ulink> array or an <ulink
-  url="&blfs-root;view/&short-version;/postlfs/aboutlvm.html">LVM</ulink> logical volume.
+  url="&blfs-book;postlfs/raid.html">RAID</ulink> array or an <ulink
+  url="&blfs-book;postlfs/aboutlvm.html">LVM</ulink> logical volume.
   However, some of these options require an <ulink
-  url="&blfs-root;view/&short-version;/postlfs/initramfs.html">initramfs</ulink>, which is
+  url="&blfs-book;postlfs/initramfs.html">initramfs</ulink>, which is
   an advanced topic.  These partitioning methodologies are not recommended for
   first time LFS users.</para></note>
 
diff --git a/chapter06/db.xml b/chapter06/db.xml
index e3c185362..ab737dd79 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -42,7 +42,7 @@
       <para>There are instructions to build this package in the BLFS book if you
       need to build the RPC server or additional language bindings. The
       additional language bindings will require additional packages to be
-      installed. See <ulink url="&blfs-root;view/&short-version;/server/databases.html#db"/>
+      installed. See <ulink url="&blfs-book;server/databases.html#db"/>
       for suggested installation instructions.</para>
 
       <para>Also, GDBM <emphasis>could</emphasis> be used in place of Berkeley
@@ -52,7 +52,7 @@
       installed, not with GDBM. If you fully understand the risks versus
       benefits of using GDBM and wish to use it anyway, see the BLFS
       instructions located at <ulink
-      url="&blfs-root;view/&short-version;/general/gdbm.html"/></para>
+      url="&blfs-book;general/gdbm.html"/></para>
 
     </tip>
 
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 2db241e0c..5f1c9e196 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -74,7 +74,7 @@
     <para>This package does come with a testsuite, but it requires several
     packages that are not included in LFS. Instructions for running the
     testsuite can be found in the BLFS book at
-    <ulink url="&blfs-root;view/&short-version;/general/dbus.html"/>.</para>
+    <ulink url="&blfs-book;general/dbus.html"/>.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 6c07d8ae0..53f8354ad 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -69,7 +69,7 @@ cd ../gcc-build</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
     are not yet available. See the
-    <ulink url="&blfs-root;view/&short-version;/general/gcc.html">BLFS Book</ulink>
+    <ulink url="&blfs-book;general/gcc.html">BLFS Book</ulink>
     for instructions on how to build all of GCC's supported languages.</para>
 
     <variablelist>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index e08681c41..3dd8d1e31 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -46,7 +46,7 @@
     common requirement on a base Linux system, remove the dependency on Berkeley
     DB by applying the commands below.  If the <command>arpd</command> binary is
     needed, instructions for compiling Berkeley DB can be found in the BLFS Book
-    at <ulink url="&blfs-root;view/&short-version;/server/databases.html#db"/>.
+    at <ulink url="&blfs-book;server/databases.html#db"/>.
     </para>
 
 <screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index a44fd17a7..25fc55a29 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -43,7 +43,7 @@
 
     <note>
       <para>If you would like to enforce the use of strong passwords, refer to
-      <ulink url="&blfs-root;view/&short-version;/postlfs/cracklib.html"/> for installing
+      <ulink url="&blfs-book;postlfs/cracklib.html"/> for installing
       CrackLib prior to building Shadow. Then add
       <parameter>--with-libcrack</parameter> to the <command>configure</command>
       command below.</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index fd2360e3c..346e73029 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -34,7 +34,7 @@
 
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       Nano&mdash;please refer to <ulink
-      url="&blfs-root;view/&short-version;/postlfs/editors.html"/> for suggested
+      url="&blfs-book;postlfs/editors.html"/> for suggested
       installation instructions.</para>
     </tip>
 
@@ -94,7 +94,7 @@ done</userinput></screen>
     additional libraries to be installed. For more information on this
     process, refer to the Vim documentation and the Vim installation page
     in the BLFS book at <ulink
-    url="&blfs-root;view/&short-version;/postlfs/vim.html"/>.</para>
+    url="&blfs-book;postlfs/vim.html"/>.</para>
 
   </sect2>
 
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 75346eee2..76dbb7251 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -147,6 +147,6 @@ EOF</userinput></screen>
 
   <para>UTF-8 based locales are not supported well by many programs.
   Work is in progress to document and, if possible, fix such problems, see
-  <ulink url="&blfs-root;view/&short-version;/introduction/locale-issues.html"/>.</para>
+  <ulink url="&blfs-book;introduction/locale-issues.html"/>.</para>
 
 </sect1>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 1ee23b9fa..354ae319a 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -24,7 +24,7 @@
     fixable by creating udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
     <xref linkend="ch-scripts-network"/>, and sound card configuration can
-    be found in <ulink url="&blfs-root;view/&short-version;/postlfs/devices.html">BLFS</ulink>.</para>
+    be found in <ulink url="&blfs-book;postlfs/devices.html">BLFS</ulink>.</para>
 
     <para>For each of your devices that is likely to have this problem
     (even if the problem doesn't exist in your current Linux distribution),
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index 407f956bf..614f3e085 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -84,7 +84,7 @@ EOF</userinput></screen>
   <option>barrier=1</option> mount option to the appropriate entry in
   <filename>/etc/fstab</filename>.  To check if the disk drive supports
   this option, run
-  <ulink url="&blfs-root;view/&short-version;/general/hdparm.html">hdparm</ulink>
+  <ulink url="&blfs-book;general/hdparm.html">hdparm</ulink>
   on the applicable disk drive.  For example, if:</para>
 
 <screen role="nodump"><userinput>hdparm -I /dev/sda | grep NCQ</userinput></screen>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index daaf37b98..35ab56aa2 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -31,7 +31,7 @@
     already have a boot device, you can create one.  In order for the procedure
     below to work, you need to jump ahead to BLFS and install
     <userinput>xorriso</userinput> from the <ulink
-    url="&blfs-root;view/&short-version;/multimedia/libisoburn.html">
+    url="&blfs-book;multimedia/libisoburn.html">
     libisoburn</ulink> package.</para>
 
 <screen role="nodump"><userinput>cd /tmp &amp;&amp;
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 5a065d72c..13932fcf8 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -61,7 +61,7 @@
     url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
     regarding particular kernel configuration requirements of packages outside
     of LFS at <ulink
-    url="&blfs-root;view/&short-version;/longindex.html#kernel-config-index"/>.  Additional
+    url="&blfs-book;longindex.html#kernel-config-index"/>.  Additional
     information about configuring and building the kernel can be found at
     <ulink url="http://www.kroah.com/lkn/"/> </para>
 
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index aac547352..094a64ee5 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -21,42 +21,42 @@
   <itemizedlist>
 
     <listitem><para>A text mode browser such as <ulink
-    url='&blfs-root;view/&short-version;/basicnet/lynx.html'>Lynx</ulink>
+    url='&blfs-book;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-book;general/gpm.html'>GPM</ulink> package will allow
     you to perform copy/paste actions in your virtual
     terminals.</para></listitem>
 
     <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-book;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-book;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-book;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>
 
     <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-book;postlfs/openssh.html'>openssh</ulink> and its
     prerequsite, <ulink
-    url='&blfs-root;view/&short-version;/postlfs/openssl.html'>openssl</ulink>.
+    url='&blfs-book;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-book;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-book;postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
+    url='&blfs-book;postlfs/parted.html'>parted</ulink> will be useful.
     </para></listitem>
 
     <listitem><para>Finally, a review of the following configuration files
diff --git a/general.ent b/general.ent
index 3f48a8c8b..82704082f 100644
--- a/general.ent
+++ b/general.ent
@@ -7,6 +7,7 @@
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
+<!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index     "&lfs-root;hints/list.html">