doc: Improve DocBook XML validity

DocBook XML is superficially compatible with DocBook SGML but has a slightly stricter DTD that we have been violating in a few cases. Although XSLT doesn't care whether the document is valid, the style sheets don't necessarily process invalid documents correctly, so we need to work toward fixing this. This first commit moves the indexterms in refentry elements to an allowed position. It has no impact on the output.
2025-12-21 05:21:08 +03:00 · 2014-02-23 21:25:35 -05:00
parent 769065c1b2
commit bb4eefe7bf
194 changed files with 1009 additions and 1009 deletions
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ABORT">
+ <indexterm zone="sql-abort">
+  <primary>ABORT</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ABORT</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>abort the current transaction</refpurpose>
 </refnamediv>

- <indexterm zone="sql-abort">
-  <primary>ABORT</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ABORT [ WORK | TRANSACTION ]
--- a/doc/src/sgml/ref/alter_aggregate.sgml
+++ b/doc/src/sgml/ref/alter_aggregate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERAGGREGATE">
+ <indexterm zone="sql-alteraggregate">
+  <primary>ALTER AGGREGATE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER AGGREGATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an aggregate function</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alteraggregate">
-  <primary>ALTER AGGREGATE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_collation.sgml
+++ b/doc/src/sgml/ref/alter_collation.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERCOLLATION">
+ <indexterm zone="sql-altercollation">
+  <primary>ALTER COLLATION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER COLLATION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a collation</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altercollation">
-  <primary>ALTER COLLATION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER COLLATION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_conversion.sgml
+++ b/doc/src/sgml/ref/alter_conversion.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERCONVERSION">
+ <indexterm zone="sql-alterconversion">
+  <primary>ALTER CONVERSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER CONVERSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a conversion</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterconversion">
-  <primary>ALTER CONVERSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER CONVERSION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERDATABASE">
+ <indexterm zone="sql-alterdatabase">
+  <primary>ALTER DATABASE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER DATABASE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change a database</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterdatabase">
-  <primary>ALTER DATABASE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/alter_default_privileges.sgml
+++ b/doc/src/sgml/ref/alter_default_privileges.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERDEFAULTPRIVILEGES">
+ <indexterm zone="sql-alterdefaultprivileges">
+  <primary>ALTER DEFAULT PRIVILEGES</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER DEFAULT PRIVILEGES</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define default access privileges</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterdefaultprivileges">
-  <primary>ALTER DEFAULT PRIVILEGES</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER DEFAULT PRIVILEGES
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERDOMAIN">
+ <indexterm zone="sql-alterdomain">
+  <primary>ALTER DOMAIN</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER DOMAIN</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -17,10 +21,6 @@ PostgreSQL documentation
  </refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterdomain">
-  <primary>ALTER DOMAIN</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/alter_event_trigger.sgml
+++ b/doc/src/sgml/ref/alter_event_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTEREVENTTRIGGER">
+ <indexterm zone="sql-altereventtrigger">
+  <primary>ALTER EVENT TRIGGER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER EVENT TRIGGER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an event trigger</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altereventtrigger">
-  <primary>ALTER EVENT TRIGGER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> DISABLE
--- a/doc/src/sgml/ref/alter_extension.sgml
+++ b/doc/src/sgml/ref/alter_extension.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTEREXTENSION">
+ <indexterm zone="sql-alterextension">
+  <primary>ALTER EXTENSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER EXTENSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -17,10 +21,6 @@ PostgreSQL documentation
  </refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterextension">
