X-Git-Url: https://git.exim.org/exim-website.git/blobdiff_plain/7bd18b1d878644f5c6710f77b585ba2f86d413fb..01aba47ce711a05e6f85445fca63e758250fa42d:/docs.html?ds=sidebyside

diff --git a/docs.html b/docs.html
index 4b34cb3..81a62a8 100644
--- a/docs.html
+++ b/docs.html
@@ -8,7 +8,7 @@
     <h1>Documentation for exim</h1>
 
     <p>Exim has a set of <a
-    href="exim-html-4.30/doc/html/">documentation</a> released with
+    href="exim-html-current/doc/html/index.html">documentation</a> released with
     it.  A text file of the main documentation is released as part of
     the exim tar archive.  Additionally postscript and texinfo forms
     of the documentation are also available in separate tar archives
@@ -18,6 +18,10 @@
     <a href="http://www.uit.co.uk/exim-book/">book website</a> for
     further information.</p>
 
+    <p>New user documentation can be found at the <a href="http://www.exim-new-users.co.uk/">Exim New Users site</a></p>
+
+    <p>User supported documentation, FAQs and hints can be found in the <a href="http://wiki.exim.org/">wiki</a>.</p>
+
     <p>There are 3 main sets of documentation for exim, all of which
     are also available below in html form.</p>
 
@@ -27,24 +31,28 @@
     <dl>
       <!-- one of (dd dt) -->
       <dt>
-	<b>
-	  <a href="exim-html-4.30/doc/html/spec.html" target="_top">
-	  The Exim Specification - Version 4.3x</a>
-	</b>
+ <b>
+   <a href="exim-html-current/doc/html/spec_html/index.html" target="_top">
+   The Exim Specification - Version 4.6x</a>
+ </b>
+   <a href="exim-pdf-current/doc/spec.pdf" target="_top">
+      (PDF)</a>
       </dt>
 
       <dd>The master documentation for exim containing all required
