23 files changed, 3 insertions, 54 deletions
diff --git a/doc/doc-docbook/ABOUT b/doc/doc-docbook/ABOUT
index 72048b569..69130d6e8 100644
--- a/doc/doc-docbook/ABOUT
+++ b/doc/doc-docbook/ABOUT
@@ -1,7 +1,5 @@
-$Cambridge: exim/doc/doc-docbook/ABOUT,v 1.1 2005/06/16 10:32:31 ph10 Exp $
-
-CVS directory exim/exim-doc/doc-docbook
----------------------------------------
+Exim repository: doc/doc-docbook
+--------------------------------
 
 This directory contains the AsciiDoc and DocBook sources for the Exim
 specification and the filter description. It also contains a Makefile and all
diff --git a/doc/doc-docbook/HowItWorks.txt b/doc/doc-docbook/HowItWorks.txt
index 88986684e..c5e328a09 100644
--- a/doc/doc-docbook/HowItWorks.txt
+++ b/doc/doc-docbook/HowItWorks.txt
@@ -1,5 +1,3 @@
-$Cambridge: exim/doc/doc-docbook/HowItWorks.txt,v 1.9 2008/02/04 17:28:44 fanf2 Exp $
-
 CREATING THE EXIM DOCUMENTATION
 
 "You are lost in a maze of twisty little scripts."
diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 4f9232812..f39c01208 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,5 +1,3 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.14 2010/05/28 15:38:18 nm4 Exp $
-
 # Make file for Exim documentation from xfpt source.
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
diff --git a/doc/doc-docbook/Markup.txt b/doc/doc-docbook/Markup.txt
index b44727684..9f591955f 100644
--- a/doc/doc-docbook/Markup.txt
+++ b/doc/doc-docbook/Markup.txt
@@ -1,5 +1,3 @@
-$Cambridge: exim/doc/doc-docbook/Markup.txt,v 1.5 2007/04/11 15:26:09 ph10 Exp $
-
 XFPT MARKUP USED IN THE EXIM DOCUMENTATION
 ------------------------------------------
 
