X-Git-Url: https://git.exim.org/exim-website.git/blobdiff_plain/2de5d15975122e43f60409d0ef528be30bfea695..8abbc82cbb54b1cceacb438c1e49998680ff8a21:/docs.html

diff --git a/docs.html b/docs.html
index c179aa1..0a3e517 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.50/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>
 
@@ -28,27 +32,41 @@
       <!-- one of (dd dt) -->
       <dt>
  <b>
-   <a href="exim-html-4.50/doc/html/spec.html" target="_top">
-   The Exim Specification - Version 4.5x</a>
+   <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.50/doc/html/filter_toc.html">
-   The Exim Filter Specification - Version 4.5x</a>
+   <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>
 
     </dl>
+    <form action="http://www.google.com/search" method="get">
+    <input type="text" name="q" size="60">
+    <input type="submit" value="Exim Docs Google Search">
+    <input type="hidden" name="hl" value="en">
+    <input type="hidden" name="ie" value="ISO-8859-1">
+    <input type="hidden" name="as_qdr" value="all">
+    <input type="hidden" name="q" value="site:www.exim.org">
+    <input type="hidden" name="q" value="inurl:exim-html-current"
+    </form>
+
     <h2>HOWTO Documentation</h2>
     <ul>
       <li><a href="howto/rbl.html">Using DNS Block Lists</a></li>
@@ -58,9 +76,10 @@
     </ul>
     <h2>Frequently Asked Questions - FAQ</h2>
 
-    <p>The <a href="exim-html-4.50/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.50/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 +97,42 @@
     <h2>Obsolete Documentation</h2>
     <p>Old versions of documentation are still on-line:-</p>
     <table>
+      <tr><th>Version 4.68</th>
+        <td>
+          <a href="exim-html-4.68/doc/html/spec_html" target="_top">
+            specification document</a>
+        </td>
+        <td>
+          <a href="exim-html-4.68/doc/html/filter.html">filter</a>
+        </td>
+        <td>
+          <a href="exim-html-4.68/doc/html/FAQ.html">FAQ</a>
+        </td>
+      </tr>
+      <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">