fix: remove spurios half-open HTML (introduced by 77237db)

[exim-website.git] / templates / web / index.xsl

diff --git a/templates/web/index.xsl b/templates/web/index.xsl
index 6a44b8504b5e856476657435444e7eb262eb1000..e732a4372ca86370fc296717840cb076cc6d4b8c 100644 (file)
--- a/templates/web/index.xsl
+++ b/templates/web/index.xsl
@@ -35,20 +35,25 @@
                                <a href="https://www.cam.ac.uk/" title="University of Cambridge Home page">University of Cambridge</a>
                                <xsl:text> for use on Unix systems connected to the Internet. It is freely available under the terms of the </xsl:text>
                                <a href="https://www.gnu.org/licenses/gpl.html" title="GPL Information">GNU General Public Licence</a>
                                <a href="https://www.cam.ac.uk/" title="University of Cambridge Home page">University of Cambridge</a>
                                <xsl:text> for use on Unix systems connected to the Internet. It is freely available under the terms of the </xsl:text>
                                <a href="https://www.gnu.org/licenses/gpl.html" title="GPL Information">GNU General Public Licence</a>

-                               <xsl:text>. In style it is similar to </xsl:text>
-                               <a href="http://freecode.com/projects/smail/" rel="nofollow">Smail 3</a>
-                               <xsl:text>, but its facilities are more general. There is a great deal of flexibility in the way mail can be routed, and there are extensive facilities for checking incoming mail. Exim can be installed in place of </xsl:text>
+                               <xsl:text>. In style it is similar to Smail 3,
+                               but its facilities are more general. There is a great deal of flexibility in the way mail can be routed, and there are extensive facilities for checking incoming mail. Exim can be installed in place of </xsl:text>

                                <a href="https://www.proofpoint.com/us/sendmail-open-source" title="Sendmail home page" rel="nofollow">Sendmail</a>
                                <xsl:text>, although the configuration of Exim is quite different.</xsl:text>
                        </p>
 
       <!-- Version Information -->
                                <a href="https://www.proofpoint.com/us/sendmail-open-source" title="Sendmail home page" rel="nofollow">Sendmail</a>
                                <xsl:text>, although the configuration of Exim is quite different.</xsl:text>
                        </p>
 
       <!-- Version Information -->

-         <p id="obsolete_version_info"><xsl:text>All versions of Exim previous to version </xsl:text><xsl:value-of select="/content/current_version"/><xsl:text> are now obsolete. The last 3.x release was 3.36. It is obsolete and should not be used.</xsl:text>
+         <p id="obsolete_version_info"><xsl:text>All versions of Exim previous to version </xsl:text><xsl:value-of select="/content/current_version"/><xsl:text> are now obsolete. The last 3.x release was 3.36. It is twenty years obsolete and should not be used.</xsl:text>

          </p>
 
          <p id="version_info">
          </p>
 
          <p id="version_info">

-            <xsl:text>The current version is </xsl:text> <xsl:value-of select="/content/current_version"/>
-           This is a security release.  See <a href="static/doc/security/CVE-2019-13917.txt">CVE-2019-13917</a>.
+            <xsl:text>The current version is </xsl:text> <xsl:value-of select="/content/current_version"/><xsl:text>.</xsl:text> <br/>
+           <xsl:text>If necessary, we publish maintenance releases. These releases are mainly intended for package maintainers.</xsl:text>
+
+           <!--
+           This is a security release.  See <a href="{$staticroot}/doc/security/CVE-2020-qualys">CVE-2020-qualys</a> or
+           <a href="https://www.qualys.com/2021/05/04/21nails/21nails.txt">at the reporter's (Qualys) site</a>.
+           -->
+

          </p>
 
          <p id="beta_version_info">
          </p>
 
          <p id="beta_version_info">


@@ -58,11 +63,11 @@
                 <!-- Book Information -->
 
                        <p id="book_info">
                 <!-- Book Information -->
 
                        <p id="book_info">

-                               <a href="https://www.uit.co.uk/the-exim-smtp-mail-server">
+                               <a href="https://www.uit.co.uk/all-books/the-exim-smtp-mail-server.html">

                                        <img src="i/exim-book.png" width="74" height="100"/>
                                </a>
                                <xsl:text>You may wish to purchase </xsl:text>
                                        <img src="i/exim-book.png" width="74" height="100"/>
                                </a>
                                <xsl:text>You may wish to purchase </xsl:text>

-                               <a href="https://www.uit.co.uk/the-exim-smtp-mail-server">The Exim SMTP Mail Server</a>
+                               <a href="https://www.uit.co.uk/all-books/the-exim-smtp-mail-server.html">The Exim SMTP Mail Server</a>

                                <xsl:text> book, written by the original author of Exim, </xsl:text>
                                <a href="https://en.wikipedia.org/wiki/Philip_Hazel">Philip Hazel</a>
                                <xsl:text>.</xsl:text>
                                <xsl:text> book, written by the original author of Exim, </xsl:text>
                                <a href="https://en.wikipedia.org/wiki/Philip_Hazel">Philip Hazel</a>
                                <xsl:text>.</xsl:text>


@@ -73,11 +78,10 @@
             <xsl:text>The following organizations provide services which help the Exim project:</xsl:text>
             <ul id="sponsor_list">
                <li class="sponsor">
             <xsl:text>The following organizations provide services which help the Exim project:</xsl:text>
             <ul id="sponsor_list">
                <li class="sponsor">

-                  <a href="https://www.cam.ac.uk/">
-                     <img src="i/cambridge-150x39.png" width="150" height="39" alt="University of Cambridge" class="sponsor_logo"/>
-                     <xsl:text>The University of Cambridge</xsl:text>
+                  <a href="https://www.mythic-beasts.com/">
+                     <xsl:text>Mythic Beasts</xsl:text>

                   </a>
                   </a>

-                  <xsl:text> hosts the central Exim website and domain.</xsl:text>
+                  <xsl:text> provide us with a VM for running the buildfarm, for the testsuite.</xsl:text>

                </li>
                <li class="sponsor">
                   <a href="https://www.macstadium.com/">
                </li>
                <li class="sponsor">
                   <a href="https://www.macstadium.com/">


@@ -86,6 +90,12 @@
                   </a>
                   <xsl:text> provide us a Mac Mini for our buildfarm, keeping macOS supported.</xsl:text>
                </li>
                   </a>
                   <xsl:text> provide us a Mac Mini for our buildfarm, keeping macOS supported.</xsl:text>
                </li>

+               <li class="sponsor">
+                  <a href="https://schlittermann.de/">
+                     <xsl:text>Schlittermann - Internet &amp; Unix Support</xsl:text>
+                  </a>
+                  <xsl:text> provide us resources for hosting and administering the exim.org infrastructure.</xsl:text>
+               </li>

             </ul>
          </div>
 
             </ul>
          </div>