diff --git a/doc/doc-docbook/MyStyle-chunk-html.xsl b/doc/doc-docbook/MyStyle-chunk-html.xsl
index 85ee8fe15..ca07c6dc6 100644
--- a/doc/doc-docbook/MyStyle-chunk-html.xsl
+++ b/doc/doc-docbook/MyStyle-chunk-html.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-chunk-html.xsl,v 1.7 2010/05/30 18:16:12 nm4 Exp $ -->
-
 <!-- This stylesheet driver imports the DocBook XML stylesheet for chunked
 HTML output, and then imports my common stylesheet for HTML output. Finally, it
 fiddles with the chunking parameters to arrange for chapter chunking only (no
diff --git a/doc/doc-docbook/MyStyle-filter-fo.xsl b/doc/doc-docbook/MyStyle-filter-fo.xsl
index 7b49ef1aa..1b2bbf16a 100644
--- a/doc/doc-docbook/MyStyle-filter-fo.xsl
+++ b/doc/doc-docbook/MyStyle-filter-fo.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-filter-fo.xsl,v 1.5 2010/05/30 18:16:12 nm4 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This stylesheet driver imports the DocBook XML stylesheet for FO output,
diff --git a/doc/doc-docbook/MyStyle-fo.xsl b/doc/doc-docbook/MyStyle-fo.xsl
index 8e43194ae..598db4f45 100644
--- a/doc/doc-docbook/MyStyle-fo.xsl
+++ b/doc/doc-docbook/MyStyle-fo.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-fo.xsl,v 1.5 2006/12/19 12:28:35 ph10 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
diff --git a/doc/doc-docbook/MyStyle-html.xsl b/doc/doc-docbook/MyStyle-html.xsl
index fb43c73c0..fa1c419d9 100644
--- a/doc/doc-docbook/MyStyle-html.xsl
+++ b/doc/doc-docbook/MyStyle-html.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-html.xsl,v 1.2 2005/11/10 12:30:13 ph10 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This stylesheet driver imports my common stylesheet that makes some
diff --git a/doc/doc-docbook/MyStyle-nochunk-html.xsl b/doc/doc-docbook/MyStyle-nochunk-html.xsl
index 560d33769..1bd51cd1c 100644
--- a/doc/doc-docbook/MyStyle-nochunk-html.xsl
+++ b/doc/doc-docbook/MyStyle-nochunk-html.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-nochunk-html.xsl,v 1.5 2010/05/30 18:16:12 nm4 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This stylesheet driver imports the DocBook XML stylesheet for unchunked
diff --git a/doc/doc-docbook/MyStyle-spec-fo.xsl b/doc/doc-docbook/MyStyle-spec-fo.xsl
index 832cedc69..81f7ab5ab 100644
--- a/doc/doc-docbook/MyStyle-spec-fo.xsl
+++ b/doc/doc-docbook/MyStyle-spec-fo.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-spec-fo.xsl,v 1.7 2010/05/30 18:16:12 nm4 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This stylesheet driver imports the DocBook XML stylesheet for FO output,
diff --git a/doc/doc-docbook/MyStyle-txt-html.xsl b/doc/doc-docbook/MyStyle-txt-html.xsl
index 02ce745d1..7573e6fc4 100644
--- a/doc/doc-docbook/MyStyle-txt-html.xsl
+++ b/doc/doc-docbook/MyStyle-txt-html.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-txt-html.xsl,v 1.5 2010/05/30 18:16:12 nm4 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This stylesheet driver imports the DocBook XML stylesheet for unchunked
diff --git a/doc/doc-docbook/MyStyle.xsl b/doc/doc-docbook/MyStyle.xsl
index 3798e20d5..c1f741b1f 100644
--- a/doc/doc-docbook/MyStyle.xsl
+++ b/doc/doc-docbook/MyStyle.xsl
@@ -1,5 +1,3 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle.xsl,v 1.4 2006/12/19 12:28:35 ph10 Exp $ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
 <!-- This file contains changes to the Docbook XML stylesheets that I want to
diff --git a/doc/doc-docbook/MyTitlepage.templates.xml b/doc/doc-docbook/MyTitlepage.templates.xml
index f1aefc46f..7462fb906 100644
--- a/doc/doc-docbook/MyTitlepage.templates.xml
+++ b/doc/doc-docbook/MyTitlepage.templates.xml
@@ -13,8 +13,6 @@
 <!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
 ]>
 
-<!-- $Cambridge: exim/doc/doc-docbook/MyTitlepage.templates.xml,v 1.3 2006/12/19 12:28:35 ph10 Exp $ -->
-
 <!-- This document is copied from the DocBook XSL stylesheets, and modified to
 do what I want it to do for the Exim reference manual. Process this document
 with:
diff --git a/doc/doc-docbook/Myhtml.css b/doc/doc-docbook/Myhtml.css
index 8a6981774..736833657 100644
--- a/doc/doc-docbook/Myhtml.css
+++ b/doc/doc-docbook/Myhtml.css
@@ -1,5 +1,3 @@
-# $Cambridge: exim/doc/doc-docbook/Myhtml.css,v 1.1 2005/06/16 10:32:31 ph10 Exp $
-
 .screen {
         font-family: monospace;
         font-size: 1em;
@@ -28,4 +26,3 @@
         -moz-border-radius: 2.5px;
         margin: 0.5em 2em;
 }
-
diff --git a/doc/doc-docbook/OS-Fixups b/doc/doc-docbook/OS-Fixups
index baefbb716..b3ea5247f 100755
--- a/doc/doc-docbook/OS-Fixups
+++ b/doc/doc-docbook/OS-Fixups
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-#  $Cambridge: exim/doc/doc-docbook/OS-Fixups,v 1.3 2010/05/28 15:38:18 nm4 Exp $
+
 use strict;
 
 # Script to hack around xsl:import paths; ideally, the system catalogs are used.
diff --git a/doc/doc-docbook/PageLabelPDF b/doc/doc-docbook/PageLabelPDF
index 5819d11c4..454d0ec4a 100755
--- a/doc/doc-docbook/PageLabelPDF
+++ b/doc/doc-docbook/PageLabelPDF
@@ -1,7 +1,5 @@
 #! /usr/bin/perl -w
 
