From 8a5592daf1bcc65f002fce23de1ee0e533e6c6a6 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 22 Aug 2007 05:13:50 +0000
Subject: Remove option to change parser of an existing text search
 configuration. This prevents needing to do complex and poorly-defined updates
 of the mapping table if the new parser has different token types than the
 old. Per discussion.

---
 doc/src/sgml/ref/alter_tsconfig.sgml  | 30 +++---------------------------
 doc/src/sgml/ref/create_tsconfig.sgml |  9 ++++-----
 2 files changed, 7 insertions(+), 32 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml
index 295ba1df647..e40f34fd619 100644
--- a/doc/src/sgml/ref/alter_tsconfig.sgml
+++ b/doc/src/sgml/ref/alter_tsconfig.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.2 2007/08/22 05:13:50 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -20,9 +20,6 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> (
-    PARSER = <replaceable class="parameter">parser_name</replaceable>
-)
 ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
     ADD MAPPING FOR <replaceable class="parameter">token_type</replaceable> [, ... ] WITH <replaceable class="parameter">dictionary_name</replaceable> [, ... ]
 ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
@@ -43,8 +40,8 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replac
 
   <para>
    <command>ALTER TEXT SEARCH CONFIGURATION</command> changes the definition of
-   a text search configuration.  You can change which parser it uses, modify
-   its mapping from token types to dictionaries,
+   a text search configuration.  You can modify
+   its mappings from token types to dictionaries,
    or change the configuration's name or owner.
   </para>
 
@@ -68,15 +65,6 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replac
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><replaceable class="parameter">parser_name</replaceable></term>
-    <listitem>
-     <para>
-      The name of a new text search parser to use for this configuration.
-     </para>
-    </listitem>
-   </varlistentry>
-
    <varlistentry>
     <term><replaceable class="parameter">token_type</replaceable></term>
     <listitem>
@@ -154,19 +142,7 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replac
   </para>
 
  </refsect1>
-  
- <refsect1>
-  <title>Notes</title>
 
-  <para>
-   While changing the text search parser used by a configuration is allowed,
-   this will only work nicely if old and new parsers use the same set of
-   token types.  It is advisable to drop the mappings for any incompatible
-   token types before changing parsers.
-  </para>
-
- </refsect1>
-  
  <refsect1>
   <title>Examples</title>
 
diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml
index 49be9411d56..048cb63ce9a 100644
--- a/doc/src/sgml/ref/create_tsconfig.sgml
+++ b/doc/src/sgml/ref/create_tsconfig.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsconfig.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsconfig.sgml,v 1.2 2007/08/22 05:13:50 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -98,10 +98,9 @@ CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceabl
   <title>Notes</title>
 
   <para>
-   It is allowed to specify both <literal>PARSER</> and <literal>COPY</>,
-   resulting in the specified parser being used with whatever mappings
-   are in the source configuration.  This is generally inadvisable,
-   unless you know that both parsers involved use the same token type set.
+   The <literal>PARSER</> and <literal>COPY</> options are mutually
+   exclusive, because when an existing configuration is copied, its
+   parser selection is copied too.
   </para>
 
  </refsect1>
-- 
cgit v1.2.3