From ddea74fabbf9135b146f96dd0a2a71a4b7100a86 Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Thu, 23 Aug 2007 11:01:49 +0000
Subject: Add message_body_newlines.

---
 doc/doc-txt/ChangeLog       | 8 +++++---
 doc/doc-txt/NewStuff        | 7 ++++++-
 doc/doc-txt/OptionLists.txt | 3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9516dafbe..fd10f7b3c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.526 2007/08/23 10:16:51 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.527 2007/08/23 11:01:49 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -88,13 +88,15 @@ PH/18 If a system quota error occurred while trying to create the file for
       bounce if the delivery eventually timed out. Change 4.67/27 below applied
       only to a quota excession during the actual writing of the file.
 
-PH/10 It seems that peer DN values may contain newlines (and other non-printing
+PH/19 It seems that peer DN values may contain newlines (and other non-printing
       characters?) which causes problems in log lines. The DN values are now
       passed through string_printing() before being added to log lines.
 
-PH/11 Added the "servers=" facility to MySQL and PostgreSQL lookups. (Oracle
+PH/20 Added the "servers=" facility to MySQL and PostgreSQL lookups. (Oracle
       and InterBase are left for another time.)
 
+PH/21 Added message_body_newlines option.
+
 
 Exim version 4.67
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index f58687ddb..e18d215aa 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.156 2007/08/23 10:16:51 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.157 2007/08/23 11:01:49 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -151,6 +151,11 @@ Version 4.68
 
       ${lookup pgsql{servers=master/db/name/pw; UPDATE ...}
 
+11. The message_body_newlines option (default FALSE, for backwards
+    compatibility) can be used to control whether newlines are present in
+    $message_body and $message_body_end. If it is FALSE, they are replaced by
+    spaces.
+
 
 Version 4.67
 ------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 6c28ebdba..bb9880c6b 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.33 2007/06/27 11:01:51 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.34 2007/08/23 11:01:49 ph10 Exp $
 
 LISTS OF EXIM OPTIONS
 ---------------------
@@ -337,6 +337,7 @@ max_output                           integer         20K           pipe
 max_rcpt                             integer         100           smtp              1.60
 max_user_name_length                 integer         0             main
 mbx_format                           boolean         false         appendfile        2.10
+message_body_newlines                boolean         false         main              4.68
 message_body_visible                 integer         500           main
 message_id_header_domain             string*         unset         main              4.11
 message_id_header_text               string*         unset         main
-- 
cgit v1.2.3