Fixed labels as well as URLs, added wiki FAQ reference in preference to static

[exim-website.git] / docs.html

diff --git a/docs.html b/docs.html
index c179aa1b6542251d9f8c7b2ac2ebd24bc57d521e..60afbd6190bca382fcd034e66fef1014799bc2b1 100644 (file)
--- 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-4.60/doc/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
@@ -28,8 +28,8 @@
       <!-- 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-4.60/doc/html/spec.html" target="_top">
+   The Exim Specification - Version 4.6x</a>
  </b>
       </dt>
 
@@ -42,8 +42,8 @@
       <!-- 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-4.60/doc/html/filter_toc.html">
+   The Exim Filter Specification - Version 4.6x</a>
  </b>
       </dt>
       <dd>Additional information on the exim filter language.</dd>
@@ -58,9 +58,11 @@
     </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://www.exim.org/eximwiki/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://www.exim.org/eximwiki/FAQ">here</a> with the old static
+    version <a href="exim-html-4.60/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>
@@ -78,6 +80,18 @@
     <h2>Obsolete Documentation</h2>
     <p>Old versions of documentation are still on-line:-</p>
     <table>
+      <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">