Text search documentation word improvements; move configuration section

to be more logical.

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 9ec780b4c9577bbb33e7cf5b30df07e6889d33ec..6e56fa4335fe0d264ceeb4e8b7b4fef3f31cfc06 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Functions and Operators
@@ -7552,7 +7552,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
 
 
  
-  Full Text Search <span class="marked">Operators and Function</span>s
+  Full Text Search <span class="marked">Functions and Operator</span>s
 
   
    This section outlines all the functions and operators that are available

diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index 87e24a019d976477a939b789163726a2512e7d77..46075890012e1007145ae6dcd848edbf94c98148 100644 (file)
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -231,8 +231,8 @@ SELECT 'fat & cow'::tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::t
     is equivalent to to_tsvector(x) @@ y.
     The form text @@ text
     is equivalent to to_tsvector(x) @@ plainto_tsquery(y).
-     contains a full list of full text
-    search operators and functions.
+     contains a complete list of full text
+    search functions and operators.
    
 
   
@@ -250,13 +250,23 @@ SELECT 'fat & cow'::tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::t
     This functionality is controlled by configurations.
     Fortunately, PostgreSQL comes with predefined
     configurations for many languages.  (psql's \dF
-    shows all predefined configurations.)  During installation an appropriate
-    configuration was selected and 
-    linkend="guc-default-text-search-config"> was set accordingly.  If you
-    need to change it, see .
+    shows all predefined configurations.)
+   
+
+   
+    During installation an appropriate configuration was selected and
+     was set accordingly
+    in postgresql.conf.  If you are using the same text search
+    configuration for the entire cluster you can use the value in
+    postgresql.conf.  If using different configurations but
+    the same text search configuration for an entire database,
+    use ALTER DATABASE ... SET.  If not, you must set 
+    linkend="guc-default-text-search-config"> in each session.  Many
+    functions also take an optional configuration name.
    
 
   
+
  
 
  
@@ -1781,35 +1791,6 @@ SHOW default_text_search_config;
 
   
 
-  
-   Managing Multiple Configurations
-
-   
-    If you are using the same text search configuration for the entire cluster
-    just set the value in postgresql.conf.  If using a single
-    text search configuration for an entire database, use ALTER
-    DATABASE ... SET.
-   
-
-   
-    However, if you need to use several text search configurations in the same
-    database you must be careful to reference the proper text search
-    configuration.  This can be done by either setting
-    default_text_search_config in each session or supplying the
-    configuration name in every function call, e.g.  to_tsquery('french',
-    'friend'), to_tsvector('english', col).  If you are using an expression
-    index you must embed the configuration name into the expression index, e.g.:
-
-
-CREATE INDEX pgweb_idx ON pgweb USING gin(to_tsvector('french', title || body));
-
-
-    And for an expression index, specify the configuration name in the
-    WHERE clause as well so the expression index will be used.
-   
-
-  
-