Update README.UPDATING; fix typos in ChangeLog/NewStuff

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1fdfc126e1ec3f6ceafa4eb77cdf07dc54f9f988..3a6684f25115713220809983e46b2e48dc9be104 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -24,7 +24,7 @@ JH/04 Bug 1810: make continued-use of an open smtp transport connection
       non-noisy when a race steals the message being considered.
 
 JH/05 If main configuration option tls_certificate is unset, generate a
       non-noisy when a race steals the message being considered.
 
 JH/05 If main configuration option tls_certificate is unset, generate a

-      selfsigned certificate for inbound TLS connections.
+      self-signed certificate for inbound TLS connections.

 
 JH/06 Bug 165: hide more cases of password exposure - this time in expansions
       in rewrites and routers.
 
 JH/06 Bug 165: hide more cases of password exposure - this time in expansions
       in rewrites and routers.


@@ -90,7 +90,7 @@ JH/23 Bug 1874: fix continued use of a connection for further deliveries.
 
 JH/24 Bug 1832: Log EHLO response on getting conn-close response for HELO.
 
 
 JH/24 Bug 1832: Log EHLO response on getting conn-close response for HELO.
 

-JH/25 Decoding ACL controls is now done using a binary search; the sourcecode
+JH/25 Decoding ACL controls is now done using a binary search; the source code

       takes up less space and should be simpler to maintain.  Merge the ACL
       condition decode tables also, with similar effect.
 
       takes up less space and should be simpler to maintain.  Merge the ACL
       condition decode tables also, with similar effect.
 


@@ -121,10 +121,9 @@ PP/02 Unbreak build via pkg-config with new hash support when crypto headers
       are not in the system include path.
 
 JH/31 Fix longstanding bug with aborted TLS server connection handling.  Under
       are not in the system include path.
 
 JH/31 Fix longstanding bug with aborted TLS server connection handling.  Under

-      GnuTLS, when a sennsion startup failed (eg because the client disconnected)
+      GnuTLS, when a session startup failed (eg because the client disconnected)

       Exim did stdio operations after fclose.  This was exposed by a recent
       change which nulled out the file handle after the fclose.
       Exim did stdio operations after fclose.  This was exposed by a recent
       change which nulled out the file handle after the fclose.

-      

 
 
 Exim version 4.87
 
 
 Exim version 4.87

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 83ee4c3afe86b075721d3e5ecf0c556d1f90900e..ac196862772ae609a4e2d0581e2f21eb90c8f366 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -21,7 +21,7 @@ Version 4.88
     N can be 224, 256 (default), 384, 512.
     With GnuTLS 3.5.0 or later, only.
 
     N can be 224, 256 (default), 384, 512.
     With GnuTLS 3.5.0 or later, only.
 

- 5. Facility for named queues:  A commandline argument can specify
+ 5. Facility for named queues:  A command-line argument can specify

     the queue name for a queue operation, and an ACL modifier can set
     the queue to be used for a message.  A $queue_name variable gives
     visibility.
     the queue name for a queue operation, and an ACL modifier can set
     the queue to be used for a message.  A $queue_name variable gives
     visibility.


@@ -61,7 +61,7 @@ Version 4.88
     banner immediately after the SYN,ACK segment rather then waiting for
     another ACK - so saving up to one roundtrip time.  Because it requires
     previous communication with the peer (we save a cookie from it) this
     banner immediately after the SYN,ACK segment rather then waiting for
     another ACK - so saving up to one roundtrip time.  Because it requires
     previous communication with the peer (we save a cookie from it) this

-    will only become active on frequently-contected destinations.
+    will only become active on frequently-contacted destinations.

 
 
 Version 4.87
 
 
 Version 4.87


@@ -90,7 +90,7 @@ Version 4.87
     synonym of the latter).  Add support in base64 for certificates.
 
  8. New main configuration option "bounce_return_linesize_limit" to
     synonym of the latter).  Add support in base64 for certificates.
 
  8. New main configuration option "bounce_return_linesize_limit" to

-    avoid oversize bodies in bounces. The dafault value matches RFC
+    avoid oversize bodies in bounces. The default value matches RFC

     limits.
 
  9. New $initial_cwd expansion variable.
     limits.
 
  9. New $initial_cwd expansion variable.


@@ -110,7 +110,7 @@ Version 4.86
 
  5. Assorted options on malware= and spam= scanners.
 
 
  5. Assorted options on malware= and spam= scanners.
 

- 6. A commandline option to write a comment into the logfile.
+ 6. A command-line option to write a comment into the logfile.

 
  7. If built with EXPERIMENTAL_SOCKS feature enabled, the smtp transport can
     be configured to make connections via socks5 proxies.
 
  7. If built with EXPERIMENTAL_SOCKS feature enabled, the smtp transport can
     be configured to make connections via socks5 proxies.


@@ -138,7 +138,7 @@ Version 4.85
 ------------
 
  1. If built with EXPERIMENTAL_DANE feature enabled, Exim will follow the
 ------------
 
  1. If built with EXPERIMENTAL_DANE feature enabled, Exim will follow the

-    DANE smtp draft to assess a secure chain of trust of the certificate
+    DANE SMTP draft to assess a secure chain of trust of the certificate

     used to establish the TLS connection based on a TLSA record in the
     domain of the sender.
 
     used to establish the TLS connection based on a TLSA record in the
     domain of the sender.
 


@@ -334,7 +334,7 @@ Version 4.82
 16. New authenticated_sender logging option, adding to log field "A".
 
 17. New expansion variables $router_name and $transport_name.  Useful
 16. New authenticated_sender logging option, adding to log field "A".
 
 17. New expansion variables $router_name and $transport_name.  Useful

-    particularly for debug_print as -bt commandline option does not
+    particularly for debug_print as -bt command-line option does not

     require privilege whereas -d does.
 
 18. If built with EXPERIMENTAL_PRDR, per-recipient data responses per a
     require privilege whereas -d does.
 
 18. If built with EXPERIMENTAL_PRDR, per-recipient data responses per a

diff --git a/src/README.UPDATING b/src/README.UPDATING
index 590642f3e569e2047f8b4dbe66e4a8059ef4d120..8cb59e91e4c3a708652a4e3e9c5f395d00342dcb 100644 (file)
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -26,6 +26,17 @@ The rest of this document contains information about changes in 4.xx releases
 that might affect a running system.
 
 
 that might affect a running system.
 
 

+Exim version 4.88
+-----------------
+
+ * The "demime" ACL condition, deprecated for the past 10 years, has
+   now been removed.
+
+ * Old GnuTLS configuration options "gnutls_require_kx", "gnutls_require_mac",
+   and "gnutls_require_protocols" have now been removed.  (Inoperative from
+   4.80, per below; logging warnings since 4.83, again per below).
+
+

 Exim version 4.83
 -----------------
 
 Exim version 4.83
 -----------------