From 293010a68afd5b3a1f1e7621d5c89ba422c21d09 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 11 Sep 2018 17:01:51 -0400
Subject: [PATCH] doc:  adjust PG 11 release notes

Fixes for channel binding, SQL procedures, and pg_trgm.

Backpatch-through: 11
---
 doc/src/sgml/release-11.sgml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/doc/src/sgml/release-11.sgml b/doc/src/sgml/release-11.sgml
index bc4b0a6f8e..684d34c091 100644
--- a/doc/src/sgml/release-11.sgml
+++ b/doc/src/sgml/release-11.sgml
@@ -1942,7 +1942,7 @@ same commits as above
 -->
 
        <para>
-        Add SQL procedures, which can start and commit their own
+        Add SQL-level procedures, which can start and commit their own
         transactions (Peter Eisentraut)
        </para>
 
@@ -2685,15 +2685,10 @@ same commits as above
        </para>
 
        <para>
-        While <acronym>SCRAM</acronym> always prevents the
-        replay of transmitted hashed passwords in a later session,
-        <acronym>SCRAM</acronym> with channel binding can also prevent
-        man-in-the-middle attacks.  However, since there is no way
-        to <emphasis>force</emphasis> channel binding in libpq,
-        the feature currently does not prevent man-in-the-middle
-        attacks when using libpq and interfaces built using it.  It is
-        expected that future versions of libpq and interfaces not built
-        using libpq, e.g. JDBC, will allow this capability.
+        <acronym>SCRAM</acronym> cannot prevent man-in-the-middle attacks
+        unless it can be forced.  Unfortunately, there is no way to do
+        this in libpq.  This is expected in future versions of libpq
+        and in interfaces not built using libpq, e.g. JDBC.
        </para>
       </listitem>
 
@@ -2835,7 +2830,7 @@ same commits as above
 -->
 
        <para>
-        Add <link linkend="pgtrgm"><application>pgtrgm</application></link>
+        Add <link linkend="pgtrgm"><application>pg_trgm</application></link>
         function <function>strict_word_similarity()</function> to compute
         the similarity of whole words (Alexander Korotkov)
        </para>
-- 
2.49.0