.gitignore

@@ -1,4 +1,5 @@
 exim-*
+!/test/aux-fixed/exim-ca
 *~
 *.bak
 .*.swp

doc/doc-docbook/Makefile

@@ -3,10 +3,12 @@
 export LC_ALL=C
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
-	      @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'html', 'txt', or 'info'."
+	      @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'txt', or 'info'."
 	      @echo "** One other possible targets 'exim.8', 'spec.utf8'".
 	      exit 1
 
+# html used to be supported, but is not here since 50023e0551 (2010).
+# The website build script seems to handle it.
 
 ############################# EVERYTHING ###############################
 #

doc/doc-docbook/filter.xfpt

@@ -78,7 +78,7 @@
 </revision></revhistory>
 <copyright><year>
 .copyyear
-           </year><holder>University of Cambridge</holder></copyright>
+           </year><holder>The Exim Maintainers</holder></copyright>
 </bookinfo>
 .literal off
 
@@ -88,7 +88,7 @@
 
 .chapter "Forwarding and filtering in Exim" "CHAPforandfilt"
 This document describes the user interfaces to Exim's in-built mail filtering
-facilities, and is copyright &copy; University of Cambridge &copyyear(). It
+facilities, and is copyright &copy; The Exim Maintainers &copyyear(). It
 corresponds to Exim version &version().