Tsearch2 functionality migrates to core. The bulk of this work is by

Oleg Bartunov and Teodor Sigaev, but I did a lot of editorializing,
so anything that's broken is probably my fault.

Documentation is nonexistent as yet, but let's land the patch so we can
get some portability testing done.

2 files changed, 32 insertions, 8 deletions

diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 99cc22958f2..f1d882a11e4 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.206 2007/08/04 01:26:53 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.207 2007/08/21 01:11:11 tgl Exp $ -->
 
  <chapter id="datatype">
   <title id="datatype-title">Data Types</title>
@@ -3485,6 +3485,14 @@ SET xmloption TO { DOCUMENT | CONTENT };
    </indexterm>
 
    <indexterm zone="datatype-oid">
+    <primary>regconfig</primary>
+   </indexterm>
+
+   <indexterm zone="datatype-oid">
+    <primary>regdictionary</primary>
+   </indexterm>
+
+   <indexterm zone="datatype-oid">
     <primary>xid</primary>
    </indexterm>
 
@@ -3505,9 +3513,9 @@ SET xmloption TO { DOCUMENT | CONTENT };
     configuration variable is enabled.  Type <type>oid</> represents
     an object identifier.  There are also several alias types for
     <type>oid</>: <type>regproc</>, <type>regprocedure</>,
-    <type>regoper</>, <type>regoperator</>, <type>regclass</>, and
-    <type>regtype</>. <xref linkend="datatype-oid-table"> shows an
-    overview.
+    <type>regoper</>, <type>regoperator</>, <type>regclass</>,
+    <type>regtype</>, <type>regconfig</>, and <type>regdictionary</>.
+    <xref linkend="datatype-oid-table"> shows an overview.
    </para>
 
    <para>
@@ -3614,6 +3622,20 @@ SELECT * FROM pg_attribute
         <entry>data type name</entry>
         <entry><literal>integer</></entry>
        </row>
+
+       <row>
+        <entry><type>regconfig</></entry>
+        <entry><structname>pg_ts_config</></entry>
+        <entry>text search configuration</entry>
+        <entry><literal>english</></entry>
+       </row>
+
+       <row>
+        <entry><type>regdictionary</></entry>
+        <entry><structname>pg_ts_dict</></entry>
+        <entry>text search dictionary</entry>
+        <entry><literal>simple</></entry>
+       </row>
       </tbody>
      </tgroup>
     </table>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 2bb1ff1d757..bc9abc689cb 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.387 2007/08/19 03:23:30 adunstan Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.388 2007/08/21 01:11:11 tgl Exp $ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
@@ -10794,7 +10794,9 @@ SELECT relname FROM pg_class WHERE pg_table_is_visible(oid);
     All these functions require object OIDs to identify the object to be
     checked.  If you want to test an object by name, it is convenient to use
     the OID alias types (<type>regclass</>, <type>regtype</>,
-    <type>regprocedure</>, or <type>regoperator</>), for example:
+    <type>regprocedure</>, <type>regoperator</>, <type>regconfig</>,
+    or <type>regdictionary</>),
+    for example:
 <programlisting>
 SELECT pg_type_is_visible('myschema.widget'::regtype);
 </programlisting>
@@ -11255,8 +11257,8 @@ SELECT set_config('log_statement_stats', 'off', false);
    <para>
     <function>pg_rotate_logfile</> signals the log-file manager to switch
     to a new output file immediately.  This works only when the built-in
-	log collector is running, since otherwise there is no log-file manager 
-	subprocess.
+    log collector is running, since otherwise there is no log-file manager 
+    subprocess.
    </para>
 
    <indexterm zone="functions-admin">