Fix errors preventing compilation

diff --git a/doc/doc-docbook/MyStyle-chunk-html.xsl b/doc/doc-docbook/MyStyle-chunk-html.xsl
index 0fef8e62a77d0be68d4d86b38bd269de7b072f95..c323a72bff86eec55a9c1a3da52fa4dd04b3e97a 100644 (file)
--- a/doc/doc-docbook/MyStyle-chunk-html.xsl
+++ b/doc/doc-docbook/MyStyle-chunk-html.xsl
@@ -1,4 +1,4 @@
-<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-chunk-html.xsl,v 1.3 2006/12/19 12:28:35 ph10 Exp $ -->
+<!-- $Cambridge: exim/doc/doc-docbook/MyStyle-chunk-html.xsl,v 1.4 2009/06/30 17:36:39 tom Exp $ -->
 
 <!-- This stylesheet driver imports the DocBook XML stylesheet for chunked
 HTML output, and then imports my common stylesheet for HTML output. Finally, it
@@ -7,7 +7,7 @@ section chunking). -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/chunk.xsl"/>
+<xsl:import href="/home/tom/share/xml/docbook/xsl/1.73.2/xhtml/chunk.xsl"/>
 <xsl:import href="MyStyle-html.xsl"/>
 
 

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index e29ce12a1c7b8dc0d227400aab991668ddb2a8e5..2dbe124a9970724de57d0c73ad18f64f4764c299 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,4 +1,4 @@
-. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.51 2009/06/11 14:08:48 tom Exp $
+. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.52 2009/06/30 17:36:39 tom Exp $
 .
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -34293,21 +34293,22 @@ different signature context.
 Signing is implemented by setting private options on the SMTP transport.
 These options take (expandable) strings as arguments.
 
-.vitem &%dkim_domain = <expanded string> [MANDATORY]%&
+.vlist
+.vitem dkim_domain = <expanded string> [MANDATORY]
 The domain you want to sign with. The result of this expanded
 option is put into the $dkim_domain expansion variable.
 
-.vitem &%dkim_selector = <expanded string> [MANDATORY]%&
+.vitem dkim_selector = <expanded string> [MANDATORY]
 This sets the key selector string. You can use the $dkim_domain expansion
 variable to look up a matching selector. The result is put in the expansion
 variable $dkim_selector which should be used in the dkim_private_key option
 along with $dkim_domain.
 
-.vitem &%dkim_private_key = <expanded string> [MANDATORY]%&
+.vitem dkim_private_key = <expanded string> [MANDATORY]
 This sets the private key to use. You can use the $dkim_domain and
 $dkim_selector expansion variables to determine the private key to use.
 The result can either
-.ulist
+.ilist
 be a valid RSA private key in ASCII armor, including line breaks.
 .next
 start with a slash, in which case it is treated as a file that contains
@@ -34317,24 +34318,24 @@ be "0", "false" or the empty string, in which case the message will not
 be signed. This case will not result in an error, even if dkim_strict is set.
 .endlist
 
-.vitem &%dkim_canon = <expanded string> [OPTIONAL]%&
+.vitem dkim_canon = <expanded string> [OPTIONAL]
 This option sets the canonicalization method used when signing a message.
 The DKIM RFC currently supports two methods: "simple" and "relaxed".
 The option defaults to "relaxed" when unset. Note: the current implementation
 only support using the same canonicalization method for both headers and body.
 
-.vitem &%dkim_strict = <expanded string> [OPTIONAL]%&
+.vitem dkim_strict = <expanded string> [OPTIONAL]
 This  option  defines  how  Exim  behaves  when  signing a message that
 should be signed fails for some reason.  When the expansion evaluates to
 either "1" or "true", Exim will defer. Otherwise Exim will send the message
 unsigned. You can use the $dkim_domain and $dkim_selector expansion
 variables here.
 
-.vitem &%dkim_sign_headers = <expanded string> [OPTIONAL]%&
+.vitem dkim_sign_headers = <expanded string> [OPTIONAL]
 When set, this option must expand to (or be specified as) a colon-separated
 list of header names. These headers will be included in the message
 signature. When unspecified, the headers recommended in RFC4871 will be used.
-
+.endlist