My understanding of the new dnsdb txt lookup syntax was flawed.

Fixed the description and the last example.

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 6f912fd4dd6fc70317d32f18c3c097fdbcaa0718..e15453caa98391a09ae28b527bb34f4d148ac931 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.163 2010/06/01 11:13:54 pdp Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.164 2010/06/01 11:21:30 pdp Exp $
 
 New Features in Exim
 --------------------
@@ -25,21 +25,20 @@ Version 4.72
     in the presence of multiple character strings within the RR. Prior to 4.70,
     only the first string would be returned.  The dnsdb lookup now, by default,
     preserves the pre-4.70 semantics, but also now takes an extended output
-    separator specification. The first output separator is used to join
-    multiple TXT records together; use a second separator character, followed
-    by a colon, to join the strings within a TXT record on that second
-    character, or use a semicolon to concatenate strings within a TXT record
-    with no separator.  Administrators are reminded that DNS provides no
-    ordering guarantees between multiple records in an RRset.  For example:
+    separator specification.  The separator can be followed by a semicolon, to
+    concatenate the individual text strings together with no join character,
+    or by a comma and a second separator character, in which case the text
+    strings within a TXT record are joined on that second character.
+    Administrators are reminded that DNS provides no ordering guarantees
+    between multiple records in an RRset.  For example:
 
       foo.example.  IN TXT "a" "b" "c"
       foo.example.  IN TXT "d" "e" "f"
 
       ${lookup dnsdb{>/ txt=foo.example}}   -> "a/d"
       ${lookup dnsdb{>/; txt=foo.example}}  -> "def/abc"
-      ${lookup dnsdb{>/+: txt=foo.example}} -> "a+b+c/d+e+f"
+      ${lookup dnsdb{>/,+ txt=foo.example}} -> "a+b+c/d+e+f"
 
-    Some character combinations are currently unsupported.
 
 Version 4.70 / 4.71
 -------------------