X-Git-Url: https://git.exim.org/exim-website.git/blobdiff_plain/0ecd819a11787b85ec114381056300353f2bf8ed..173589b215261d4e4dee1aeac8e15d3c9984f3f1:/docs.html?ds=inline

diff --git a/docs.html b/docs.html
index c63b080..4ce40da 100644
--- a/docs.html
+++ b/docs.html
@@ -16,18 +16,15 @@
     <p>There are 3 main sets of documentation for exim, all of which
     are also available below in html form.</p>
 
+    <p>The main user and configuration manual is the specification
+    document</p>
+
     <dl>
       <!-- one of (dd dt) -->
       <dt>
 	<b>
-	  <a href="exim-html-4.10/doc/html/spec.html" target="_top">
-	  The Exim Specification - Version 4.1x</a>
-	</b>
-      </dt>
-      <dt>
-	<b>
-	  <a href="exim-html-3.30/doc/html/spec.html" target="_top">
-	  The Exim Specification - Version 3.3x</a>
+	  <a href="exim-html-4.20/doc/html/spec.html" target="_top">
+	  The Exim Specification - Version 4.2x</a>
 	</b>
       </dt>
 
@@ -40,14 +37,8 @@
       <!-- one of (dd dt) -->
       <dt>
 	<b>
-	  <a href="exim-html-4.10/doc/html/filter.html">
-	  The Exim Filter Specification - Version 4.1x</a>
-	</b>
-      </dt>
-      <dt>
-	<b>
-	  <a href="exim-html-3.30/doc/html/filter.html">
-	  The Exim Filter Specification - Version 3.3x</a>
+	  <a href="exim-html-4.20/doc/html/filter.html">
+	  The Exim Filter Specification - Version 4.2x</a>
 	</b>
       </dt>
       <dd>Additional information on the exim filter language.</dd>
@@ -62,8 +53,13 @@
       <li><a href="howto/mailman21.html">Using mailman 2.1 lists with exim3 or exim4</a></li>
     </ul>
     <h2>Frequently Asked Questions - FAQ</h2>
-    <p>The <a href="FAQ.html">exim FAQ</a> is now available, and a new
-      version for <a href="exim-html-4.10/doc/html/FAQ.html">exim 4</a>.</p>
+
+    <p>The <a href="exim-html-4.20/doc/html/FAQ.html">FAQ for Exim
+    4</a> can be found <a
+    href="exim-html-4.20/doc/html/FAQ.html">here</a>.  The FAQ for the
+    obsolete Exim 3 releases can be found on the <a
+    href="ftp/exim3/">FTP site</a> - see the <a
+    href="mirrors.html">download</a> pages.</p>
 
     <h2>Copies of Documentation</h2>
 
@@ -75,9 +71,21 @@
     <p>A number of FAQs are in preparation and will be made available shortly.
       Please contact me if you have material to contribute.</p>
 
-    <h2>Old Documentation</h2>
+    <h2>Obsolete Documentation</h2>
     <p>Old versions of documentation are still on-line:-</p>
     <table>
+      <tr><th>Version 4.1x</th>
+        <td>
+          <a href="exim-html-4.10/doc/html/spec.html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.10/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.10/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
       <tr><th>Version 4.0x</th>
         <td>
           <a href="exim-html-4.00/doc/html/spec.html" target="_top">
@@ -87,10 +95,22 @@
           <a href="exim-html-4.00/doc/html/filter.html">filter</a>
         </td>
         <td>
-          <a href="exim-html-4.00/doc/html/FAQ.html">filter</a>
+          <a href="exim-html-4.00/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
+       <tr><th>Version 3.3x</th>
+        <td>
+          <a href="exim-html-3.30/doc/html/spec.html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-3.30/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-3.30/doc/html/FAQ.html">FAQ</a>
         </td>
       </tr>
-      <tr><th>Version 3.2x</th>
+     <tr><th>Version 3.2x</th>
         <td>
           <a href="exim-html-3.20/doc/html/spec.html" target="_top">
             specification document</a>
@@ -167,6 +187,6 @@
     <hr>
     <address><a href="mailto:Postmaster@exim.org">Nigel Metheringham</a></address>
 <!-- Created: Mon Aug 25 15:46:41 BST 1997 -->
-    <h4>$Id: docs.html,v 1.7 2002/03/07 21:56:36 nigel Exp $</h4>
+    <h4>$Id: docs.html,v 1.11 2003/05/14 11:45:24 nigel Exp $</h4>
   </body>
 </html>