-      detail to install, configure and use exim.  <font
-      color=darkgreen>Changes to the documentation (normally
-      reflecting changes to the functionality of exim, are now shown
-      in a green font like this segment.</font></dd>
+      detail to install, configure and use exim.  <span
+      style="background-color: #99ff99;">Changes to the documentation (normally
+      reflecting changes to the functionality of exim) are shown
+      on a green background like this segment.</span></dd>
 
       <!-- one of (dd dt) -->
       <dt>
-	<b>
-	  <a href="exim-html-4.30/doc/html/filter_toc.html">
-	  The Exim Filter Specification - Version 4.3x</a>
-	</b>
+ <b>
+   <a href="exim-html-current/doc/html/filter.html">
+   The Exim Filter Specification - Version 4.6x</a>
+ </b>
+   <a href="exim-pdf-current/doc/filter.pdf" target="_top">
+      (PDF)</a>
       </dt>
       <dd>Additional information on the exim filter language.</dd>
 
@@ -54,13 +62,14 @@
       <li><a href="howto/rbl.html">Using DNS Block Lists</a></li>
       <li><a href="howto/relay.html">Controlling relaying</a></li>
       <li><a href="howto/mailman.html">Using mailman 2.0 lists with exim</a></li>
-      <li><a href="howto/mailman21.html">Using mailman 2.1 lists with exim3 or exim4</a></li>
+      <li><a href="howto/mailman21.html">Using mailman 2.1 lists with exim4</a></li>
     </ul>
     <h2>Frequently Asked Questions - FAQ</h2>
 
-    <p>The <a href="exim-html-4.30/doc/html/FAQ.html">FAQ for Exim
+    <p>The wikified <a href="http://wiki.exim.org/FAQ">FAQ for Exim
     4</a> can be found <a
-    href="exim-html-4.30/doc/html/FAQ.html">here</a>.  The FAQ for the
+    href="http://wiki.exim.org/FAQ">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>
@@ -78,6 +87,54 @@
     <h2>Obsolete Documentation</h2>
     <p>Old versions of documentation are still on-line:-</p>
     <table>
+      <tr><th>Version 4.67</th>
+        <td>
+          <a href="exim-html-4.67/doc/html/spec_html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.67/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.67/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
+      <tr><th>Version 4.5x</th>
+        <td>
+          <a href="exim-html-4.50/doc/html/spec.html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.50/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.50/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
+      <tr><th>Version 4.4x</th>
+        <td>
+          <a href="exim-html-4.40/doc/html/spec.html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.40/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.40/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
+      <tr><th>Version 4.3x</th>
+        <td>
+          <a href="exim-html-4.30/doc/html/spec.html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.30/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.30/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
       <tr><th>Version 4.2x</th>
         <td>
           <a href="exim-html-4.20/doc/html/spec.html" target="_top">
@@ -148,58 +205,58 @@
         </td>
       </tr>
       <tr><th>Version 3.0x</th>
-	<td>
-	  <a href="exim-html-3.00/doc/html/spec.html" target="_top">
-	    specification document</a>
-	</td>
-	<td>
-	  <a href="exim-html-3.00/doc/html/filter.html">filter</a>
-	</td>
-	<td>
-	  <a href="exim-html-3.00/doc/html/oview.html">overview</a>
-	</td>
+ <td>
+   <a href="exim-html-3.00/doc/html/spec.html" target="_top">
+     specification document</a>
+ </td>
+ <td>
+   <a href="exim-html-3.00/doc/html/filter.html">filter</a>
+ </td>
+ <td>
+   <a href="exim-html-3.00/doc/html/oview.html">overview</a>
+ </td>
       </tr>
       <tr><th>Version 2.1x</th>
-	<td>
-	  <a href="exim-html-2.10/doc/html/spec.html" target="_top">
-	    specification document</a>
-	</td>
-	<td>
-	  <a href="exim-html-2.10/doc/html/filter.html">filter</a>
-	</td>
-	<td>
-	  <a href="exim-html-2.10/doc/html/oview.html">overview</a>
-	</td>
+ <td>
+   <a href="exim-html-2.10/doc/html/spec.html" target="_top">
+     specification document</a>
+ </td>
+ <td>
+   <a href="exim-html-2.10/doc/html/filter.html">filter</a>
+ </td>
+ <td>
+   <a href="exim-html-2.10/doc/html/oview.html">overview</a>
+ </td>
       </tr>
       <tr><th>Version 2.0x</th>
-	<td>
-	  <a href="exim-html-2.00/doc/html/spec.html" target="_top">
-	    specification document</a>
-	</td>
-	<td>
-	  <a href="exim-html-2.00/doc/html/filter.html">filter</a>
-	</td>
-	<td>
-	  <a href="exim-html-2.00/doc/html/oview.html">overview</a>
-	</td>
+ <td>
+   <a href="exim-html-2.00/doc/html/spec.html" target="_top">
+     specification document</a>
+ </td>
+ <td>
+   <a href="exim-html-2.00/doc/html/filter.html">filter</a>
+ </td>
+ <td>
+   <a href="exim-html-2.00/doc/html/oview.html">overview</a>
+ </td>
       </tr>
       <tr><th>Version 1.9x</th>
-	<td>
-	  <a href="exim-html-1.90/doc/html/spec.html" target="_top">
-	    specification document</a>
-	</td>
-	<td>
-	  <a href="exim-html-1.90/doc/html/filter.html">filter</a>
-	</td>
-	<td>
-	  <a href="exim-html-1.90/doc/html/oview.html">overview</a>
-	</td>
+ <td>
+   <a href="exim-html-1.90/doc/html/spec.html" target="_top">
+     specification document</a>
+ </td>
+ <td>
+   <a href="exim-html-1.90/doc/html/filter.html">filter</a>
+ </td>
+ <td>
+   <a href="exim-html-1.90/doc/html/oview.html">overview</a>
+ </td>
       </tr>
     </table>
 
     <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.16 2003/12/04 16:04:24 nigel Exp $</h4>
+    <h4>$Cambridge$</h4>
   </body>
 </html>