-  <primary>ALTER EXTENSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> UPDATE [ TO <replaceable class="PARAMETER">new_version</replaceable> ]
--- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERFOREIGNDATAWRAPPER">
+ <indexterm zone="sql-alterforeigndatawrapper">
+  <primary>ALTER FOREIGN DATA WRAPPER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER FOREIGN DATA WRAPPER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a foreign-data wrapper</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterforeigndatawrapper">
-  <primary>ALTER FOREIGN DATA WRAPPER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERFOREIGNTABLE">
+ <indexterm zone="sql-alterforeigntable">
+  <primary>ALTER FOREIGN TABLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER FOREIGN TABLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a foreign table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterforeigntable">
-  <primary>ALTER FOREIGN TABLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/alter_function.sgml
+++ b/doc/src/sgml/ref/alter_function.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERFUNCTION">
+ <indexterm zone="sql-alterfunction">
+  <primary>ALTER FUNCTION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER FUNCTION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a function</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterfunction">
-  <primary>ALTER FUNCTION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
--- a/doc/src/sgml/ref/alter_group.sgml
+++ b/doc/src/sgml/ref/alter_group.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERGROUP">
+ <indexterm zone="sql-altergroup">
+  <primary>ALTER GROUP</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER GROUP</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change role name or membership</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altergroup">
-  <primary>ALTER GROUP</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> ADD USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ]
--- a/doc/src/sgml/ref/alter_index.sgml
+++ b/doc/src/sgml/ref/alter_index.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERINDEX">
+ <indexterm zone="sql-alterindex">
+  <primary>ALTER INDEX</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER INDEX</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an index</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterindex">
-  <primary>ALTER INDEX</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
--- a/doc/src/sgml/ref/alter_language.sgml
+++ b/doc/src/sgml/ref/alter_language.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERLANGUAGE">
+ <indexterm zone="sql-alterlanguage">
+  <primary>ALTER LANGUAGE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER LANGUAGE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a procedural language</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterlanguage">
-  <primary>ALTER LANGUAGE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_large_object.sgml
+++ b/doc/src/sgml/ref/alter_large_object.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERLARGEOBJECT">
+ <indexterm zone="sql-alterlargeobject">
+  <primary>ALTER LARGE OBJECT</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER LARGE OBJECT</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a large object</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterlargeobject">
-  <primary>ALTER LARGE OBJECT</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> OWNER TO <replaceable>new_owner</replaceable>
--- a/doc/src/sgml/ref/alter_materialized_view.sgml
+++ b/doc/src/sgml/ref/alter_materialized_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERMATERIALIZEDVIEW">
+ <indexterm zone="sql-altermaterializedview">
+  <primary>ALTER MATERIALIZED VIEW</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER MATERIALIZED VIEW</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a materialized view</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altermaterializedview">
-  <primary>ALTER MATERIALIZED VIEW</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/alter_opclass.sgml
+++ b/doc/src/sgml/ref/alter_opclass.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTEROPCLASS">
+ <indexterm zone="sql-alteropclass">
+  <primary>ALTER OPERATOR CLASS</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER OPERATOR CLASS</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an operator class</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alteropclass">
-  <primary>ALTER OPERATOR CLASS</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_operator.sgml
+++ b/doc/src/sgml/ref/alter_operator.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTEROPERATOR">
+ <indexterm zone="sql-alteroperator">
+  <primary>ALTER OPERATOR</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER OPERATOR</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an operator</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alteroperator">
-  <primary>ALTER OPERATOR</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</replaceable> | NONE } , { <replaceable>right_type</replaceable> | NONE } ) OWNER TO <replaceable>new_owner</replaceable>
--- a/doc/src/sgml/ref/alter_opfamily.sgml
+++ b/doc/src/sgml/ref/alter_opfamily.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTEROPFAMILY">
+ <indexterm zone="sql-alteropfamily">
+  <primary>ALTER OPERATOR FAMILY</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER OPERATOR FAMILY</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of an operator family</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alteropfamily">
-  <primary>ALTER OPERATOR FAMILY</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> ADD
--- a/doc/src/sgml/ref/alter_role.sgml
+++ b/doc/src/sgml/ref/alter_role.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERROLE">
+ <indexterm zone="sql-alterrole">
+  <primary>ALTER ROLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER ROLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change a database role</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterrole">
-  <primary>ALTER ROLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/alter_rule.sgml
+++ b/doc/src/sgml/ref/alter_rule.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERRULE">
+ <indexterm zone="sql-alterrule">
+  <primary>ALTER RULE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER RULE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a rule</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterrule">
-  <primary>ALTER RULE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
--- a/doc/src/sgml/ref/alter_schema.sgml
+++ b/doc/src/sgml/ref/alter_schema.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERSCHEMA">
+ <indexterm zone="sql-alterschema">
+  <primary>ALTER SCHEMA</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER SCHEMA</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a schema</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterschema">
-  <primary>ALTER SCHEMA</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER SCHEMA <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERSEQUENCE">
+ <indexterm zone="sql-altersequence">
+  <primary>ALTER SEQUENCE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER SEQUENCE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -17,10 +21,6 @@ PostgreSQL documentation
  </refpurpose>
 </refnamediv>

