fix links to paper book (fixes #6)

diff --git a/templates/web/docs.xsl b/templates/web/docs.xsl
index 21e3fb3ef9e570c7505d6f95df2f7065fd63cc8e..e75b9bacdf8bb77fdaefb2dc8222d08caac876a3 100644 (file)
--- a/templates/web/docs.xsl
+++ b/templates/web/docs.xsl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-       
+

        <!-- WRAPPER -->
                <xsl:import href="../wrapper.xsl"/>
                <xsl:template match="/"> <xsl:apply-imports/> </xsl:template>
        <!-- WRAPPER -->
                <xsl:import href="../wrapper.xsl"/>
                <xsl:template match="/"> <xsl:apply-imports/> </xsl:template>

-               
+

                <xsl:variable name="docroot" select="'.'"/>
 
        <!-- Title -->
                <xsl:variable name="html.head.title" select="'Documentation for Exim'"/>
 
                <xsl:variable name="docroot" select="'.'"/>
 
        <!-- Title -->
                <xsl:variable name="html.head.title" select="'Documentation for Exim'"/>
 

-                
+

        <xsl:variable name="html.head.append">
 
                <!-- Canonical -->
        <xsl:variable name="html.head.append">
 
                <!-- Canonical -->


@@ -35,7 +35,7 @@
                                </h2>
 
                        <!-- General Doc Info -->
                                </h2>
 
                        <!-- General Doc Info -->

-                               <p>Exim has a set of documentation 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 available in separate tar archives on the ftp sites. There is also a <a href="https://www.uit.co.uk/the-exim-smtp-mail-server">book</a>.</p>
+                               <p>Exim has a set of documentation 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 available in separate tar archives on the ftp sites. There is also a <a href="https://www.uit.co.uk/all-books/the-exim-smtp-mail-server.html">book</a>.</p>

 
                                <p>User supported documentation, FAQs and hints can be found in the <a href="https://wiki.exim.org/">wiki</a>.</p>
 
 
                                <p>User supported documentation, FAQs and hints can be found in the <a href="https://wiki.exim.org/">wiki</a>.</p>
 


@@ -102,7 +102,7 @@
                                        <xsl:text> - see the </xsl:text>
                                        <a href="{$docroot}/mirrors.html">download</a>
                                        <xsl:text> pages.</xsl:text>
                                        <xsl:text> - see the </xsl:text>
                                        <a href="{$docroot}/mirrors.html">download</a>
                                        <xsl:text> pages.</xsl:text>

-                               </p>    
+                               </p>

 
                        <!-- Copies -->
                                <h3>Copies of Documentation</h3>
 
                        <!-- Copies -->
                                <h3>Copies of Documentation</h3>

diff --git a/templates/web/index.xsl b/templates/web/index.xsl
index 365f50f49637468710dbc3372e9f83d67b1f9d5e..770c5e498b9429a7d1390d0c70d87780d61b863b 100644 (file)
--- a/templates/web/index.xsl
+++ b/templates/web/index.xsl
@@ -35,9 +35,8 @@
                                <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>
                                <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>


@@ -64,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.html">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>