From 5daafafe74e23f9e6a8971820b4233565a837b77 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Sat, 7 Nov 2015 17:09:04 -0500
Subject: Update 9.5 release notes through today.

---
 doc/src/sgml/release-9.5.sgml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index 771ad0ca6fa..64057c3f8a3 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -7,7 +7,7 @@
   <note>
    <title>Release Date</title>
    <simpara>2015-??-??</simpara>
-   <simpara>Current as of 2015-10-03</simpara>
+   <simpara>Current as of 2015-11-07</simpara>
   </note>
 
   <sect2>
@@ -170,10 +170,11 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 
     <listitem>
 <!--
+2015-10-20 [b06f1f2] Robert..: Put back ssl_renegotiation_limit parameter, bu..
 2015-07-28 [6087d95] Andres..: Remove ssl renegotiation support.
 -->
      <para>
-      Remove server configuration
+      Disable server configuration
       parameter <varname>ssl_renegotiation_limit</>, which was deprecated
       in earlier releases (Andres Freund)
      </para>
@@ -183,6 +184,9 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
       bugs to be considered a net negative in practice, and it is due to be
       removed from future versions of the relevant standards.  We have
       therefore removed support for it from <productname>PostgreSQL</>.
+      The <varname>ssl_renegotiation_limit</> parameter still exists, but
+      cannot be set to anything but zero (disabled).  It's not documented
+      anymore, either.
      </para>
     </listitem>
 
-- 
cgit v1.2.3