Merge branch 'master' of github.com:nigelm/exim-website

diff --git a/script/gen.pl b/script/gen.pl
index 217fdd4eeb77cdb15e0ffc1f23ee55d11c33ce0e..ac3d3d605d646891eff10d17f2cfcc3ebf0a8c80 100755 (executable)
--- a/script/gen.pl
+++ b/script/gen.pl
@@ -131,7 +131,8 @@ sub do_doc {
 
     ## Generate the chapters
     my $counter = 0;
-    foreach my $chapter ( map { $_->cloneNode(1) } $xml->findnodes('/book/chapter') ) {
+    my @chapters = map { $_->cloneNode(1) } $xml->findnodes('/book/chapter');
+    foreach my $chapter ( @chapters ) {
 
         ## Add a <chapter_id>N</chapter_id> node for the stylesheet to use
         $chapter->appendTextChild( 'chapter_id', ++$counter );
@@ -144,7 +145,7 @@ sub do_doc {
                         ? 'filter.html'
                         : 'index.html'
                 : sprintf( '%sch%02d.html', $prepend_chapter, $counter - 1 ) );
-            $chapter->appendTextChild( 'next_url', sprintf( '%sch%02d.html', $prepend_chapter, $counter + 1 ) );
+            $chapter->appendTextChild( 'next_url', sprintf( '%sch%02d.html', $prepend_chapter, $counter + 1 ) ) unless int(@chapters) == $counter;
             $chapter->appendTextChild(
                 'canonical_url',
                 sprintf(

diff --git a/templates/doc/chapter.xsl b/templates/doc/chapter.xsl
index dd5d06ac9705bc01f60ea454bb20128565251207..6fd6d8c99702c49d60c1ccc2d4c12acb7d5f3bd0 100644 (file)
--- a/templates/doc/chapter.xsl
+++ b/templates/doc/chapter.xsl
@@ -41,7 +41,9 @@
 
          <!-- Navigation -->
          <a class="previous_page" href="{prev_url}"><![CDATA[<-previous]]></a>
-         <a class="next_page"     href="{next_url}"><![CDATA[next->]]></a>
+        <xsl:if test="next_url">
+            <a class="next_page" href="{next_url}"><![CDATA[next->]]></a>
+         </xsl:if>
 
          <!-- Chapter Wrapper -->
          <div id="chapter" class="chapter{@class}">