nm4 2009/11/05 19:37:00 GMT
Modified files:
exim-doc/doc-docbook spec.xfpt
exim-doc/doc-src FAQ.src
exim-doc/doc-txt Exim4.upgrade
Log:
Doc corrections from John Horne. Fixes: #899
Revision Changes Path
1.66 +9 -9 exim/exim-doc/doc-docbook/spec.xfpt
1.8 +2 -2 exim/exim-doc/doc-src/FAQ.src
1.2 +1 -1 exim/exim-doc/doc-txt/Exim4.upgrade
Index: spec.xfpt
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/spec.xfpt,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- spec.xfpt 5 Nov 2009 19:24:35 -0000 1.65
+++ spec.xfpt 5 Nov 2009 19:37:00 -0000 1.66
@@ -1,4 +1,4 @@
-. $Cambridge: exim/exim-doc/doc-docbook/spec.xfpt,v 1.65 2009/11/05 19:24:35 nm4 Exp $
+. $Cambridge: exim/exim-doc/doc-docbook/spec.xfpt,v 1.66 2009/11/05 19:37:00 nm4 Exp $
.
. /////////////////////////////////////////////////////////////////////////////
. This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -13462,7 +13462,7 @@
condition &`verify = helo`& is provided to make this possible.
Formerly, it was necessary also to set this option (&%helo_try_verify_hosts%&)
to force the check to occur. From release 4.53 onwards, this is no longer
-necessary. If the check has not been done before &`verify`& &`=`& &`helo`& is
+necessary. If the check has not been done before &`verify = helo`& is
encountered, it is done at that time. Consequently, this option is obsolete.
Its specification is retained here for backwards compatibility.
@@ -13484,7 +13484,7 @@
However, the EHLO or HELO command is not rejected if any of the checks
fail. Processing continues, but the result of the check is remembered, and can
-be detected later in an ACL by the &`verify`& &`=`& &`helo`& condition.
+be detected later in an ACL by the &`verify = helo`& condition.
.option helo_verify_hosts main "host list&!!" unset
.cindex "HELO verifying" "mandatory"
@@ -13540,8 +13540,8 @@
.vindex "&$sender_host_name$&"
After any kind of failure, the host name (in &$sender_host_name$&) remains
unset, and &$host_lookup_failed$& is set to the string &"1"&. See also
-&%dns_again_means_nonexist%&, &%helo_lookup_domains%&, and &`verify`& &`=`&
-&`reverse_host_lookup`& in ACLs.
+&%dns_again_means_nonexist%&, &%helo_lookup_domains%&, and
+&`verify = reverse_host_lookup`& in ACLs.
.option host_lookup_order main "string list" &`bydns:byaddr`&
@@ -25835,7 +25835,7 @@
latter is the one defined by &%acl_smtp_predata%&). Setting it tells Exim that
the current message is a submission from a local MUA. In this case, Exim
operates in &"submission mode"&, and applies certain fixups to the message if
-necessary. For example, it add a &'Date:'& header line if one is not present.
+necessary. For example, it adds a &'Date:'& header line if one is not present.
This control is not permitted in the &%acl_smtp_data%& ACL, because that is too
late (the message has already been created).
@@ -25848,7 +25848,7 @@
.vitem &*control&~=&~suppress_local_fixups*&
.cindex "submission fixups, suppressing"
This control applies to locally submitted (non TCP/IP) messages, and is the
-complement of &`control`& &`=`& &`submission`&. It disables the fixups that are
+complement of &`control = submission`&. It disables the fixups that are
normally applied to locally-submitted messages. Specifically:
.ilist
@@ -25877,12 +25877,12 @@
.ilist
Locally submitted, fixups applied: the default.
.next
-Locally submitted, no fixups applied: use &`control`& &`=`&
-&`suppress_local_fixups`&.
+Locally submitted, no fixups applied: use
+&`control = suppress_local_fixups`&.
.next
Remotely submitted, no fixups applied: the default.
.next
-Remotely submitted, fixups applied: use &`control`& &`=`& &`submission`&.
+Remotely submitted, fixups applied: use &`control = submission`&.
.endlist
Index: FAQ.src
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-src/FAQ.src,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FAQ.src 6 May 2005 08:28:16 -0000 1.7
+++ FAQ.src 5 Nov 2009 19:37:00 -0000 1.8
@@ -1,4 +1,4 @@
-## $Cambridge: exim/exim-doc/doc-src/FAQ.src,v 1.7 2005/05/06 08:28:16 ph10 Exp $
+## $Cambridge: exim/exim-doc/doc-src/FAQ.src,v 1.8 2009/11/05 19:37:00 nm4 Exp $
##
## This file is processed by Perl scripts to produce an ASCII and an HTML
## version. Lines starting with ## are omitted. The markup used with paragraphs
@@ -467,7 +467,7 @@
==> deny hosts = *.x.example
If at all possible, you should use IP addresses instead of host
- names in blocking lists in order to to avoid this problem.
+ names in blocking lists in order to avoid this problem.
You can use the \-bh-\ option to get more information about what is
happening at the start of a connection. However, note that the \-bh-\
@@ -2684,7 +2684,7 @@
Q0409: I want mail for any local part at certain virtual domains to go
to a single address for each domain.
-A0409: One way to to this is
+A0409: One way to do this is
==> virtual:
driver = redirect
Index: Exim4.upgrade
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/Exim4.upgrade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Exim4.upgrade 7 Oct 2004 15:04:35 -0000 1.1
+++ Exim4.upgrade 5 Nov 2009 19:37:00 -0000 1.2
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/Exim4.upgrade,v 1.1 2004/10/07 15:04:35 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/Exim4.upgrade,v 1.2 2009/11/05 19:37:00 nm4 Exp $
Upgrading Exim from Release 3.33 to 4.xx
----------------------------------------
@@ -1096,7 +1096,7 @@
controlled by ACLs.
. The auth_always_advertise option has been abolished because it depended on
- auth_hosts and and host_auth_accept_relay, both of which are no more. In its
+ auth_hosts and host_auth_accept_relay, both of which are no more. In its
place there is a new option called auth_advertise_hosts, whose default value
is *, meaning "advertise AUTH to all".
