Gitweb:
http://git.exim.org/exim.git/commitdiff/ca0ff207d1a768f65bf5d68e113aea6cf0a3cb1c
Commit: ca0ff207d1a768f65bf5d68e113aea6cf0a3cb1c
Parent: 7a2a9617ee69a2eb55b030d6f2a03b3dc5308d8e
Author: Todd Lyons <tlyons@???>
AuthorDate: Thu Aug 16 08:37:49 2012 -0700
Committer: Todd Lyons <tlyons@???>
CommitDate: Thu Aug 16 08:37:49 2012 -0700
Bugtrack 1285 - Add docs for omitted dkim_disable_verify.
Fixed spec docbook file to pass validation when building spec.txt.
Adjust Makefile to not delete html, but not version controlled
index.html.
---
doc/doc-docbook/Makefile | 3 +-
doc/doc-docbook/spec.xfpt | 51 +++++++++++++++++++++++++-------------------
doc/doc-txt/ChangeLog | 3 ++
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index f39c012..7f3f071 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -282,7 +282,8 @@ os-fixup:
clean:; /bin/rm -rf exim.8 \
filter*.xml spec*.xml test*.xml \
- *.fo *.html *.pdf *.ps \
+ *.fo *.pdf *.ps \
+ filter*.html spec*.html test*.html \
filter*.txt spec*.txt test*.txt \
*.info* *.texinfo *.texi
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index fd2d632..9bec097 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -12871,9 +12871,7 @@ listed in more than one group.
.section "TLS" "SECID108"
.table2
.row &%gnutls_compat_mode%& "use GnuTLS compatibility mode"
-.new
.row &%gnutls_enable_pkcs11%& "allow GnuTLS to autoload PKCS11 modules"
-.wen
.row &%openssl_options%& "adjust OpenSSL compatibility options"
.row &%tls_advertise_hosts%& "advertise TLS to these hosts"
.row &%tls_certificate%& "location of server certificate"
@@ -13023,9 +13021,7 @@ See also the &'Policy controls'& section above.
.row &%dns_ipv4_lookup%& "only v4 lookup for these domains"
.row &%dns_retrans%& "parameter for resolver"
.row &%dns_retry%& "parameter for resolver"
-.new
.row &%dns_use_dnssec%& "parameter for resolver"
-.wen
.row &%dns_use_edns0%& "parameter for resolver"
.row &%hold_domains%& "hold delivery for these domains"
.row &%local_interfaces%& "for routing checks"
@@ -27045,24 +27041,6 @@ sender when the destination system is doing content-scan based rejection.
.new
-.vitem &*control&~=&~dscp/*&<&'value'&>
-.cindex "&ACL;" "setting DSCP value"
-.cindex "DSCP" "inbound"
-This option causes the DSCP value associated with the socket for the inbound
-connection to be adjusted to a given value, given as one of a number of fixed
-strings or to numeric value.
-The &%-bI:dscp%& option may be used to ask Exim which names it knows of.
-Common values include &`throughput`&, &`mincost`&, and on newer systems
-&`ef`&, &`af41`&, etc. Numeric values may be in the range 0 to 0x3F.
-
-The outbound packets from Exim will be marked with this value in the header
-(for IPv4, the TOS field; for IPv6, the TCLASS field); there is no guarantee
-that these values will have any effect, not be stripped by networking
-equipment, or do much of anything without cooperation with your Network
-Engineer and those of all network operators between the source and destination.
-.wen
-
-
.vitem &*control&~=&~debug/*&<&'options'&>
.cindex "&ACL;" "enabling debug logging"
.cindex "debugging" "enabling from an ACL"
@@ -27079,6 +27057,35 @@ contexts):
control = debug/opts=+expand+acl
control = debug/tag=.$message_exim_id/opts=+expand
.endd
+.wen
+
+
+.new
+.vitem &*control&~=&~dkim_disable_verify*&
+.cindex "disable DKIM verify"
+.cindex "DKIM" "disable verify"
+This control turns off DKIM verification processing entirely. For details on
+the operation and configuration of DKIM, see chapter &<<CHID12>>&.
+.wen
+
+
+.new
+.vitem &*control&~=&~dscp/*&<&'value'&>
+.cindex "&ACL;" "setting DSCP value"
+.cindex "DSCP" "inbound"
+This option causes the DSCP value associated with the socket for the inbound
+connection to be adjusted to a given value, given as one of a number of fixed
+strings or to numeric value.
+The &%-bI:dscp%& option may be used to ask Exim which names it knows of.
+Common values include &`throughput`&, &`mincost`&, and on newer systems
+&`ef`&, &`af41`&, etc. Numeric values may be in the range 0 to 0x3F.
+
+The outbound packets from Exim will be marked with this value in the header
+(for IPv4, the TOS field; for IPv6, the TCLASS field); there is no guarantee
+that these values will have any effect, not be stripped by networking
+equipment, or do much of anything without cooperation with your Network
+Engineer and those of all network operators between the source and destination.
+.wen
.vitem &*control&~=&~enforce_sync*& &&&
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6a36fc0..6a80439 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -39,6 +39,9 @@ TL/03 Bugzilla 198 - Implement remove_header ACL modifier.
Patch by Magnus Holmgren from 2007-02-20.
TL/04 Bugzilla 1281 - Spec typo.
+ Bugzilla 1283 - Spec typo.
+
+TL/05 Bugzilla 1285 - Spec omission, fix docbook errors for spec.txt creation.
JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.
