Update experimental-spec and comment on the name of the SPF trace header - it's now...

diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 783235ed05538c4295c8e4e4cd8465ea1c6d1db6..8ca491c1ab33e72a464e97fc88c4a748b5d72d4a 100644 (file)
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/experimental-spec.txt,v 1.6 2005/07/23 20:19:09 tom Exp $
+$Cambridge: exim/doc/doc-txt/experimental-spec.txt,v 1.7 2007/07/27 13:56:24 magnus Exp $

 
 From time to time, experimental features may be added to Exim.
 While a feature  is experimental, there  will be a  build-time
 
 From time to time, experimental features may be added to Exim.
 While a feature  is experimental, there  will be a  build-time


@@ -642,7 +642,7 @@ variables.
   it for logging purposes.
 
   $spf_received
   it for logging purposes.
 
   $spf_received

-  This contains a complete SPF-Received: header that can be
+  This contains a complete Received-SPF: header that can be

   added to the message. Please note that according to the SPF
   draft, this header must be added at the top of the header
   list. Please see section 10 on how you can do this.
   added to the message. Please note that according to the SPF
   draft, this header must be added at the top of the header
   list. Please see section 10 on how you can do this.

diff --git a/src/src/globals.h b/src/src/globals.h
index 920267d9d217a7445ce9d0aa0f83489b53238dea..fd20c9426c417b78ba078c2fbf20cddf26908fba 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.h,v 1.56 2007/06/27 11:01:52 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.h,v 1.57 2007/07/27 13:56:24 magnus Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -688,7 +688,7 @@ extern uschar *spam_score_int;         /* spam_score * 10 (int) */
 #endif
 #ifdef EXPERIMENTAL_SPF
 extern uschar *spf_header_comment;     /* spf header comment */
 #endif
 #ifdef EXPERIMENTAL_SPF
 extern uschar *spf_header_comment;     /* spf header comment */

-extern uschar *spf_received;           /* SPF-Received: header */
+extern uschar *spf_received;           /* Received-SPF: header */

 extern uschar *spf_result;             /* spf result in string form */
 extern uschar *spf_smtp_comment;       /* spf comment to include in SMTP reply */
 #endif
 extern uschar *spf_result;             /* spf result in string form */
 extern uschar *spf_smtp_comment;       /* spf comment to include in SMTP reply */
 #endif