-# $Cambridge: exim/doc/doc-docbook/PageLabelPDF,v 1.2 2006/04/04 14:03:49 ph10 Exp $
-
 # Program to add page label information to the PDF output file. I have not
 # found a way of automatically discovering the number of frontmatter pages
 # in the document. It is therefore taken as an argument to be inserted into the
diff --git a/doc/doc-docbook/Pre-xml b/doc/doc-docbook/Pre-xml
index b84d19784..6c017e7c8 100755
--- a/doc/doc-docbook/Pre-xml
+++ b/doc/doc-docbook/Pre-xml
@@ -1,7 +1,5 @@
 #! /usr/bin/perl
 
-# $Cambridge: exim/doc/doc-docbook/Pre-xml,v 1.4 2007/04/11 15:26:09 ph10 Exp $
-
 # Script to pre-process XML input before processing it for various purposes.
 # Options specify which transformations are to be done. Monospaced literal
 # layout blocks are never touched.
diff --git a/doc/doc-docbook/TidyInfo b/doc/doc-docbook/TidyInfo
index cfc27317f..409a79324 100755
--- a/doc/doc-docbook/TidyInfo
+++ b/doc/doc-docbook/TidyInfo
@@ -1,7 +1,5 @@
 #! /usr/bin/perl -w
 
-# $Cambridge: exim/doc/doc-docbook/TidyInfo,v 1.2 2007/04/17 13:06:09 ph10 Exp $
-
 # This is script to tidy up the Texinfo file that docbook2texi produces. We
 # have to change "conceptindex" and "optionindex" to "cindex" and "findex", and
 # we also have to add access to the index into the menus and a final node.
diff --git a/doc/doc-docbook/Tidytxt b/doc/doc-docbook/Tidytxt
index a628b6dcf..d218189ea 100755
--- a/doc/doc-docbook/Tidytxt
+++ b/doc/doc-docbook/Tidytxt
@@ -1,7 +1,5 @@
 #! /usr/bin/perl
 
-# $Cambridge: exim/doc/doc-docbook/Tidytxt,v 1.6 2008/02/04 17:18:18 fanf2 Exp $
-
 # Script to tidy up the output of w3m when it makes a text file. First we
 # convert sequences of blank lines into a single blank line, to get everything
 # uniform. Then we go through and insert blank lines before chapter and
diff --git a/doc/doc-docbook/filter.xfpt b/doc/doc-docbook/filter.xfpt
index 42d2910a1..7df7f4fc2 100644
--- a/doc/doc-docbook/filter.xfpt
+++ b/doc/doc-docbook/filter.xfpt
@@ -1,5 +1,3 @@
-. $Cambridge: exim/doc/doc-docbook/filter.xfpt,v 1.11 2010/05/29 19:26:31 nm4 Exp $
-
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the document that describes Exim's filtering
 . facilities. It is an xfpt document that is converted into DocBook XML for
diff --git a/doc/doc-docbook/index.html b/doc/doc-docbook/index.html
index c618fe75e..491f150bd 100644
--- a/doc/doc-docbook/index.html
+++ b/doc/doc-docbook/index.html
@@ -1,5 +1,4 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<!-- $Cambridge: exim/doc/doc-docbook/index.html,v 1.4 2008/02/26 11:46:33 fanf2 Exp $ -->
 <html>
 <head>
 <title>Exim 4 Documentation</title>
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f892f20ce..e92013522 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,5 +1,3 @@
-. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.88 2010/06/14 18:51:09 pdp Exp $
-.
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
 . converted into DocBook XML for subsequent conversion into printing and online
diff --git a/doc/doc-docbook/x2man b/doc/doc-docbook/x2man
index 030cc9853..e133e23ed 100755
--- a/doc/doc-docbook/x2man
+++ b/doc/doc-docbook/x2man
@@ -1,17 +1,8 @@
 #! /usr/bin/perl -w
 
-# $Cambridge: exim/doc/doc-docbook/x2man,v 1.7 2007/01/23 12:13:50 ph10 Exp $
-
 # Script to find the command line options in the DocBook source of the Exim
 # spec, and turn them into a man page, because people like that.
 
-
-
-
-##################################################
-#              Main Program                      #
-##################################################
-
 open(IN, "spec.xml") || die "Can't open spec.xml\n";
 open(OUT, ">exim.8" ) || die "Can't open exim.8\n";