summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2012-08-27 08:17:25 -0700
committerTodd Lyons <tlyons@exim.org>2012-08-27 08:17:25 -0700
commit97f42f10055f18c7f4c9230e6e88a02f31645a68 (patch)
treed73652615e4ade4dd1c75dc828d42cde817e31a8 /doc
parentca0ff207d1a768f65bf5d68e113aea6cf0a3cb1c (diff)
Bugtrack 1290 - Spec grammar fixes.
Submitted by Regid.
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt8
-rw-r--r--doc/doc-txt/ChangeLog1
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 9bec097b4..99de2870b 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -8144,7 +8144,7 @@ case the IP address is used on its own.
There are several types of pattern that require Exim to know the name of the
remote host. These are either wildcard patterns or lookups by name. (If a
complete hostname is given without any wildcarding, it is used to find an IP
-address to match against, as described in the section &<<SECThoslispatip>>&
+address to match against, as described in section &<<SECThoslispatip>>&
above.)
If the remote host name is not already known when Exim encounters one of these
@@ -8313,7 +8313,7 @@ use masked IP addresses in database queries, you can use the &%mask%& expansion
operator.
If the query contains a reference to &$sender_host_name$&, Exim automatically
-looks up the host name if has not already done so. (See section
+looks up the host name if it has not already done so. (See section
&<<SECThoslispatnam>>& for comments on finding host names.)
Historical note: prior to release 4.30, Exim would always attempt to find a
@@ -8513,7 +8513,7 @@ but the separating colon must still be included at line breaks. White space
surrounding the colons is ignored. For example:
.code
aol.com: spammer1 : spammer2 : ^[0-9]+$ :
- spammer3 : spammer4
+ spammer3 : spammer4
.endd
As in all colon-separated lists in Exim, a colon can be included in an item by
doubling.
@@ -27563,7 +27563,7 @@ encrypted = *
.endd
-.vitem &*hosts&~=&~*&<&'&~host&~list'&>
+.vitem &*hosts&~=&~*&<&'host&~list'&>
.cindex "&%hosts%& ACL condition"
.cindex "host" "ACL checking"
.cindex "&ACL;" "testing the client host"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6a80439cd..e3d2fc2b6 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -40,6 +40,7 @@ TL/03 Bugzilla 198 - Implement remove_header ACL modifier.
TL/04 Bugzilla 1281 - Spec typo.
Bugzilla 1283 - Spec typo.
+ Bugzilla 1290 - Spec grammar fixes.
TL/05 Bugzilla 1285 - Spec omission, fix docbook errors for spec.txt creation.