Index: general.ent
===================================================================
--- general.ent	(revision c8661098205f0efc19842c37e837f509f41f3ddd)
+++ general.ent	(revision e695e4a0347028abb148f64fb164e9094d73f545)
@@ -1,7 +1,7 @@
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "October &day;nd, &year;">
+<!ENTITY releasedate  "October &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c8661098205f0efc19842c37e837f509f41f3ddd)
+++ introduction/welcome/changelog.xml	(revision e695e4a0347028abb148f64fb164e9094d73f545)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>October 23rd, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated the Exim instructions documentation
+          links.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 22nd, 2006</para>
       <itemizedlist>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision c8661098205f0efc19842c37e837f509f41f3ddd)
+++ server/mail/exim.xml	(revision e695e4a0347028abb148f64fb164e9094d73f545)
@@ -5,23 +5,19 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY exim-download-http "http://www.exim.org/ftp/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-download-ftp "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-md5sum "f6bbf99a6f63c0f5045a1779e7e810c4">
-  <!ENTITY exim-size "1.5 MB">
-  <!ENTITY exim-buildsize "14.5 MB">
-  <!ENTITY exim-time "0.2 SBU">
+  <!ENTITY exim-download-http      "http://www.exim.org/ftp/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-download-ftp       "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-md5sum             "f6bbf99a6f63c0f5045a1779e7e810c4">
+  <!ENTITY exim-size               "1.5 MB">
+  <!ENTITY exim-buildsize          "14.5 MB">
+  <!ENTITY exim-time               "0.2 SBU">
+  <!-- <!ENTITY exim-online-doc-version "4.61"> -->
 ]>
+
+  <!-- Editors please ensure that the documentation links below (in the 
+       'Adding Additional Functionality' section) are still valid after you
+       update a version entity. It appears that the "id" strings in some of
+       the URLs below change between versions. And I don't think this can
+       be automatically updated.
+  -->
 
 <sect1 id="exim" xreflabel="Exim-&exim-version;">
@@ -68,13 +64,16 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
+      <!-- <listitem>
         <para>Required patch for Berkeley DB: <ulink
         url="&patch-root;/exim-&exim-version;-db43-1.patch"/></para>
+      </listitem> -->
+      <listitem>
+        <para>Additional formats of the documentation (text-based docs are
+        shipped with the sources) can be downloaded by following the links
+        shown at <ulink url="http://exim.org/docs.html"/>.</para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Exim Dependencies</bridgehead>
@@ -131,4 +130,6 @@
 make</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -192,34 +193,40 @@
     <para>To use a backend database other than <application>Berkeley
     DB</application>, see the instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_4.html#SECT4.3"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.
+    </para>
 
     <para>For SSL functionality, see the instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_4.html#SECT4.6"/> and
-    <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_37.html#CHAP37"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
+    and <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch38.html"/>.
+    </para>
 
     <para>For <application>tcpwrappers</application> functionality, see the
     instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_4.html#SECT4.7"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#id2522928"/>.
+         http://exim.org/exim-html-4.61/doc/html/spec_html/ch04.html#id2522928
+    </para>
 
     <para>For information about adding authentication mechanisms to the
-    build, see the instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_34.html#SECT34.4"/> For
-    specific information about using <application>Cyrus-SASL</application>, see
-    section 10 of the <filename>doc/NewStuff</filename> file located in the source
-    tree.</para>
+    build, see chapters 33-37 of <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.
+    </para>
 
     <para>For information about linking <application>Linux-PAM</application>, see
-    the instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_11.html#IX935"/>.</para>
+    the instructions in section 7 of <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch11.html"/>.
+    </para>
 
     <para>For information about linking database engine libraries used for
     <application>Exim</application> name lookups, see the instructions at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_9.html#CHAP9"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch09.html"/>.
+    </para>
 
     <para>If you wish to add <application>Readline</application> support to
     <application>Exim</application> when invoked in <quote>test expansion</quote>
-    (-bv) mode, see the information in section 8 of the
-    <filename>doc/NewStuff</filename> file located in the source tree.</para>
+    (<option>-be</option>) mode, see the information in the <option>-be</option>
+    section of <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch05.html#id2525974"/>.
+    </para>
 
     <para>You may wish to modify the default configuration and send log files to
@@ -227,5 +234,5 @@
     <filename class='directory'>/var/spool/exim/log</filename> directory. See the
     information at <ulink
-    url="http://www.exim.org/exim-html-4.40/doc/html/spec_45.html#CHAP45"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch48.html"/>.</para>
 
   </sect2>
