diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index 60cfeb2e34f1aaf36a53b4a18b5fe73062809b26..438a8ec8795a9d30014243e657b0b80c2e3fb397 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,10 +1,14 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.17 2002/09/21 18:32:53 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.18 2002/11/03 01:31:32 momjian Exp $
 -->
 
  <chapter id="extend">
   <title>Extending <acronym>SQL</acronym>: An Overview</title>
 
+   <indexterm zone="extend">
+    <primary>extending SQL</primary>
+   </indexterm>
+
   <para>
    In  the  sections  that follow, we will discuss how you
    can extend the <productname>PostgreSQL</productname> 
@@ -75,6 +79,15 @@ $Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.17 2002/09/21 18:32:53 pete
   <sect1 id="type-system">
    <title>The <productname>PostgreSQL</productname> Type System</title>
 
+   <indexterm zone="type-system">
+    <primary>extending SQL</primary>
+    <secondary>types</secondary>
+   </indexterm>
+
+   <indexterm zone="type-system">
+    <primary>data types</primary>
+   </indexterm>
+
    <para>
     The <productname>PostgreSQL</productname> type system
     can be broken down in several ways.
@@ -109,6 +122,10 @@ $Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.17 2002/09/21 18:32:53 pete
   <sect1 id="pg-system-catalogs">
    <title>About the <productname>PostgreSQL</productname> System Catalogs</title>
 
+   <indexterm zone="pg-system-catalogs">
+    <primary>catalogs</primary>
+   </indexterm>
+
    <para>
     Having  introduced the basic extensibility concepts, we
     can now take a look at how the  catalogs  are  actually
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 22fcddf57f1634162b0daf77eb5e532d650a03e4..5d779f520b78087378298e5113caef8277dd1b26 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.146 2002/10/20 01:43:32 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.147 2002/11/03 01:31:32 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1311,11 +1311,6 @@ env PGOPTIONS='-c geqo=off' psql
         Sets the client-side encoding for multibyte character sets.
 	The default is to use the database encoding.
        </para>
-       <para>
-        This option is only available if
-        <productname>PostgreSQL</productname> was built with multibyte
-        support.
-      </para>
       </listitem>
      </varlistentry>