- <indexterm zone="sql-altersequence">
-  <primary>ALTER SEQUENCE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
--- a/doc/src/sgml/ref/alter_server.sgml
+++ b/doc/src/sgml/ref/alter_server.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERSERVER">
+ <indexterm zone="sql-alterserver">
+  <primary>ALTER SERVER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER SERVER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a foreign server</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterserver">
-  <primary>ALTER SERVER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER SERVER <replaceable class="parameter">name</replaceable> [ VERSION '<replaceable class="parameter">new_version</replaceable>' ]
--- a/doc/src/sgml/ref/alter_system.sgml
+++ b/doc/src/sgml/ref/alter_system.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERSYSTEM">
+ <indexterm zone="sql-altersystem">
+  <primary>ALTER SYSTEM</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER SYSTEM</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change a server configuration parameter</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altersystem">
-  <primary>ALTER SYSTEM</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER SYSTEM SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTABLE">
+ <indexterm zone="sql-altertable">
+  <primary>ALTER TABLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TABLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertable">
-  <primary>ALTER TABLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
--- a/doc/src/sgml/ref/alter_tablespace.sgml
+++ b/doc/src/sgml/ref/alter_tablespace.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTABLESPACE">
+ <indexterm zone="sql-altertablespace">
+  <primary>ALTER TABLESPACE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TABLESPACE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a tablespace or affect objects of a tablespace</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertablespace">
-  <primary>ALTER TABLESPACE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTRIGGER">
+ <indexterm zone="sql-altertrigger">
+  <primary>ALTER TRIGGER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TRIGGER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a trigger</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertrigger">
-  <primary>ALTER TRIGGER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
--- a/doc/src/sgml/ref/alter_tsconfig.sgml
+++ b/doc/src/sgml/ref/alter_tsconfig.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTSCONFIG">
+ <indexterm zone="sql-altertsconfig">
+  <primary>ALTER TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TEXT SEARCH CONFIGURATION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a text search configuration</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertsconfig">
-  <primary>ALTER TEXT SEARCH CONFIGURATION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
--- a/doc/src/sgml/ref/alter_tsdictionary.sgml
+++ b/doc/src/sgml/ref/alter_tsdictionary.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTSDICTIONARY">
+ <indexterm zone="sql-altertsdictionary">
+  <primary>ALTER TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TEXT SEARCH DICTIONARY</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a text search dictionary</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertsdictionary">
-  <primary>ALTER TEXT SEARCH DICTIONARY</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> (
--- a/doc/src/sgml/ref/alter_tsparser.sgml
+++ b/doc/src/sgml/ref/alter_tsparser.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTSPARSER">
+ <indexterm zone="sql-altertsparser">
+  <primary>ALTER TEXT SEARCH PARSER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TEXT SEARCH PARSER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a text search parser</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertsparser">
-  <primary>ALTER TEXT SEARCH PARSER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_tstemplate.sgml
+++ b/doc/src/sgml/ref/alter_tstemplate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTSTEMPLATE">
+ <indexterm zone="sql-altertstemplate">
+  <primary>ALTER TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TEXT SEARCH TEMPLATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a text search template</refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertstemplate">
-  <primary>ALTER TEXT SEARCH TEMPLATE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
--- a/doc/src/sgml/ref/alter_type.sgml
+++ b/doc/src/sgml/ref/alter_type.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERTYPE">
+ <indexterm zone="sql-altertype">
+  <primary>ALTER TYPE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER TYPE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -17,10 +21,6 @@ PostgreSQL documentation
  </refpurpose>
 </refnamediv>

- <indexterm zone="sql-altertype">
-  <primary>ALTER TYPE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER TYPE <replaceable class="PARAMETER">name</replaceable> <replaceable class="PARAMETER">action</replaceable> [, ... ]
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERUSER">
+ <indexterm zone="sql-alteruser">
+  <primary>ALTER USER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER USER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change a database role</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alteruser">
-  <primary>ALTER USER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/alter_user_mapping.sgml
+++ b/doc/src/sgml/ref/alter_user_mapping.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERUSERMAPPING">
+ <indexterm zone="sql-alterusermapping">
+  <primary>ALTER USER MAPPING</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER USER MAPPING</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a user mapping</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterusermapping">
-  <primary>ALTER USER MAPPING</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC }
--- a/doc/src/sgml/ref/alter_view.sgml
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ALTERVIEW">
+ <indexterm zone="sql-alterview">
+  <primary>ALTER VIEW</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ALTER VIEW</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>change the definition of a view</refpurpose>
 </refnamediv>

- <indexterm zone="sql-alterview">
-  <primary>ALTER VIEW</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable>
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-ANALYZE">
+ <indexterm zone="sql-analyze">
+  <primary>ANALYZE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>ANALYZE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>collect statistics about a database</refpurpose>
 </refnamediv>

