diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index 927004a8c84..033cd327912 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -149,7 +149,8 @@
    <title>What Is a <firstterm>Document</firstterm>?</title>
 
    <indexterm zone="textsearch-document">
-   <primary>document</primary>
+    <primary>text search</primary>
+    <secondary>document</secondary>
    </indexterm>
 
    <para>
@@ -240,7 +241,8 @@ SELECT 'fat &amp; cow'::tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::t
    <title>Configurations</title>
 
    <indexterm zone="textsearch-configurations">
-   <primary>configurations</primary>
+   <primary>text search</primary>
+   <secondary>configurations</secondary>
    </indexterm>
 
    <para>
@@ -543,7 +545,8 @@ UPDATE tt SET ti=
      <varlistentry>
 
       <indexterm zone="textsearch-parser">
-      <primary>parse</primary>
+      <primary>text search</primary>
+      <secondary>parse</secondary>
       </indexterm>
 
       <term>
@@ -576,7 +579,8 @@ SELECT * FROM ts_parse('default','123 - a number');
 
      <varlistentry>
       <indexterm zone="textsearch-parser">
-      <primary>ts_token_type</primary>
+      <primary>text search</primary>
+      <secondary>ts_token_type</secondary>
       </indexterm>
 
       <term>
@@ -663,7 +667,8 @@ SELECT * FROM ts_token_type('default');
      <varlistentry>
 
       <indexterm zone="textsearch-ranking">
-      <primary>ts_rank</primary>
+      <primary>text search</primary>
+      <secondary>ts_rank</secondary>
       </indexterm>
 
       <term>
@@ -699,7 +704,8 @@ SELECT * FROM ts_token_type('default');
      <varlistentry>
 
       <indexterm zone="textsearch-ranking">
-      <primary>ts_rank_cd</primary>
+      <primary>text search</primary>
+      <secondary>ts_rank_cd</secondary>
       </indexterm>
 
       <term>
@@ -849,7 +855,8 @@ ORDER BY rnk DESC LIMIT 10;
    <title>Highlighting Results</title>
 
    <indexterm zone="textsearch-headline">
-   <primary>headline</primary>
+   <primary>text search</primary>
+   <secondary>headline</secondary>
    </indexterm>
 
    <para>
@@ -1569,7 +1576,8 @@ CREATE TEXT SEARCH DICTIONARY english_stem (
      <varlistentry>
 
       <indexterm zone="textsearch-dictionaries">
-      <primary>ts_lexize</primary>
+      <primary>text search</primary>
+      <secondary>ts_lexize</secondary>
       </indexterm>
 
       <term>
@@ -1798,8 +1806,8 @@ SHOW default_text_search_config;
   <title>GiST and GIN Index Types</title>
 
   <indexterm zone="textsearch-indexes">
-   <primary>index</primary>
-   <secondary>full text</secondary>
+   <primary>text search</primary>
+   <secondary>index</secondary>
   </indexterm>
 
 
@@ -1813,8 +1821,12 @@ SHOW default_text_search_config;
     <varlistentry>
 
      <indexterm zone="textsearch-indexes">
-     <primary>index</primary>
-     <secondary>GIST, for text searching</secondary>
+     <primary>text search</primary>
+     <secondary>GIST</secondary>
+     </indexterm>
+
+     <indexterm zone="textsearch-indexes">
+     <primary>GIST</primary>
      </indexterm>
 
      <term>
@@ -1835,10 +1847,14 @@ SHOW default_text_search_config;
     <varlistentry>
 
      <indexterm zone="textsearch-indexes">
-     <primary>index</primary>
+     <primary>text search</primary>
      <secondary>GIN</secondary>
      </indexterm>
 
+     <indexterm zone="textsearch-indexes">
+     <primary>GIN</primary>
+     </indexterm>
+
      <term>
       <synopsis>
        CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING gin(<replaceable>column</replaceable>);