X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0b23848a94f10065be92d0e06382cff4236dcb89..7eadfc98f838189605169769d95bf3a9fc51bc7b:/doc/doc-docbook/spec.xfpt

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 7b5d5c44a..5e9f1ffbe 100644
--- 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.50 2009/06/11 14:07:57 tom Exp $
+. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.53 2009/06/30 20:03:17 tom Exp $
 .
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -172,17 +172,17 @@
 <bookinfo>
 <title>Specification of the Exim Mail Transfer Agent</title>
 <titleabbrev>The Exim MTA</titleabbrev>
-<date>23 August 2007</date>
+<date>09 June 2009</date>
 <author><firstname>Philip</firstname><surname>Hazel</surname></author>
 <authorinitials>PH</authorinitials>
 <affiliation><orgname>University of Cambridge Computing Service</orgname></affiliation>
 <address>New Museums Site, Pembroke Street, Cambridge CB2 3QH, England</address>
 <revhistory><revision>
-  <revnumber>4.68</revnumber>
-  <date>23 August 2007</date>
+  <revnumber>4.70</revnumber>
+  <date>10 June 2009</date>
   <authorinitials>PH</authorinitials>
 </revision></revhistory>
-<copyright><year>2007</year><holder>University of Cambridge</holder></copyright>
+<copyright><year>2009</year><holder>University of Cambridge</holder></copyright>
 </bookinfo>
 .literal off
 
@@ -34293,21 +34293,24 @@ 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]%&
+.option dkim_domain smtp string&!! unset
+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]%&
+.option dkim_selector smtp string&!! unset
+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]%&
+.option dkim_private_key smtp string&!! unset
+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,27 +34320,29 @@ 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]%&
+.option dkim_canon smtp string&!! unset
+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]%&
+.option dkim_strict smtp string&!! unset
+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]%&
+.option dkim_sign_headers smtp string&!! unset
+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.
 
 
 
-
 . ////////////////////////////////////////////////////////////////////////////
 . ////////////////////////////////////////////////////////////////////////////