- <indexterm zone="sql-analyze">
-  <primary>ANALYZE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] ]
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-BEGIN">
+ <indexterm zone="sql-begin">
+  <primary>BEGIN</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>BEGIN</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>start a transaction block</refpurpose>
 </refnamediv>

- <indexterm zone="sql-begin">
-  <primary>BEGIN</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
--- a/doc/src/sgml/ref/checkpoint.sgml
+++ b/doc/src/sgml/ref/checkpoint.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/checkpoint.sgml -->

 <refentry id="sql-checkpoint">
+ <indexterm zone="sql-checkpoint">
+  <primary>CHECKPOINT</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CHECKPOINT</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>force a transaction log checkpoint</refpurpose>
 </refnamediv>

- <indexterm zone="sql-checkpoint">
-  <primary>CHECKPOINT</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CHECKPOINT
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CLOSE">
+ <indexterm zone="sql-close">
+  <primary>CLOSE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-close">
+  <primary>cursor</primary>
+  <secondary>CLOSE</secondary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CLOSE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
  <refpurpose>close a cursor</refpurpose>
 </refnamediv>

- <indexterm zone="sql-close">
-  <primary>CLOSE</primary>
- </indexterm>
-
- <indexterm zone="sql-close">
-  <primary>cursor</primary>
-  <secondary>CLOSE</secondary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CLUSTER">
+ <indexterm zone="sql-cluster">
+  <primary>CLUSTER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CLUSTER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>cluster a table according to an index</refpurpose>
 </refnamediv>

- <indexterm zone="sql-cluster">
-  <primary>CLUSTER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CLUSTER [VERBOSE] <replaceable class="PARAMETER">table_name</replaceable> [ USING <replaceable class="PARAMETER">index_name</replaceable> ]
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="APP-CLUSTERDB">
+ <indexterm zone="app-clusterdb">
+  <primary>clusterdb</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle><application>clusterdb</application></refentrytitle>
  <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>cluster a <productname>PostgreSQL</productname> database</refpurpose>
 </refnamediv>

- <indexterm zone="app-clusterdb">
-  <primary>clusterdb</primary>
- </indexterm>
-
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>clusterdb</command>
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-COMMENT">
+ <indexterm zone="sql-comment">
+  <primary>COMMENT</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>COMMENT</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define or change the comment of an object</refpurpose>
 </refnamediv>

- <indexterm zone="sql-comment">
-  <primary>COMMENT</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 COMMENT ON
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-COMMIT">
+ <indexterm zone="sql-commit">
+  <primary>COMMIT</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>COMMIT</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>commit the current transaction</refpurpose>
 </refnamediv>

- <indexterm zone="sql-commit">
-  <primary>COMMIT</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 COMMIT [ WORK | TRANSACTION ]
--- a/doc/src/sgml/ref/commit_prepared.sgml
+++ b/doc/src/sgml/ref/commit_prepared.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-COMMIT-PREPARED">
+ <indexterm zone="sql-commit-prepared">
+  <primary>COMMIT PREPARED</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>COMMIT PREPARED</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>commit a transaction that was earlier prepared for two-phase commit</refpurpose>
 </refnamediv>

- <indexterm zone="sql-commit-prepared">
-  <primary>COMMIT PREPARED</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -5,6 +5,10 @@ PostgreSQL documentation


 <refentry id="SQL-COPY">
+ <indexterm zone="sql-copy">
+  <primary>COPY</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>COPY</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -16,10 +20,6 @@ PostgreSQL documentation
  <refpurpose>copy data between a file and a table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-copy">
-  <primary>COPY</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ]
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEAGGREGATE">
+ <indexterm zone="sql-createaggregate">
+  <primary>CREATE AGGREGATE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE AGGREGATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new aggregate function</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createaggregate">
-  <primary>CREATE AGGREGATE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ) (
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/create_cast.sgml -->

 <refentry id="SQL-CREATECAST">
+ <indexterm zone="sql-createcast">
+  <primary>CREATE CAST</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE CAST</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>define a new cast</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createcast">
-  <primary>CREATE CAST</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>)
--- a/doc/src/sgml/ref/create_collation.sgml
+++ b/doc/src/sgml/ref/create_collation.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/create_collation.sgml -->

 <refentry id="SQL-CREATECOLLATION">
