Index: doc/src/sgml/extend.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v
retrieving revision 1.41
diff -c -c -r1.41 extend.sgml
*** doc/src/sgml/extend.sgml	1 Jun 2010 02:54:37 -0000	1.41
--- doc/src/sgml/extend.sgml	1 Jun 2010 03:17:46 -0000
***************
*** 273,278 ****
--- 273,280 ----
    &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,322 ****
--- 320,325 ----
     </para>
  
    </sect1>
+ -->
  
   </chapter>
Index: doc/src/sgml/release-9.0.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/release-9.0.sgml,v
retrieving revision 2.22
diff -c -c -r2.22 release-9.0.sgml
*** doc/src/sgml/release-9.0.sgml	17 May 2010 17:46:13 -0000	2.22
--- doc/src/sgml/release-9.0.sgml	1 Jun 2010 03:17:50 -0000
***************
*** 2519,2532 ****
  
       <listitem>
        <para>
!        Allow 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.
        </para>
       </listitem>
  
--- 2519,2534 ----
  
       <listitem>
        <para>
!        Simplify use of <productname>C++</> functions in backend code (Kurt
         Harriman, Peter Eisentraut)
        </para>
  
        <para>
!        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>