diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index abacd71d743..a5115693391 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/extend.sgml,v 1.41 2010/06/01 02:54:37 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/extend.sgml,v 1.42 2010/06/01 03:19:36 momjian Exp $ -->
 
  <chapter id="extend">
   <title>Extending <acronym>SQL</acronym></title>
@@ -273,6 +273,8 @@
   &xoper;
   &xindex;
 
+<!-- Use this someday when C++ is easier to use. bjm 2010-05-31
+
   <sect1 id="extend-Cpp">
    <title>Using C++ for Extensibility</title>
 
@@ -318,5 +320,6 @@
    </para>
 
   </sect1>
+-->
 
  </chapter>
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index 20269adfe14..960558ea6fa 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release-9.0.sgml,v 2.22 2010/05/17 17:46:13 adunstan Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release-9.0.sgml,v 2.23 2010/06/01 03:19:36 momjian Exp $ -->
 
  <sect1 id="release-9-0">
   <title>Release 9.0</title>
@@ -2519,14 +2519,16 @@ recovery_connections -> hot_standby
 
      <listitem>
       <para>
-       Allow use of <productname>C++</> functions in backend code (Kurt
+       Simplify use of <productname>C++</> functions in backend code (Kurt
        Harriman, Peter Eisentraut)
       </para>
 
       <para>
-       This removes keyword conflicts that previously made <productname>C++</>
-       usage difficult in backend code. <literal>extern "C" { }</> might still
-       be necessary.
+       While this removes keyword conflicts that previously made
+       <productname>C++</> usage difficult in backend code, there are
+       still other complexities when using <productname>C++</> for backend
+       functions. <literal>extern "C" { }</> is still necessary in
+       some cases.
       </para>
      </listitem>