+ <indexterm zone="sql-createcollation">
+  <primary>CREATE COLLATION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE COLLATION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>define a new collation</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createcollation">
-  <primary>CREATE COLLATION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE COLLATION <replaceable>name</replaceable> (
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/create_conversion.sgml -->

 <refentry id="SQL-CREATECONVERSION">
+ <indexterm zone="sql-createconversion">
+  <primary>CREATE CONVERSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE CONVERSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>define a new encoding conversion</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createconversion">
-  <primary>CREATE CONVERSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEDATABASE">
+ <indexterm zone="sql-createdatabase">
+  <primary>CREATE DATABASE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE DATABASE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>create a new database</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createdatabase">
-  <primary>CREATE DATABASE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/create_domain.sgml
+++ b/doc/src/sgml/ref/create_domain.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEDOMAIN">
+ <indexterm zone="sql-createdomain">
+  <primary>CREATE DOMAIN</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE DOMAIN</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new domain</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createdomain">
-  <primary>CREATE DOMAIN</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replaceable class="parameter">data_type</replaceable>
--- a/doc/src/sgml/ref/create_event_trigger.sgml
+++ b/doc/src/sgml/ref/create_event_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEEVENTTRIGGER">
+ <indexterm zone="sql-createeventtrigger">
+  <primary>CREATE EVENT TRIGGER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE EVENT TRIGGER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new event trigger</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createeventtrigger">
-  <primary>CREATE EVENT TRIGGER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/create_extension.sgml
+++ b/doc/src/sgml/ref/create_extension.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEEXTENSION">
+ <indexterm zone="sql-createextension">
+  <primary>CREATE EXTENSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE EXTENSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>install an extension</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createextension">
-  <primary>CREATE EXTENSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name</replaceable>
--- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEFOREIGNDATAWRAPPER">
+ <indexterm zone="sql-createforeigndatawrapper">
+  <primary>CREATE FOREIGN DATA WRAPPER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE FOREIGN DATA WRAPPER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new foreign-data wrapper</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createforeigndatawrapper">
-  <primary>CREATE FOREIGN DATA WRAPPER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
--- a/doc/src/sgml/ref/create_foreign_table.sgml
+++ b/doc/src/sgml/ref/create_foreign_table.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/create_foreign_table.sgml -->

 <refentry id="SQL-CREATEFOREIGNTABLE">
+ <indexterm zone="sql-createforeigntable">
+  <primary>CREATE FOREIGN TABLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE FOREIGN TABLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>define a new foreign table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createforeigntable">
-  <primary>CREATE FOREIGN TABLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -3,6 +3,10 @@ doc/src/sgml/ref/create_function.sgml
 -->

 <refentry id="SQL-CREATEFUNCTION">
+ <indexterm zone="sql-createfunction">
+  <primary>CREATE FUNCTION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE FUNCTION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -14,10 +18,6 @@ doc/src/sgml/ref/create_function.sgml
  <refpurpose>define a new function</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createfunction">
-  <primary>CREATE FUNCTION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ OR REPLACE ] FUNCTION
--- a/doc/src/sgml/ref/create_group.sgml
+++ b/doc/src/sgml/ref/create_group.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEGROUP">
+ <indexterm zone="sql-creategroup">
+  <primary>CREATE GROUP</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE GROUP</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new database role</refpurpose>
 </refnamediv>

- <indexterm zone="sql-creategroup">
-  <primary>CREATE GROUP</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEINDEX">
+ <indexterm zone="sql-createindex">
+  <primary>CREATE INDEX</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE INDEX</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new index</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createindex">
-  <primary>CREATE INDEX</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ <replaceable class="parameter">name</replaceable> ] ON <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">method</replaceable> ]
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATELANGUAGE">
+ <indexterm zone="sql-createlanguage">
+  <primary>CREATE LANGUAGE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE LANGUAGE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new procedural language</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createlanguage">
-  <primary>CREATE LANGUAGE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ OR REPLACE ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">name</replaceable>
--- a/doc/src/sgml/ref/create_materialized_view.sgml
+++ b/doc/src/sgml/ref/create_materialized_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEMATERIALIZEDVIEW">
+ <indexterm zone="sql-creatematerializedview">
+  <primary>CREATE MATERIALIZED VIEW</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE MATERIALIZED VIEW</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new materialized view</refpurpose>
 </refnamediv>

- <indexterm zone="sql-creatematerializedview">
-  <primary>CREATE MATERIALIZED VIEW</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE MATERIALIZED VIEW <replaceable>table_name</replaceable>
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEOPCLASS">
+ <indexterm zone="sql-createopclass">
+  <primary>CREATE OPERATOR CLASS</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE OPERATOR CLASS</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new operator class</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createopclass">
-  <primary>CREATE OPERATOR CLASS</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAULT ] FOR TYPE <replaceable class="parameter">data_type</replaceable>
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEOPERATOR">
+ <indexterm zone="sql-createoperator">
+  <primary>CREATE OPERATOR</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE OPERATOR</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new operator</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createoperator">
-  <primary>CREATE OPERATOR</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE OPERATOR <replaceable>name</replaceable> (
--- a/doc/src/sgml/ref/create_opfamily.sgml
+++ b/doc/src/sgml/ref/create_opfamily.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEOPFAMILY">
+ <indexterm zone="sql-createopfamily">
+  <primary>CREATE OPERATOR FAMILY</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE OPERATOR FAMILY</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new operator family</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createopfamily">
-  <primary>CREATE OPERATOR FAMILY</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <replaceable class="parameter">index_method</replaceable>
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEROLE">
+ <indexterm zone="sql-createrole">
+  <primary>CREATE ROLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE ROLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new database role</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createrole">
-  <primary>CREATE ROLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATERULE">
+ <indexterm zone="sql-createrule">
+  <primary>CREATE RULE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE RULE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new rewrite rule</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createrule">
-  <primary>CREATE RULE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS ON <replaceable class="parameter">event</replaceable>
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATESCHEMA">
+ <indexterm zone="sql-createschema">
+  <primary>CREATE SCHEMA</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE SCHEMA</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new schema</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createschema">
-  <primary>CREATE SCHEMA</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">user_name</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATESEQUENCE">
+ <indexterm zone="sql-createsequence">
+  <primary>CREATE SEQUENCE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE SEQUENCE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new sequence generator</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createsequence">
-  <primary>CREATE SEQUENCE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
--- a/doc/src/sgml/ref/create_server.sgml
+++ b/doc/src/sgml/ref/create_server.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATESERVER">
+ <indexterm zone="sql-createserver">
+  <primary>CREATE SERVER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE SERVER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new foreign server</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createserver">
-  <primary>CREATE SERVER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE SERVER <replaceable class="parameter">server_name</replaceable> [ TYPE '<replaceable class="parameter">server_type</replaceable>' ] [ VERSION '<replaceable class="parameter">server_version</replaceable>' ]
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETABLE">
+ <indexterm zone="sql-createtable">
+  <primary>CREATE TABLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TABLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtable">
-  <primary>CREATE TABLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETABLEAS">
+ <indexterm zone="sql-createtableas">
+  <primary>CREATE TABLE AS</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TABLE AS</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new table from the results of a query</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtableas">
-  <primary>CREATE TABLE AS</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE <replaceable>table_name</replaceable>
--- a/doc/src/sgml/ref/create_tablespace.sgml
+++ b/doc/src/sgml/ref/create_tablespace.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETABLESPACE">
+ <indexterm zone="sql-createtablespace">
+  <primary>CREATE TABLESPACE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TABLESPACE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new tablespace</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtablespace">
-  <primary>CREATE TABLESPACE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETRIGGER">
+ <indexterm zone="sql-createtrigger">
+  <primary>CREATE TRIGGER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TRIGGER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new trigger</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtrigger">
-  <primary>CREATE TRIGGER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTER | INSTEAD OF } { <replaceable class="PARAMETER">event</replaceable> [ OR ... ] }
--- a/doc/src/sgml/ref/create_tsconfig.sgml
+++ b/doc/src/sgml/ref/create_tsconfig.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETSCONFIG">
+ <indexterm zone="sql-createtsconfig">
+  <primary>CREATE TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TEXT SEARCH CONFIGURATION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new text search configuration</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtsconfig">
-  <primary>CREATE TEXT SEARCH CONFIGURATION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceable> (
--- a/doc/src/sgml/ref/create_tsdictionary.sgml
+++ b/doc/src/sgml/ref/create_tsdictionary.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETSDICTIONARY">
+ <indexterm zone="sql-createtsdictionary">
+  <primary>CREATE TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TEXT SEARCH DICTIONARY</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new text search dictionary</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtsdictionary">
-  <primary>CREATE TEXT SEARCH DICTIONARY</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TEXT SEARCH DICTIONARY <replaceable class="parameter">name</replaceable> (
--- a/doc/src/sgml/ref/create_tsparser.sgml
+++ b/doc/src/sgml/ref/create_tsparser.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETSPARSER">
+ <indexterm zone="sql-createtsparser">
+  <primary>CREATE TEXT SEARCH PARSER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TEXT SEARCH PARSER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new text search parser</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtsparser">
-  <primary>CREATE TEXT SEARCH PARSER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TEXT SEARCH PARSER <replaceable class="parameter">name</replaceable> (
--- a/doc/src/sgml/ref/create_tstemplate.sgml
+++ b/doc/src/sgml/ref/create_tstemplate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETSTEMPLATE">
+ <indexterm zone="sql-createtstemplate">
+  <primary>CREATE TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TEXT SEARCH TEMPLATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new text search template</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtstemplate">
-  <primary>CREATE TEXT SEARCH TEMPLATE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TEXT SEARCH TEMPLATE <replaceable class="parameter">name</replaceable> (
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATETYPE">
+ <indexterm zone="sql-createtype">
+  <primary>CREATE TYPE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE TYPE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new data type</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createtype">
-  <primary>CREATE TYPE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE TYPE <replaceable class="parameter">name</replaceable> AS
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEUSER">
+ <indexterm zone="sql-createuser">
+  <primary>CREATE USER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE USER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new database role</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createuser">
-  <primary>CREATE USER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
--- a/doc/src/sgml/ref/create_user_mapping.sgml
+++ b/doc/src/sgml/ref/create_user_mapping.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEUSERMAPPING">
+ <indexterm zone="sql-createusermapping">
+  <primary>CREATE USER MAPPING</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE USER MAPPING</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new mapping of a user to a foreign server</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createusermapping">
-  <primary>CREATE USER MAPPING</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC }
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-CREATEVIEW">
+ <indexterm zone="sql-createview">
+  <primary>CREATE VIEW</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>CREATE VIEW</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new view</refpurpose>
 </refnamediv>

- <indexterm zone="sql-createview">
-  <primary>CREATE VIEW</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ]
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="APP-CREATEDB">
+ <indexterm zone="app-createdb">
+  <primary>createdb</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle><application>createdb</application></refentrytitle>
  <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>create a new <productname>PostgreSQL</productname> database</refpurpose>
 </refnamediv>

- <indexterm zone="app-createdb">
-  <primary>createdb</primary>
- </indexterm>
-
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createdb</command>
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="APP-CREATELANG">
+ <indexterm zone="app-createlang">
+  <primary>createlang</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle><application>createlang</application></refentrytitle>
  <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>install a <productname>PostgreSQL</productname> procedural language</refpurpose>
 </refnamediv>

- <indexterm zone="app-createlang">
-  <primary>createlang</primary>
- </indexterm>
-
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createlang</command>
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="APP-CREATEUSER">
+ <indexterm zone="app-createuser">
+  <primary>createuser</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle><application>createuser</application></refentrytitle>
  <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>define a new <productname>PostgreSQL</productname> user account</refpurpose>
 </refnamediv>

- <indexterm zone="app-createuser">
-  <primary>createuser</primary>
- </indexterm>
-
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createuser</command>
--- a/doc/src/sgml/ref/deallocate.sgml
+++ b/doc/src/sgml/ref/deallocate.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DEALLOCATE">
+ <indexterm zone="sql-deallocate">
+  <primary>DEALLOCATE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-deallocate">
+  <primary>prepared statements</primary>
+  <secondary>removing</secondary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DEALLOCATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
  <refpurpose>deallocate a prepared statement</refpurpose>
 </refnamediv>

- <indexterm zone="sql-deallocate">
-  <primary>DEALLOCATE</primary>
- </indexterm>
-
- <indexterm zone="sql-deallocate">
-  <primary>prepared statements</primary>
-  <secondary>removing</secondary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL }
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DECLARE">
+ <indexterm zone="sql-declare">
+  <primary>DECLARE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-declare">
+  <primary>cursor</primary>
+  <secondary>DECLARE</secondary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DECLARE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
  <refpurpose>define a cursor</refpurpose>
 </refnamediv>

- <indexterm zone="sql-declare">
-  <primary>DECLARE</primary>
- </indexterm>
-
- <indexterm zone="sql-declare">
-  <primary>cursor</primary>
-  <secondary>DECLARE</secondary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DELETE">
+ <indexterm zone="sql-delete">
+  <primary>DELETE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DELETE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>delete rows of a table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-delete">
-  <primary>DELETE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
--- a/doc/src/sgml/ref/discard.sgml
+++ b/doc/src/sgml/ref/discard.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DISCARD">
+ <indexterm zone="sql-discard">
+  <primary>DISCARD</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DISCARD</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>discard session state</refpurpose>
 </refnamediv>

- <indexterm zone="sql-discard">
-  <primary>DISCARD</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DISCARD { ALL | PLANS | SEQUENCES | TEMPORARY | TEMP }
--- a/doc/src/sgml/ref/do.sgml
+++ b/doc/src/sgml/ref/do.sgml
@@ -4,6 +4,14 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DO">
+ <indexterm zone="sql-do">
+  <primary>DO</primary>
+ </indexterm>
+
+ <indexterm zone="sql-do">
+  <primary>anonymous code blocks</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DO</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,14 +23,6 @@ PostgreSQL documentation
  <refpurpose>execute an anonymous code block</refpurpose>
 </refnamediv>

- <indexterm zone="sql-do">
-  <primary>DO</primary>
- </indexterm>
-
- <indexterm zone="sql-do">
-  <primary>anonymous code blocks</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replaceable class="PARAMETER">code</replaceable>
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPAGGREGATE">
+ <indexterm zone="sql-dropaggregate">
+  <primary>DROP AGGREGATE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP AGGREGATE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove an aggregate function</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropaggregate">
-  <primary>DROP AGGREGATE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP AGGREGATE [ IF EXISTS ] <replaceable>name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/drop_cast.sgml -->

 <refentry id="SQL-DROPCAST">
+ <indexterm zone="sql-dropcast">
+  <primary>DROP CAST</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP CAST</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>remove a cast</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropcast">
-  <primary>DROP CAST</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP CAST [ IF EXISTS ] (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_collation.sgml
+++ b/doc/src/sgml/ref/drop_collation.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/drop_collation.sgml -->

 <refentry id="SQL-DROPCOLLATION">
+ <indexterm zone="sql-dropcollation">
+  <primary>DROP COLLATION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP COLLATION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>remove a collation</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropcollation">
-  <primary>DROP COLLATION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP COLLATION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/drop_conversion.sgml -->

 <refentry id="SQL-DROPCONVERSION">
+ <indexterm zone="sql-dropconversion">
+  <primary>DROP CONVERSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP CONVERSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>remove a conversion</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropconversion">
-  <primary>DROP CONVERSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP CONVERSION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_database.sgml
+++ b/doc/src/sgml/ref/drop_database.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPDATABASE">
+ <indexterm zone="sql-dropdatabase">
+  <primary>DROP DATABASE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP DATABASE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove a database</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropdatabase">
-  <primary>DROP DATABASE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPDOMAIN">
+ <indexterm zone="sql-dropdomain">
+  <primary>DROP DOMAIN</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP DOMAIN</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove a domain</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropdomain">
-  <primary>DROP DOMAIN</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_event_trigger.sgml
+++ b/doc/src/sgml/ref/drop_event_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPEVENTTRIGGER">
+ <indexterm zone="sql-dropeventtrigger">
+  <primary>DROP EVENT TRIGGER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP EVENT TRIGGER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove an event trigger</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropeventtrigger">
-  <primary>DROP EVENT TRIGGER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_extension.sgml
+++ b/doc/src/sgml/ref/drop_extension.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPEXTENSION">
+ <indexterm zone="sql-dropextension">
+  <primary>DROP EXTENSION</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP EXTENSION</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove an extension</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropextension">
-  <primary>DROP EXTENSION</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->

 <refentry id="SQL-DROPFOREIGNDATAWRAPPER">
+ <indexterm zone="sql-dropforeigndatawrapper">
+  <primary>DROP FOREIGN DATA WRAPPER</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP FOREIGN DATA WRAPPER</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
  <refpurpose>remove a foreign-data wrapper</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropforeigndatawrapper">
-  <primary>DROP FOREIGN DATA WRAPPER</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP FOREIGN DATA WRAPPER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
--- a/doc/src/sgml/ref/drop_foreign_table.sgml
+++ b/doc/src/sgml/ref/drop_foreign_table.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sggml/ref/drop_foreign_table.sgml -->

 <refentry id="SQL-DROPFOREIGNTABLE">
+ <indexterm zone="sql-dropforeigntable">
+  <primary>DROP FOREIGN TABLE</primary>
+ </indexterm>
+
 <refmeta>
  <refentrytitle>DROP FOREIGN TABLE</refentrytitle>
  <manvolnum>7</manvolnum>
@@ -12,10 +16,6 @@
  <refpurpose>remove a foreign table</refpurpose>
 </refnamediv>

- <indexterm zone="sql-dropforeigntable">
-  <primary>DROP FOREIGN TABLE</primary>
- </indexterm>
-
 <refsynopsisdiv>
 <synopsis>
 DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
--- a/Show More
+++ b/Show More