diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index a26e3786782..b07ac48c005 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -19,6 +19,10 @@
  </para>
 
  <refentry id="CONTRIB-DBLINK-CONNECT">
+  <indexterm>
+   <primary>dblink_connect</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_connect</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -29,10 +33,6 @@
    <refpurpose>opens a persistent connection to a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_connect</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_connect(text connstr) returns text
@@ -183,6 +183,10 @@ DROP SERVER fdtest;
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-CONNECT-U">
+  <indexterm>
+   <primary>dblink_connect_u</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_connect_u</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -193,10 +197,6 @@ DROP SERVER fdtest;
    <refpurpose>opens a persistent connection to a remote database, insecurely</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_connect_u</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_connect_u(text connstr) returns text
@@ -240,6 +240,10 @@ dblink_connect_u(text connname, text connstr) returns text
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-DISCONNECT">
+  <indexterm>
+   <primary>dblink_disconnect</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_disconnect</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -250,10 +254,6 @@ dblink_connect_u(text connname, text connstr) returns text
    <refpurpose>closes a persistent connection to a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_disconnect</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_disconnect() returns text
@@ -315,6 +315,10 @@ SELECT dblink_disconnect('myconn');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-FUNCTION">
+  <indexterm>
+   <primary>dblink</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -325,10 +329,6 @@ SELECT dblink_disconnect('myconn');
    <refpurpose>executes a query in a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink(text connname, text sql [, bool fail_on_error]) returns setof record
@@ -533,6 +533,10 @@ SELECT * FROM dblink('myconn', 'select proname, prosrc from pg_proc')
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-EXEC">
+  <indexterm>
+   <primary>dblink_exec</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_exec</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -543,10 +547,6 @@ SELECT * FROM dblink('myconn', 'select proname, prosrc from pg_proc')
    <refpurpose>executes a command in a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_exec</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_exec(text connname, text sql [, bool fail_on_error]) returns text
@@ -670,6 +670,10 @@ DETAIL:  ERROR:  null value in column "relnamespace" violates not-null constrain
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-OPEN">
+  <indexterm>
+   <primary>dblink_open</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_open</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -680,10 +684,6 @@ DETAIL:  ERROR:  null value in column "relnamespace" violates not-null constrain
    <refpurpose>opens a cursor in a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_open</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_open(text cursorname, text sql [, bool fail_on_error]) returns text
@@ -794,6 +794,10 @@ SELECT dblink_open('foo', 'select proname, prosrc from pg_proc');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-FETCH">
+  <indexterm>
+   <primary>dblink_fetch</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_fetch</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -804,10 +808,6 @@ SELECT dblink_open('foo', 'select proname, prosrc from pg_proc');
    <refpurpose>returns rows from an open cursor in a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_fetch</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_fetch(text cursorname, int howmany [, bool fail_on_error]) returns setof record
@@ -947,6 +947,10 @@ SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-CLOSE">
+  <indexterm>
+   <primary>dblink_close</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_close</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -957,10 +961,6 @@ SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
    <refpurpose>closes a cursor in a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_close</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_close(text cursorname [, bool fail_on_error]) returns text
@@ -1058,6 +1058,10 @@ SELECT dblink_close('foo');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-GET-CONNECTIONS">
+  <indexterm>
+   <primary>dblink_get_connections</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_get_connections</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1068,10 +1072,6 @@ SELECT dblink_close('foo');
    <refpurpose>returns the names of all open named dblink connections</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_get_connections</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_get_connections() returns text[]
@@ -1103,6 +1103,10 @@ SELECT dblink_get_connections();
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-ERROR-MESSAGE">
+  <indexterm>
+   <primary>dblink_error_message</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_error_message</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1113,10 +1117,6 @@ SELECT dblink_get_connections();
    <refpurpose>gets last error message on the named connection</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_error_message</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_error_message(text connname) returns text
@@ -1166,6 +1166,10 @@ SELECT dblink_error_message('dtest1');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-SEND-QUERY">
+  <indexterm>
+   <primary>dblink_send_query</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_send_query</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1176,10 +1180,6 @@ SELECT dblink_error_message('dtest1');
    <refpurpose>sends an async query to a remote database</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_send_query</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_send_query(text connname, text sql) returns int
@@ -1248,6 +1248,10 @@ SELECT dblink_send_query('dtest1', 'SELECT * FROM foo WHERE f1 &lt; 3');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-IS-BUSY">
+  <indexterm>
+   <primary>dblink_is_busy</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_is_busy</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1258,10 +1262,6 @@ SELECT dblink_send_query('dtest1', 'SELECT * FROM foo WHERE f1 &lt; 3');
    <refpurpose>checks if connection is busy with an async query</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_is_busy</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_is_busy(text connname) returns int
@@ -1311,6 +1311,10 @@ SELECT dblink_is_busy('dtest1');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-GET-NOTIFY">
+  <indexterm>
+   <primary>dblink_get_notify</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_get_notify</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1321,10 +1325,6 @@ SELECT dblink_is_busy('dtest1');
    <refpurpose>retrieve async notifications on a connection</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_get_notify</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_get_notify() returns setof (notify_name text, be_pid int, extra text)
@@ -1393,6 +1393,10 @@ SELECT * FROM dblink_get_notify();
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-GET-RESULT">
+  <indexterm>
+   <primary>dblink_get_result</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_get_result</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1403,10 +1407,6 @@ SELECT * FROM dblink_get_notify();
    <refpurpose>gets an async query result</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_get_result</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_get_result(text connname [, bool fail_on_error]) returns setof record
@@ -1557,6 +1557,10 @@ contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-CANCEL-QUERY">
+  <indexterm>
+   <primary>dblink_cancel_query</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_cancel_query</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1567,10 +1571,6 @@ contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2
    <refpurpose>cancels any active query on the named connection</refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_cancel_query</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_cancel_query(text connname) returns text
@@ -1625,6 +1625,10 @@ SELECT dblink_cancel_query('dtest1');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-GET-PKEY">
+  <indexterm>
+   <primary>dblink_get_pkey</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_get_pkey</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1637,10 +1641,6 @@ SELECT dblink_cancel_query('dtest1');
    </refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_get_pkey</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_get_pkey(text relname) returns setof dblink_pkey_results
@@ -1717,6 +1717,10 @@ SELECT * FROM dblink_get_pkey('foobar');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-BUILD-SQL-INSERT">
+  <indexterm>
+   <primary>dblink_build_sql_insert</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_build_sql_insert</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1730,10 +1734,6 @@ SELECT * FROM dblink_get_pkey('foobar');
    </refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_build_sql_insert</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_build_sql_insert(text relname,
@@ -1852,6 +1852,10 @@ SELECT dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-BUILD-SQL-DELETE">
+  <indexterm>
+   <primary>dblink_build_sql_delete</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_build_sql_delete</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1864,10 +1868,6 @@ SELECT dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
    </refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_build_sql_delete</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_build_sql_delete(text relname,
@@ -1970,6 +1970,10 @@ SELECT dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
  </refentry>
 
  <refentry id="CONTRIB-DBLINK-BUILD-SQL-UPDATE">
+  <indexterm>
+   <primary>dblink_build_sql_update</primary>
+  </indexterm>
+
   <refmeta>
    <refentrytitle>dblink_build_sql_update</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -1982,10 +1986,6 @@ SELECT dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
    </refpurpose>
   </refnamediv>
 
-  <indexterm>
-   <primary>dblink_build_sql_update</primary>
-  </indexterm>
-
   <refsynopsisdiv>
 <synopsis>
 dblink_build_sql_update(text relname,
diff --git a/doc/src/sgml/oid2name.sgml b/doc/src/sgml/oid2name.sgml
index 5e39677496b..97b170a23f7 100644
--- a/doc/src/sgml/oid2name.sgml
+++ b/doc/src/sgml/oid2name.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/oid2name.sgml -->
 
 <refentry id="oid2name">
+ <indexterm zone="oid2name">
+  <primary>oid2name</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>oid2name</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>resolve OIDs and file nodes in a <productname>PostgreSQL</productname> data directory</refpurpose>
  </refnamediv>
 
- <indexterm zone="oid2name">
-  <primary>oid2name</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>oid2name</command>
diff --git a/doc/src/sgml/pg_xlogdump.sgml b/doc/src/sgml/pg_xlogdump.sgml
index 0f291413428..17396221198 100644
--- a/doc/src/sgml/pg_xlogdump.sgml
+++ b/doc/src/sgml/pg_xlogdump.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="pgxlogdump">
+ <indexterm zone="pgxlogdump">
+  <primary>pg_xlogdump</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_xlogdump</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>Display a human-readable rendering of the write-ahead log of a <productname>PostgreSQL</productname> database cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="pgxlogdump">
-  <primary>pg_xlogdump</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_xlogdump</command>
diff --git a/doc/src/sgml/pgarchivecleanup.sgml b/doc/src/sgml/pgarchivecleanup.sgml
index 932914bc2f8..fdf0cbb9d1b 100644
--- a/doc/src/sgml/pgarchivecleanup.sgml
+++ b/doc/src/sgml/pgarchivecleanup.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgarchivecleanup.sgml -->
 
 <refentry id="pgarchivecleanup">
+ <indexterm zone="pgarchivecleanup">
+  <primary>pg_archivecleanup</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_archivecleanup</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>clean up <productname>PostgreSQL</productname> WAL archive files</refpurpose>
  </refnamediv>
 
- <indexterm zone="pgarchivecleanup">
-  <primary>pg_archivecleanup</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_archivecleanup</command>
diff --git a/doc/src/sgml/pgbench.sgml b/doc/src/sgml/pgbench.sgml
index 05ca9b76abc..4367563a379 100644
--- a/doc/src/sgml/pgbench.sgml
+++ b/doc/src/sgml/pgbench.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgbench.sgml -->
 
 <refentry id="pgbench">
+ <indexterm zone="pgbench">
+  <primary>pgbench</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pgbench</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>run a benchmark test on <productname>PostgreSQL</productname></refpurpose>
  </refnamediv>
 
- <indexterm zone="pgbench">
-  <primary>pgbench</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pgbench</command>
diff --git a/doc/src/sgml/pgstandby.sgml b/doc/src/sgml/pgstandby.sgml
index ca2b5c078dc..fb3f32eaaa4 100644
--- a/doc/src/sgml/pgstandby.sgml
+++ b/doc/src/sgml/pgstandby.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgstandby.sgml -->
 
 <refentry id="pgstandby">
+ <indexterm zone="pgstandby">
+  <primary>pg_standby</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_standby</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>supports the creation of a <productname>PostgreSQL</productname> warm standby server</refpurpose>
  </refnamediv>
 
- <indexterm zone="pgstandby">
-  <primary>pg_standby</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_standby</command>
diff --git a/doc/src/sgml/pgtestfsync.sgml b/doc/src/sgml/pgtestfsync.sgml
index 45f09191253..c4b4014b1a0 100644
--- a/doc/src/sgml/pgtestfsync.sgml
+++ b/doc/src/sgml/pgtestfsync.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgtestfsync.sgml -->
 
 <refentry id="pgtestfsync">
+ <indexterm zone="pgtestfsync">
+  <primary>pg_test_fsync</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_test_fsync</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>determine fastest wal_sync_method for <productname>PostgreSQL</productname></refpurpose>
  </refnamediv>
 
- <indexterm zone="pgtestfsync">
-  <primary>pg_test_fsync</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_test_fsync</command>
diff --git a/doc/src/sgml/pgtesttiming.sgml b/doc/src/sgml/pgtesttiming.sgml
index a2581d269c6..a6ab9b114bb 100644
--- a/doc/src/sgml/pgtesttiming.sgml
+++ b/doc/src/sgml/pgtesttiming.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgtesttiming.sgml -->
 
 <refentry id="pgtesttiming">
+ <indexterm zone="pgtesttiming">
+  <primary>pg_test_timing</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_test_timing</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>measure timing overhead</refpurpose>
  </refnamediv>
 
- <indexterm zone="pgtesttiming">
-  <primary>pg_test_timing</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_test_timing</command>
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 3da451cca22..4d03b12f119 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/pgupgrade.sgml -->
 
 <refentry id="pgupgrade">
+ <indexterm zone="pgupgrade">
+  <primary>pg_upgrade</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_upgrade</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>upgrade a <productname>PostgreSQL</productname> server instance</refpurpose>
  </refnamediv>
 
- <indexterm zone="pgupgrade">
-  <primary>pg_upgrade</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_upgrade</command>
diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index e9138d5702b..ed9332c395b 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml
index 641d19ccebe..f92b8e5da37 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml
index ebb30b88607..11ecd93c205 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml
index 4cc335b18e0..a3f68975bfe 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index 360732fd358..23ef75512f1 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml
index fdd9c83800e..04064d399cb 100644
--- 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
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index c59975af033..db7b8198350 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_event_trigger.sgml b/doc/src/sgml/ref/alter_event_trigger.sgml
index f53b0228bc9..1bf9d8abb60 100644
--- 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
diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml
index 56fa30d2d3a..0d479c8ca2d 100644
--- 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> ]
diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
index 91ac1b2f0c9..1c82db9e038 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index 723aa075c57..4d8cfc522e0 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml
index 013b6f8401c..ba879eb1ea3 100644
--- 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> [, ...] ] )
diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml
index 177b11d28dd..143224286ab 100644
--- 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> [, ... ]
diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml
index d2100770361..94a7af0429c 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgml
index ab23d624ba3..5c9ded6837f 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgml
index bcf532c80ba..a6dabca1b2f 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_materialized_view.sgml b/doc/src/sgml/ref/alter_materialized_view.sgml
index e5617067f67..1932eeb84d4 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgml
index c70f6cd6a2b..fc41d866611 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml
index 32bde5af7cf..60754163204 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml
index aad968d284a..55b912611d9 100644
--- 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
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml
index b0981fdd5d5..bcd46d5e4dc 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/alter_rule.sgml b/doc/src/sgml/ref/alter_rule.sgml
index 0a186605a02..993a0ceb83f 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgml
index 020b113a32f..00395c02f85 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 204ca11f0ba..9ba9bc46229 100644
--- 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> ]
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml
index 08afde1dd04..68253b91668 100644
--- 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>' ]
diff --git a/doc/src/sgml/ref/alter_system.sgml b/doc/src/sgml/ref/alter_system.sgml
index 3ccc6afd516..081b3722a0b 100644
--- 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 }
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 89649a2aa48..2b02e668e08 100644
--- 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> [ * ]
diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml
index 99ee08a8da5..5c98bc7f067 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 0d70167024a..c63b5dfa02b 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml
index deef329b295..1a40d88f6a0 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml
index 7c120370415..590c4fc6e1c 100644
--- 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> (
diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml
index 8c082433b05..e2b6060a17a 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml
index e4f0ff3b1eb..e7ae91c0a08 100644
--- 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>
diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml
index 6700023b34c..7724c11c78e 100644
--- 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> [, ... ]
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 7588f636ed2..58ae1da127f 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml
index 3245f83e08d..d0ddd1370b9 100644
--- 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 }
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
index cbec3ab54eb..cdcc4f126ba 100644
--- 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>
diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index 8063e3752e2..08d316a9e43 100644
--- 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> [, ...] ) ] ]
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index acd823206a4..c04f1c8064c 100644
--- 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> [, ...] ]
diff --git a/doc/src/sgml/ref/checkpoint.sgml b/doc/src/sgml/ref/checkpoint.sgml
index e70b8c8cb4a..fa4dcc4f27d 100644
--- 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
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 4af6af74922..aacc667144b 100644
--- 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 }
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index 339990fa4d6..2ab090d03e5 100644
--- 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> ]
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 13169324500..c13d74853eb 100644
--- 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>
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 1b2949f64f1..53eadcdcc76 100644
--- 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
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index 40147a54769..e93c216849b 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml
index ecd0c525f20..e1988ad318b 100644
--- 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>
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 1ecc939eead..99f246af171 100644
--- 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> [, ...] ) ]
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index d15fcbae959..e5fc7186544 100644
--- 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> [ , ... ] ) (
diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index 29ea298a468..2e69a10a8ef 100644
--- 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>)
diff --git a/doc/src/sgml/ref/create_collation.sgml b/doc/src/sgml/ref/create_collation.sgml
index c8535768143..d757cdfb434 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index 084b60c4c16..d2e2c010ef3 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 5158854841f..8e99761b69d 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml
index 49db069f895..dd782e48dce 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_event_trigger.sgml b/doc/src/sgml/ref/create_event_trigger.sgml
index ed663225966..7cdf4c75f67 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_extension.sgml b/doc/src/sgml/ref/create_extension.sgml
index 9c9bf6ff7d7..a1e7e4f812c 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
index cbe50021f4f..a3811a3b636 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml
index 1ef4b5e9d74..06a70879c9a 100644
--- 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> ( [
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index b61b9785ee9..20019215351 100644
--- 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
diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml
index 3a84c8358af..981ce51e5f4 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 9a6a683e12d..e469b17e168 100644
--- 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> ]
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 0995b13623c..41da16d9775 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_materialized_view.sgml b/doc/src/sgml/ref/create_materialized_view.sgml
index b742e17ac82..2c73852ae38 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 81b9e538af1..b21a1a13b32 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index dd33f065afc..818e3a2315a 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_opfamily.sgml b/doc/src/sgml/ref/create_opfamily.sgml
index 5bee54419a6..c4bcf0863ef 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 7ec4d0a8e4c..641e3500c9a 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index ab2f1ba55c7..d3212b5e5a0 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 550acf1a535..45e4637ab5b 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 38d160d4acb..70b9f3d110d 100644
--- 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> ]
diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml
index 3e6127a3898..734c6c9fe81 100644
--- 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>' ]
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 7a01c63d5f0..fc7ad09786f 100644
--- 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> ( [
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 29c80405bf1..b353a437613 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml
index 04c5fb8a1d5..b6435650578 100644
--- 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>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index e5ec738a487..a8fba49e4c3 100644
--- 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 ... ] }
diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml
index c34d1c0a22e..63321520df2 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_tsdictionary.sgml b/doc/src/sgml/ref/create_tsdictionary.sgml
index 2673bc5df77..9c95c116083 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_tsparser.sgml b/doc/src/sgml/ref/create_tsparser.sgml
index 7643f0852d0..044581f6f29 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_tstemplate.sgml b/doc/src/sgml/ref/create_tstemplate.sgml
index 532419c7038..360ad41f354 100644
--- 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> (
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 606efeee860..e5d7992bbf5 100644
--- 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
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 3ef2be17676..065999c85a4 100644
--- 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> [ ... ] ]
diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml
index c7cc4ce5746..bb0c9c0b038 100644
--- 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 }
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index e0fbe1e5e50..57bfae30849 100644
--- 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> [, ...] ) ]
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 7dbedc2e909..c363bd4a565 100644
--- 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>
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 2bc43627e54..e9c95d3278b 100644
--- 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>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 63d4c6c4a81..4332008c68b 100644
--- 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>
diff --git a/doc/src/sgml/ref/deallocate.sgml b/doc/src/sgml/ref/deallocate.sgml
index 950c4e835de..394b125f523 100644
--- 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 }
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index d500faaa743..5cb85cc568f 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 5d2ad3fde56..74ea90787bb 100644
--- 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> [, ...] ]
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
index 762f8657116..5b06a638c5f 100644
--- 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 }
diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml
index 5f43d1cf52c..ed5e588ee71 100644
--- 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>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index e89e76268fe..37683e51eff 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml
index 589c6ac39b3..dae3a39fce2 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_collation.sgml b/doc/src/sgml/ref/drop_collation.sgml
index 64a48eec2b0..f00c88679b7 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml
index 6f866438fbb..1a33b3dcc52 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml
index 89ee7b25079..740aa319951 100644
--- 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>
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index b7b9a167c11..995d09ec8e9 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_event_trigger.sgml b/doc/src/sgml/ref/drop_event_trigger.sgml
index 86f9628fd8c..cf42e150614 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_extension.sgml b/doc/src/sgml/ref/drop_extension.sgml
index bcc5cfe7805..3bb9d9cb4cf 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
index 18fa4fe4a57..e43e0bda8b0 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml
index 1f66126a335..3c6376413e7 100644
--- 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 ]
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 2d0048be288..51b8ede5fbf 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPFUNCTION">
+ <indexterm zone="sql-dropfunction">
+  <primary>DROP FUNCTION</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP FUNCTION</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a function</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropfunction">
-  <primary>DROP FUNCTION</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml
index 57f686497e3..e601ff4172c 100644
--- a/doc/src/sgml/ref/drop_group.sgml
+++ b/doc/src/sgml/ref/drop_group.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPGROUP">
+ <indexterm zone="sql-dropgroup">
+  <primary>DROP GROUP</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP GROUP</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a database role</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropgroup">
-  <primary>DROP GROUP</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index 98fd9c966c3..d66d30edf74 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPINDEX">
+ <indexterm zone="sql-dropindex">
+  <primary>DROP INDEX</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP INDEX</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove an index</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropindex">
-  <primary>DROP INDEX</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index c2cb7045ded..defae43c1a2 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPLANGUAGE">
+ <indexterm zone="sql-droplanguage">
+  <primary>DROP LANGUAGE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP LANGUAGE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a procedural language</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droplanguage">
-  <primary>DROP LANGUAGE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_materialized_view.sgml b/doc/src/sgml/ref/drop_materialized_view.sgml
index 80d8acea36d..f3ddfb06e8c 100644
--- a/doc/src/sgml/ref/drop_materialized_view.sgml
+++ b/doc/src/sgml/ref/drop_materialized_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPMATERIALIZEDVIEW">
+ <indexterm zone="sql-dropmaterializedview">
+  <primary>DROP MATERIALIZED VIEW</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP MATERIALIZED VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a materialized view</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropmaterializedview">
-  <primary>DROP MATERIALIZED VIEW</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml
index a20293ce976..2ee8f883b6c 100644
--- a/doc/src/sgml/ref/drop_opclass.sgml
+++ b/doc/src/sgml/ref/drop_opclass.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPCLASS">
+ <indexterm zone="sql-dropopclass">
+  <primary>DROP OPERATOR CLASS</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP OPERATOR CLASS</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove an operator class</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropopclass">
-  <primary>DROP OPERATOR CLASS</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index 3091454fdc5..902e4f3fa6a 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPERATOR">
+ <indexterm zone="sql-dropoperator">
+  <primary>DROP OPERATOR</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP OPERATOR</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove an operator</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropoperator">
-  <primary>DROP OPERATOR</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( { <replaceable class="PARAMETER">left_type</replaceable> | NONE } , { <replaceable class="PARAMETER">right_type</replaceable> | NONE } ) [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_opfamily.sgml b/doc/src/sgml/ref/drop_opfamily.sgml
index 4cc67ef0530..d665e938833 100644
--- a/doc/src/sgml/ref/drop_opfamily.sgml
+++ b/doc/src/sgml/ref/drop_opfamily.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPFAMILY">
+ <indexterm zone="sql-dropopfamily">
+  <primary>DROP OPERATOR FAMILY</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP OPERATOR FAMILY</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove an operator family</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropopfamily">
-  <primary>DROP OPERATOR FAMILY</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index 48cf0fa535b..1cd8e60e400 100644
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROP-OWNED">
+ <indexterm zone="sql-drop-owned">
+  <primary>DROP OWNED</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP OWNED</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove database objects owned by a database role</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-drop-owned">
-  <primary>DROP OWNED</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml
index 92c0fb863dd..9a93da624a5 100644
--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPROLE">
+ <indexterm zone="sql-droprole">
+  <primary>DROP ROLE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a database role</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droprole">
-  <primary>DROP ROLE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index c845872566c..16ab2b1bb57 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPRULE">
+ <indexterm zone="sql-droprule">
+  <primary>DROP RULE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP RULE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a rewrite rule</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droprule">
-  <primary>DROP RULE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml
index 15dbc40817a..859f17e1857 100644
--- a/doc/src/sgml/ref/drop_schema.sgml
+++ b/doc/src/sgml/ref/drop_schema.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSCHEMA">
+ <indexterm zone="sql-dropschema">
+  <primary>DROP SCHEMA</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP SCHEMA</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a schema</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropschema">
-  <primary>DROP SCHEMA</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index f810b5976c1..b0f9cddda74 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSEQUENCE">
+ <indexterm zone="sql-dropsequence">
+  <primary>DROP SEQUENCE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP SEQUENCE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a sequence</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropsequence">
-  <primary>DROP SEQUENCE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml
index a6e6743357e..497d83fb4aa 100644
--- a/doc/src/sgml/ref/drop_server.sgml
+++ b/doc/src/sgml/ref/drop_server.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSERVER">
+ <indexterm zone="sql-dropserver">
+  <primary>DROP SERVER</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP SERVER</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a foreign server descriptor</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropserver">
-  <primary>DROP SERVER</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP SERVER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index fc51c7c6228..4cb1f49b3aa 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTABLE">
+ <indexterm zone="sql-droptable">
+  <primary>DROP TABLE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TABLE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a table</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptable">
-  <primary>DROP TABLE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index 1db6ecd59ad..d0a05af2e14 100644
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTABLESPACE">
+ <indexterm zone="sql-droptablespace">
+  <primary>DROP TABLESPACE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TABLESPACE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a tablespace</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptablespace">
-  <primary>DROP TABLESPACE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 3ec6cc7f059..2067aefca24 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTRIGGER">
+ <indexterm zone="sql-droptrigger">
+  <primary>DROP TRIGGER</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TRIGGER</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a trigger</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptrigger">
-  <primary>DROP TRIGGER</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml
index 8fcb0d3d5e2..831485e6a68 100644
--- a/doc/src/sgml/ref/drop_tsconfig.sgml
+++ b/doc/src/sgml/ref/drop_tsconfig.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSCONFIG">
+ <indexterm zone="sql-droptsconfig">
+  <primary>DROP TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TEXT SEARCH CONFIGURATION</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a text search configuration</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptsconfig">
-  <primary>DROP TEXT SEARCH CONFIGURATION</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml
index 12b88cd7d35..44b30cbe676 100644
--- a/doc/src/sgml/ref/drop_tsdictionary.sgml
+++ b/doc/src/sgml/ref/drop_tsdictionary.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSDICTIONARY">
+ <indexterm zone="sql-droptsdictionary">
+  <primary>DROP TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TEXT SEARCH DICTIONARY</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a text search dictionary</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptsdictionary">
-  <primary>DROP TEXT SEARCH DICTIONARY</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml
index 860d7e20bb3..789e807dbe2 100644
--- a/doc/src/sgml/ref/drop_tsparser.sgml
+++ b/doc/src/sgml/ref/drop_tsparser.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSPARSER">
+ <indexterm zone="sql-droptsparser">
+  <primary>DROP TEXT SEARCH PARSER</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TEXT SEARCH PARSER</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a text search parser</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptsparser">
-  <primary>DROP TEXT SEARCH PARSER</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml
index 8ad419d3ed2..ebf81367441 100644
--- a/doc/src/sgml/ref/drop_tstemplate.sgml
+++ b/doc/src/sgml/ref/drop_tstemplate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSTEMPLATE">
+ <indexterm zone="sql-droptstemplate">
+  <primary>DROP TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TEXT SEARCH TEMPLATE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a text search template</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptstemplate">
-  <primary>DROP TEXT SEARCH TEMPLATE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index c3ddfa5f425..98c8a3cbef5 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTYPE">
+ <indexterm zone="sql-droptype">
+  <primary>DROP TYPE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP TYPE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a data type</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-droptype">
-  <primary>DROP TYPE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml
index 1bdf03c5156..24e2a87ff2d 100644
--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPUSER">
+ <indexterm zone="sql-dropuser">
+  <primary>DROP USER</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP USER</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a database role</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropuser">
-  <primary>DROP USER</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml
index de21bfe5d7a..ddfad0bcadb 100644
--- a/doc/src/sgml/ref/drop_user_mapping.sgml
+++ b/doc/src/sgml/ref/drop_user_mapping.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPUSERMAPPING">
+ <indexterm zone="sql-dropusermapping">
+  <primary>DROP USER MAPPING</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP USER MAPPING</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a user mapping for a foreign server</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropusermapping">
-  <primary>DROP USER MAPPING</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable>
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 51b82664cb3..8b43be53600 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPVIEW">
+ <indexterm zone="sql-dropview">
+  <primary>DROP VIEW</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>DROP VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a view</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-dropview">
-  <primary>DROP VIEW</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 4593604f3bc..16c49e7928b 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPDB">
+ <indexterm zone="app-dropdb">
+  <primary>dropdb</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>dropdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a <productname>PostgreSQL</productname> database</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-dropdb">
-  <primary>dropdb</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>dropdb</command>
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 81b954a68f0..86f05d6b050 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPLANG">
+ <indexterm zone="app-droplang">
+  <primary>droplang</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>droplang</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a <productname>PostgreSQL</productname> procedural language</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-droplang">
-  <primary>droplang</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>droplang</command>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 180fb0bb62e..d7ad61b3d63 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPUSER">
+ <indexterm zone="app-dropuser">
+  <primary>dropuser</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>dropuser</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove a <productname>PostgreSQL</productname> user account</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-dropuser">
-  <primary>dropuser</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>dropuser</command>
diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index edd20dcdd55..029bd4a4d22 100644
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-ECPG">
+ <indexterm zone="app-ecpg">
+  <primary>ecpg</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>ecpg</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>embedded SQL C preprocessor</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-ecpg">
-  <primary>ecpg</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>ecpg</command>
diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml
index b60cb2c48bd..10e414515bf 100644
--- a/doc/src/sgml/ref/end.sgml
+++ b/doc/src/sgml/ref/end.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-END">
+ <indexterm zone="sql-end">
+  <primary>END</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>END</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>commit the current transaction</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-end">
-  <primary>END</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 END [ WORK | TRANSACTION ]
diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml
index 2c7308eaa58..76069c019ea 100644
--- a/doc/src/sgml/ref/execute.sgml
+++ b/doc/src/sgml/ref/execute.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-EXECUTE">
+ <indexterm zone="sql-execute">
+  <primary>EXECUTE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-execute">
+  <primary>prepared statements</primary>
+  <secondary>executing</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>EXECUTE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>execute a prepared statement</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-execute">
-  <primary>EXECUTE</primary>
- </indexterm>
-
- <indexterm zone="sql-execute">
-  <primary>prepared statements</primary>
-  <secondary>executing</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">parameter</replaceable> [, ...] ) ]
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index 0f579fb161f..04a78ee82ea 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -4,17 +4,6 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-EXPLAIN">
- <refmeta>
-  <refentrytitle>EXPLAIN</refentrytitle>
-  <manvolnum>7</manvolnum>
-  <refmiscinfo>SQL - Language Statements</refmiscinfo>
- </refmeta>
-
- <refnamediv>
-  <refname>EXPLAIN</refname>
-  <refpurpose>show the execution plan of a statement</refpurpose>
- </refnamediv>
-
  <indexterm zone="sql-explain">
   <primary>EXPLAIN</primary>
  </indexterm>
@@ -29,6 +18,17 @@ PostgreSQL documentation
   <secondary>showing the query plan</secondary>
  </indexterm>
 
+ <refmeta>
+  <refentrytitle>EXPLAIN</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>EXPLAIN</refname>
+  <refpurpose>show the execution plan of a statement</refpurpose>
+ </refnamediv>
+
  <refsynopsisdiv>
 <synopsis>
 EXPLAIN [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] <replaceable class="parameter">statement</replaceable>
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index cc49b6f0ce6..24c8c491569 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-FETCH">
+
+ <indexterm zone="sql-fetch">
+  <primary>FETCH</primary>
+ </indexterm>
+
+ <indexterm zone="sql-fetch">
+  <primary>cursor</primary>
+  <secondary>FETCH</secondary>
+ </indexterm>
  <refmeta>
   <refentrytitle>FETCH</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>retrieve rows from a query using a cursor</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-fetch">
-  <primary>FETCH</primary>
- </indexterm>
-
- <indexterm zone="sql-fetch">
-  <primary>cursor</primary>
-  <secondary>FETCH</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <!-- Note the "direction" bit is also in ref/move.sgml -->
 <synopsis>
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index fc3552bc1de..f2b25e546c3 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-GRANT">
+ <indexterm zone="sql-grant">
+  <primary>GRANT</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>GRANT</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>define access privileges</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-grant">
-  <primary>GRANT</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index b1067e23505..228edf75dac 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-INITDB">
+ <indexterm zone="app-initdb">
+  <primary>initdb</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>initdb</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>create a new <productname>PostgreSQL</productname> database cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-initdb">
-  <primary>initdb</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>initdb</command>
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index a3930beb38d..a3cccb9f7c7 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-INSERT">
+ <indexterm zone="sql-insert">
+  <primary>INSERT</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>INSERT</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>create new rows in a table</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-insert">
-  <primary>INSERT</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index 7287d3fc296..9cd53b02bb2 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-LISTEN">
+ <indexterm zone="sql-listen">
+  <primary>LISTEN</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>LISTEN</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>listen for a notification</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-listen">
-  <primary>LISTEN</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 LISTEN <replaceable class="PARAMETER">channel</replaceable>
diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml
index f44f313b5eb..a5a6ef8e67d 100644
--- a/doc/src/sgml/ref/load.sgml
+++ b/doc/src/sgml/ref/load.sgml
@@ -3,6 +3,10 @@ doc/src/sgml/ref/load.sgml
 -->
 
 <refentry id="SQL-LOAD">
+ <indexterm zone="sql-load">
+  <primary>LOAD</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>LOAD</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -14,10 +18,6 @@ doc/src/sgml/ref/load.sgml
   <refpurpose>load a shared library file</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-load">
-  <primary>LOAD</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 LOAD '<replaceable class="PARAMETER">filename</replaceable>'
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 95d67673761..26e424b63e8 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-LOCK">
+ <indexterm zone="sql-lock">
+  <primary>LOCK</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>LOCK</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>lock a table</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-lock">
-  <primary>LOCK</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ...] [ IN <replaceable class="PARAMETER">lockmode</replaceable> MODE ] [ NOWAIT ]
diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml
index 231f537c860..ed64f230689 100644
--- a/doc/src/sgml/ref/move.sgml
+++ b/doc/src/sgml/ref/move.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-MOVE">
+ <indexterm zone="sql-move">
+  <primary>MOVE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-move">
+  <primary>cursor</primary>
+  <secondary>MOVE</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>MOVE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>position a cursor</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-move">
-  <primary>MOVE</primary>
- </indexterm>
-
- <indexterm zone="sql-move">
-  <primary>cursor</primary>
-  <secondary>MOVE</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <!-- Note the "direction" bit is also in ref/fetch.sgml -->
 <synopsis>
diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml
index 307d2f62825..ad574e9ea03 100644
--- a/doc/src/sgml/ref/notify.sgml
+++ b/doc/src/sgml/ref/notify.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-NOTIFY">
+ <indexterm zone="sql-notify">
+  <primary>NOTIFY</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>NOTIFY</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>generate a notification</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-notify">
-  <primary>NOTIFY</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable class="PARAMETER">payload</replaceable> ]
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index ea2233123ec..84b45ae7a00 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-pgbasebackup">
+ <indexterm zone="app-pgbasebackup">
+  <primary>pg_basebackup</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>pg_basebackup</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>take a base backup of a <productname>PostgreSQL</productname> cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgbasebackup">
-  <primary>pg_basebackup</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_basebackup</command>
diff --git a/doc/src/sgml/ref/pg_config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml
index 5aac38b3cec..9f6db9e39b4 100644
--- a/doc/src/sgml/ref/pg_config-ref.sgml
+++ b/doc/src/sgml/ref/pg_config-ref.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/pg_config-ref.sgml -->
 
 <refentry id="app-pgconfig">
+ <indexterm zone="app-pgconfig">
+  <primary>pg_config</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>pg_config</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>retrieve information about the installed version of <productname>PostgreSQL</></refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgconfig">
-  <primary>pg_config</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_config</command>
diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index c9eebc089e6..fbf40fcf9de 100644
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-PGCONTROLDATA">
+ <indexterm zone="app-pgcontroldata">
+  <primary>pg_controldata</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_controldata</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>display control information of a <productname>PostgreSQL</productname> database cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgcontroldata">
-  <primary>pg_controldata</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_controldata</command>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 3107514901c..45b53ce1a1a 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-pg-ctl">
+ <indexterm zone="app-pg-ctl">
+  <primary>pg_ctl</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_ctl</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>initialize, start, stop, or control a <productname>PostgreSQL</productname> server</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pg-ctl">
-  <primary>pg_ctl</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_ctl</command>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 8d45f24bd2f..40c69f05421 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-PGDUMP">
+ <indexterm zone="app-pgdump">
+  <primary>pg_dump</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>pg_dump</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -18,10 +22,6 @@ PostgreSQL documentation
   </refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgdump">
-  <primary>pg_dump</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_dump</command>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5c6a101333f..f33793985f9 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-PG-DUMPALL">
+ <indexterm zone="app-pg-dumpall">
+  <primary>pg_dumpall</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_dumpall</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>extract a <productname>PostgreSQL</productname> database cluster into a script file</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pg-dumpall">
-  <primary>pg_dumpall</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_dumpall</command>
diff --git a/doc/src/sgml/ref/pg_isready.sgml b/doc/src/sgml/ref/pg_isready.sgml
index bef6a444155..cadfe8eb081 100644
--- a/doc/src/sgml/ref/pg_isready.sgml
+++ b/doc/src/sgml/ref/pg_isready.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-pg-isready">
+ <indexterm zone="app-pg-isready">
+  <primary>pg_isready</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_isready</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>check the connection status of a <productname>PostgreSQL</productname> server</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pg-isready">
-  <primary>pg_isready</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_isready</command>
diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml
index f05e7180948..78c105cc18a 100644
--- a/doc/src/sgml/ref/pg_receivexlog.sgml
+++ b/doc/src/sgml/ref/pg_receivexlog.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-pgreceivexlog">
+ <indexterm zone="app-pgreceivexlog">
+  <primary>pg_receivexlog</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>pg_receivexlog</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>streams transaction logs from a <productname>PostgreSQL</productname> cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgreceivexlog">
-  <primary>pg_receivexlog</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_receivexlog</command>
diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml
index b5286650cec..34b06069556 100644
--- a/doc/src/sgml/ref/pg_resetxlog.sgml
+++ b/doc/src/sgml/ref/pg_resetxlog.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-PGRESETXLOG">
+ <indexterm zone="app-pgresetxlog">
+  <primary>pg_resetxlog</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_resetxlog</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>reset the write-ahead log and other control information of a <productname>PostgreSQL</productname> database cluster</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgresetxlog">
-  <primary>pg_resetxlog</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_resetxlog</command>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 717da4272dd..cd60b2558a4 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/ref/pg_restore.sgml -->
 
 <refentry id="APP-PGRESTORE">
+ <indexterm zone="app-pgrestore">
+  <primary>pg_restore</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>pg_restore</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -16,10 +20,6 @@
   </refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgrestore">
-  <primary>pg_restore</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_restore</command>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 65fd0a29ffb..8e225e4c5d0 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-postgres">
+ <indexterm zone="app-postgres">
+  <primary>postgres</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>postgres</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose><productname>PostgreSQL</productname> database server</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-postgres">
-  <primary>postgres</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>postgres</command>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index d66fe1c3def..0a58a633312 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-postmaster">
+ <indexterm zone="app-postmaster">
+  <primary>postmaster</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>postmaster</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose><productname>PostgreSQL</productname> database server</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-postmaster">
-  <primary>postmaster</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>postmaster</command>
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index b1698f2bb88..dbce8f2ef23 100644
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-PREPARE">
+ <indexterm zone="sql-prepare">
+  <primary>PREPARE</primary>
+ </indexterm>
+
+ <indexterm zone="sql-prepare">
+  <primary>prepared statements</primary>
+  <secondary>creating</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>PREPARE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>prepare a statement for execution</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-prepare">
-  <primary>PREPARE</primary>
- </indexterm>
-
- <indexterm zone="sql-prepare">
-  <primary>prepared statements</primary>
-  <secondary>creating</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">data_type</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable>
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml
index a379819a0aa..626753f5762 100644
--- a/doc/src/sgml/ref/prepare_transaction.sgml
+++ b/doc/src/sgml/ref/prepare_transaction.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-PREPARE-TRANSACTION">
+ <indexterm zone="sql-prepare-transaction">
+  <primary>PREPARE TRANSACTION</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>PREPARE TRANSACTION</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>prepare the current transaction for two-phase commit</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-prepare-transaction">
-  <primary>PREPARE TRANSACTION</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 94635c56ce9..8813be8f2a2 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-PSQL">
+ <indexterm zone="app-psql">
+  <primary>psql</primary>
+ </indexterm>
+
   <refmeta>
     <refentrytitle><application>psql</application></refentrytitle>
     <manvolnum>1</manvolnum>
@@ -17,10 +21,6 @@ PostgreSQL documentation
     </refpurpose>
   </refnamediv>
 
- <indexterm zone="app-psql">
-  <primary>psql</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>psql</command>
diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml
index 0d6b1787e29..d7d6abb9d8c 100644
--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-REASSIGN-OWNED">
+ <indexterm zone="sql-reassign-owned">
+  <primary>REASSIGN OWNED</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>REASSIGN OWNED</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>change the ownership of database objects owned by a database role</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-reassign-owned">
-  <primary>REASSIGN OWNED</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 REASSIGN OWNED BY <replaceable class="PARAMETER">old_role</replaceable> [, ...] TO <replaceable class="PARAMETER">new_role</replaceable>
diff --git a/doc/src/sgml/ref/refresh_materialized_view.sgml b/doc/src/sgml/ref/refresh_materialized_view.sgml
index d2f8104aa7d..c165c69c9f9 100644
--- a/doc/src/sgml/ref/refresh_materialized_view.sgml
+++ b/doc/src/sgml/ref/refresh_materialized_view.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-REFRESHMATERIALIZEDVIEW">
+ <indexterm zone="sql-refreshmaterializedview">
+  <primary>REFRESH MATERIALIZED VIEW</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>REFRESH MATERIALIZED VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>replace the contents of a materialized view</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-refreshmaterializedview">
-  <primary>REFRESH MATERIALIZED VIEW</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</replaceable>
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index 722266563eb..54422c3442c 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-REINDEX">
+ <indexterm zone="sql-reindex">
+  <primary>REINDEX</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>REINDEX</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>rebuild indexes</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-reindex">
-  <primary>REINDEX</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> [ FORCE ]
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 3ba9951df8e..486f5c9367a 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-REINDEXDB">
+ <indexterm zone="app-reindexdb">
+  <primary>reindexdb</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>reindexdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>reindex a <productname>PostgreSQL</productname> database</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-reindexdb">
-  <primary>reindexdb</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>reindexdb</command>
diff --git a/doc/src/sgml/ref/release_savepoint.sgml b/doc/src/sgml/ref/release_savepoint.sgml
index 99b16d48e9d..b331b7226b0 100644
--- a/doc/src/sgml/ref/release_savepoint.sgml
+++ b/doc/src/sgml/ref/release_savepoint.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-RELEASE-SAVEPOINT">
+ <indexterm zone="sql-release-savepoint">
+  <primary>RELEASE SAVEPOINT</primary>
+ </indexterm>
+
+ <indexterm zone="sql-release-savepoint">
+  <primary>savepoints</primary>
+  <secondary>releasing</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>RELEASE SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>destroy a previously defined savepoint</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-release-savepoint">
-  <primary>RELEASE SAVEPOINT</primary>
- </indexterm>
-
- <indexterm zone="sql-release-savepoint">
-  <primary>savepoints</primary>
-  <secondary>releasing</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index d1ce7fb1246..7e76891bde0 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-RESET">
+ <indexterm zone="sql-reset">
+  <primary>RESET</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>RESET</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>restore the value of a run-time parameter to the default value</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-reset">
-  <primary>RESET</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index d2c5a4a5054..36c286bf0df 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-REVOKE">
+ <indexterm zone="sql-revoke">
+  <primary>REVOKE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>REVOKE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>remove access privileges</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-revoke">
-  <primary>REVOKE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 REVOKE [ GRANT OPTION FOR ]
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 9a1529f0b48..b0b1e8d0e3f 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK">
+ <indexterm zone="sql-rollback">
+  <primary>ROLLBACK</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>ROLLBACK</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>abort the current transaction</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-rollback">
-  <primary>ROLLBACK</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 ROLLBACK [ WORK | TRANSACTION ]
diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml
index 514e5ae441a..a5328e96a29 100644
--- a/doc/src/sgml/ref/rollback_prepared.sgml
+++ b/doc/src/sgml/ref/rollback_prepared.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK-PREPARED">
+ <indexterm zone="sql-rollback-prepared">
+  <primary>ROLLBACK PREPARED</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>ROLLBACK PREPARED</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>cancel a transaction that was earlier prepared for two-phase commit</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-rollback-prepared">
-  <primary>ROLLBACK PREPARED</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml
index c21449af676..060f408a633 100644
--- a/doc/src/sgml/ref/rollback_to.sgml
+++ b/doc/src/sgml/ref/rollback_to.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK-TO">
+ <indexterm zone="sql-rollback-to">
+  <primary>ROLLBACK TO SAVEPOINT</primary>
+ </indexterm>
+
+ <indexterm zone="sql-rollback-to">
+  <primary>savepoints</primary>
+  <secondary>rolling back</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>ROLLBACK TO SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>roll back to a savepoint</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-rollback-to">
-  <primary>ROLLBACK TO SAVEPOINT</primary>
- </indexterm>
-
- <indexterm zone="sql-rollback-to">
-  <primary>savepoints</primary>
-  <secondary>rolling back</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
diff --git a/doc/src/sgml/ref/savepoint.sgml b/doc/src/sgml/ref/savepoint.sgml
index 2ea873bfc77..5b944a25615 100644
--- a/doc/src/sgml/ref/savepoint.sgml
+++ b/doc/src/sgml/ref/savepoint.sgml
@@ -4,6 +4,15 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SAVEPOINT">
+ <indexterm zone="sql-savepoint">
+  <primary>SAVEPOINT</primary>
+ </indexterm>
+
+ <indexterm zone="sql-savepoint">
+  <primary>savepoints</primary>
+  <secondary>defining</secondary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,15 +24,6 @@ PostgreSQL documentation
   <refpurpose>define a new savepoint within the current transaction</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-savepoint">
-  <primary>SAVEPOINT</primary>
- </indexterm>
-
- <indexterm zone="sql-savepoint">
-  <primary>savepoints</primary>
-  <secondary>defining</secondary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SAVEPOINT <replaceable>savepoint_name</replaceable>
diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml
index d7595654e4d..6e2bd25240b 100644
--- a/doc/src/sgml/ref/security_label.sgml
+++ b/doc/src/sgml/ref/security_label.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SECURITY-LABEL">
+ <indexterm zone="sql-security-label">
+  <primary>SECURITY LABEL</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SECURITY LABEL</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>define or change a security label applied to an object</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-security-label">
-  <primary>SECURITY LABEL</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 9a468b98c0a..73957546627 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -4,19 +4,6 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SELECT">
- <refmeta>
-  <refentrytitle>SELECT</refentrytitle>
-  <manvolnum>7</manvolnum>
-  <refmiscinfo>SQL - Language Statements</refmiscinfo>
- </refmeta>
-
- <refnamediv>
-  <refname>SELECT</refname>
-  <refname>TABLE</refname>
-  <refname>WITH</refname>
-  <refpurpose>retrieve rows from a table or view</refpurpose>
- </refnamediv>
-
  <indexterm zone="sql-select">
   <primary>SELECT</primary>
  </indexterm>
@@ -30,6 +17,19 @@ PostgreSQL documentation
   <secondary>in SELECT</secondary>
  </indexterm>
 
+ <refmeta>
+  <refentrytitle>SELECT</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SELECT</refname>
+  <refname>TABLE</refname>
+  <refname>WITH</refname>
+  <refpurpose>retrieve rows from a table or view</refpurpose>
+ </refnamediv>
+
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index 48b789b5805..cf163725288 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SELECTINTO">
+ <indexterm zone="sql-selectinto">
+  <primary>SELECT INTO</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SELECT INTO</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-selectinto">
-  <primary>SELECT INTO</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index aaad61eb4fd..4ebb6a627b6 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SET">
+ <indexterm zone="sql-set">
+  <primary>SET</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SET</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>change a run-time parameter</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-set">
-  <primary>SET</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml
index 60cabeda3c4..7c31871b0bd 100644
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
@@ -1,5 +1,9 @@
 <!-- doc/src/sgml/ref/set_constraints.sgml -->
 <refentry id="SQL-SET-CONSTRAINTS">
+ <indexterm zone="sql-set-constraints">
+  <primary>SET CONSTRAINTS</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SET CONSTRAINTS</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -11,10 +15,6 @@
   <refpurpose>set constraint check timing for the current transaction</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-set-constraints">
-  <primary>SET CONSTRAINTS</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...] } { DEFERRED | IMMEDIATE }
diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml
index bb6ea5179f8..8e2deb76351 100644
--- a/doc/src/sgml/ref/set_role.sgml
+++ b/doc/src/sgml/ref/set_role.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SET-ROLE">
+ <indexterm zone="sql-set-role">
+  <primary>SET ROLE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SET ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>set the current user identifier of the current session</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-set-role">
-  <primary>SET ROLE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SET [ SESSION | LOCAL ] ROLE <replaceable class="parameter">role_name</replaceable>
diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml
index 856b030127a..4ac21289507 100644
--- a/doc/src/sgml/ref/set_session_auth.sgml
+++ b/doc/src/sgml/ref/set_session_auth.sgml
@@ -1,5 +1,9 @@
 <!-- doc/src/sgml/ref/set_session_auth.sgml -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
+ <indexterm zone="sql-set-session-authorization">
+  <primary>SET SESSION AUTHORIZATION</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SET SESSION AUTHORIZATION</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -11,10 +15,6 @@
   <refpurpose>set the session user identifier and the current user identifier of the current session</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-set-session-authorization">
-  <primary>SET SESSION AUTHORIZATION</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SET [ SESSION | LOCAL ] SESSION AUTHORIZATION <replaceable class="parameter">user_name</replaceable>
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index 029b75a2bcc..ca55a5b1966 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -1,16 +1,5 @@
 <!-- doc/src/sgml/ref/set_transaction.sgml -->
 <refentry id="SQL-SET-TRANSACTION">
- <refmeta>
-  <refentrytitle>SET TRANSACTION</refentrytitle>
-  <manvolnum>7</manvolnum>
-  <refmiscinfo>SQL - Language Statements</refmiscinfo>
- </refmeta>
-
- <refnamediv>
-  <refname>SET TRANSACTION</refname>
-  <refpurpose>set the characteristics of the current transaction</refpurpose>
- </refnamediv>
-
  <indexterm zone="sql-set-transaction">
   <primary>SET TRANSACTION</primary>
  </indexterm>
@@ -30,6 +19,17 @@
   <secondary>setting</secondary>
  </indexterm>
 
+ <refmeta>
+  <refentrytitle>SET TRANSACTION</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SET TRANSACTION</refname>
+  <refpurpose>set the characteristics of the current transaction</refpurpose>
+ </refnamediv>
+
  <refsynopsisdiv>
 <synopsis>
 SET TRANSACTION <replaceable class="parameter">transaction_mode</replaceable> [, ...]
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index 4a6a3fc7fe9..46bb239baf2 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-SHOW">
+ <indexterm zone="sql-show">
+  <primary>SHOW</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>SHOW</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>show the value of a run-time parameter</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-show">
-  <primary>SHOW</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SHOW <replaceable class="PARAMETER">name</replaceable>
diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml
index f25a3e9536e..60926f5dfef 100644
--- a/doc/src/sgml/ref/start_transaction.sgml
+++ b/doc/src/sgml/ref/start_transaction.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-START-TRANSACTION">
+ <indexterm zone="sql-start-transaction">
+  <primary>START TRANSACTION</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>START TRANSACTION</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>start a transaction block</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-start-transaction">
-  <primary>START TRANSACTION</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index 7b9c2f30128..87516c9cc36 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-TRUNCATE">
+ <indexterm zone="sql-truncate">
+  <primary>TRUNCATE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>TRUNCATE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>empty a table or set of tables</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-truncate">
-  <primary>TRUNCATE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ... ]
diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml
index c6436829d60..f7c3c47e2f3 100644
--- a/doc/src/sgml/ref/unlisten.sgml
+++ b/doc/src/sgml/ref/unlisten.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-UNLISTEN">
+ <indexterm zone="sql-unlisten">
+  <primary>UNLISTEN</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>UNLISTEN</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>stop listening for a notification</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-unlisten">
-  <primary>UNLISTEN</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * }
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 90b92085cd2..7f565be3c20 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-UPDATE">
+ <indexterm zone="sql-update">
+  <primary>UPDATE</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>UPDATE</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>update rows of a table</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-update">
-  <primary>UPDATE</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index 23c3ca89c73..450c94fcd3e 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-VACUUM">
+ <indexterm zone="sql-vacuum">
+  <primary>VACUUM</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>VACUUM</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>garbage-collect and optionally analyze a database</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-vacuum">
-  <primary>VACUUM</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 VACUUM [ ( { FULL | FREEZE | VERBOSE | ANALYZE } [, ...] ) ] [ <replaceable class="PARAMETER">table_name</replaceable> [ (<replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] ]
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index a5216ec0389..1c519f5944f 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="APP-VACUUMDB">
+ <indexterm zone="app-vacuumdb">
+  <primary>vacuumdb</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>vacuumdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>garbage-collect and analyze a <productname>PostgreSQL</productname> database</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-vacuumdb">
-  <primary>vacuumdb</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>vacuumdb</command>
diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml
index 1f0e9a8ba11..0fb3cd7bc2d 100644
--- a/doc/src/sgml/ref/values.sgml
+++ b/doc/src/sgml/ref/values.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="SQL-VALUES">
+ <indexterm zone="sql-values">
+  <primary>VALUES</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle>VALUES</refentrytitle>
   <manvolnum>7</manvolnum>
@@ -15,10 +19,6 @@ PostgreSQL documentation
   <refpurpose>compute a set of rows</refpurpose>
  </refnamediv>
 
- <indexterm zone="sql-values">
-  <primary>VALUES</primary>
- </indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ...]
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 079a4571fb8..d8af07e5d2f 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -63,6 +63,8 @@
  <title>Interface Functions</title>
 
  <refentry id="spi-spi-connect">
+  <indexterm><primary>SPI_connect</primary></indexterm>
+
   <refmeta>
    <refentrytitle>SPI_connect</refentrytitle>
    <manvolnum>3</manvolnum>
@@ -73,8 +75,6 @@
    <refpurpose>connect a procedure to the SPI manager</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_connect</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_connect(void)
@@ -135,6 +135,8 @@ int SPI_connect(void)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-finish">
+ <indexterm><primary>SPI_finish</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_finish</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -145,8 +147,6 @@ int SPI_connect(void)
   <refpurpose>disconnect a procedure from the SPI manager</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_finish</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_finish(void)
@@ -201,6 +201,8 @@ int SPI_finish(void)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-push">
+ <indexterm><primary>SPI_push</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_push</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -211,8 +213,6 @@ int SPI_finish(void)
   <refpurpose>push SPI stack to allow recursive SPI usage</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_push</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_push(void)
@@ -249,6 +249,8 @@ void SPI_push(void)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-pop">
+ <indexterm><primary>SPI_pop</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_pop</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -259,8 +261,6 @@ void SPI_push(void)
   <refpurpose>pop SPI stack to return from recursive SPI usage</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_pop</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_pop(void)
@@ -281,6 +281,8 @@ void SPI_pop(void)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-execute">
+ <indexterm><primary>SPI_execute</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_execute</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -291,8 +293,6 @@ void SPI_pop(void)
   <refpurpose>execute a command</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_execute</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_execute(const char * <parameter>command</parameter>, bool <parameter>read_only</parameter>, long <parameter>count</parameter>)
@@ -637,6 +637,8 @@ typedef struct
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-exec">
+ <indexterm><primary>SPI_exec</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_exec</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -647,8 +649,6 @@ typedef struct
   <refpurpose>execute a read/write command</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_exec</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_exec(const char * <parameter>command</parameter>, long <parameter>count</parameter>)
@@ -703,6 +703,8 @@ int SPI_exec(const char * <parameter>command</parameter>, long <parameter>count<
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-execute-with-args">
+ <indexterm><primary>SPI_execute_with_args</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_execute_with_args</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -713,8 +715,6 @@ int SPI_exec(const char * <parameter>command</parameter>, long <parameter>count<
   <refpurpose>execute a command with out-of-line parameters</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_execute_with_args</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_execute_with_args(const char *<parameter>command</parameter>,
@@ -856,6 +856,8 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-prepare">
+ <indexterm><primary>SPI_prepare</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_prepare</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -866,8 +868,6 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
   <refpurpose>prepare a statement, without executing it yet</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_prepare</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <parameter>nargs</parameter>, Oid * <parameter>argtypes</parameter>)
@@ -1018,6 +1018,8 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-prepare-cursor">
+ <indexterm><primary>SPI_prepare_cursor</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_prepare_cursor</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1028,8 +1030,6 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
   <refpurpose>prepare a statement, without executing it yet</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_prepare_cursor</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <parameter>nargs</parameter>,
@@ -1120,6 +1120,8 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-prepare-params">
+ <indexterm><primary>SPI_prepare_params</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_prepare_params</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1130,8 +1132,6 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
   <refpurpose>prepare a statement, without executing it yet</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_prepare_params</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SPIPlanPtr SPI_prepare_params(const char * <parameter>command</parameter>,
@@ -1208,6 +1208,8 @@ SPIPlanPtr SPI_prepare_params(const char * <parameter>command</parameter>,
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-getargcount">
+ <indexterm><primary>SPI_getargcount</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getargcount</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1219,8 +1221,6 @@ SPIPlanPtr SPI_prepare_params(const char * <parameter>command</parameter>,
   prepared by <function>SPI_prepare</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getargcount</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_getargcount(SPIPlanPtr <parameter>plan</parameter>)
@@ -1265,6 +1265,8 @@ int SPI_getargcount(SPIPlanPtr <parameter>plan</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-getargtypeid">
+ <indexterm><primary>SPI_getargtypeid</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getargtypeid</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1276,8 +1278,6 @@ int SPI_getargcount(SPIPlanPtr <parameter>plan</parameter>)
   a statement prepared by <function>SPI_prepare</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getargtypeid</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argIndex</parameter>)
@@ -1335,6 +1335,8 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-is-cursor-plan">
+ <indexterm><primary>SPI_is_cursor_plan</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_is_cursor_plan</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1347,8 +1349,6 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
   <function>SPI_cursor_open</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_is_cursor_plan</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 bool SPI_is_cursor_plan(SPIPlanPtr <parameter>plan</parameter>)
@@ -1404,6 +1404,8 @@ bool SPI_is_cursor_plan(SPIPlanPtr <parameter>plan</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-execute-plan">
+ <indexterm><primary>SPI_execute_plan</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_execute_plan</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1414,8 +1416,6 @@ bool SPI_is_cursor_plan(SPIPlanPtr <parameter>plan</parameter>)
   <refpurpose>execute a statement prepared by <function>SPI_prepare</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_execute_plan</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values</parameter>, const char * <parameter>nulls</parameter>,
@@ -1540,6 +1540,8 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-execute-plan-with-paramlist">
+ <indexterm><primary>SPI_execute_plan_with_paramlist</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_execute_plan_with_paramlist</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1550,8 +1552,6 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
   <refpurpose>execute a statement prepared by <function>SPI_prepare</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_execute_plan_with_paramlist</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
@@ -1635,6 +1635,8 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-execp">
+ <indexterm><primary>SPI_execp</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_execp</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1645,8 +1647,6 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
   <refpurpose>execute a statement in read/write mode</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_execp</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values</parameter>, const char * <parameter>nulls</parameter>, long <parameter>count</parameter>)
@@ -1739,6 +1739,8 @@ int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values<
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-open">
+ <indexterm><primary>SPI_cursor_open</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_open</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1749,8 +1751,6 @@ int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values<
   <refpurpose>set up a cursor using a statement created with <function>SPI_prepare</function></refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_open</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <parameter>plan</parameter>,
@@ -1863,6 +1863,8 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-open-with-args">
+ <indexterm><primary>SPI_cursor_open_with_args</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_open_with_args</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -1873,8 +1875,6 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
   <refpurpose>set up a cursor using a query and parameters</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_open_with_args</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
@@ -2016,6 +2016,8 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-open-with-paramlist">
+ <indexterm><primary>SPI_cursor_open_with_paramlist</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_open_with_paramlist</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2026,8 +2028,6 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
   <refpurpose>set up a cursor using parameters</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_open_with_paramlist</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
@@ -2112,6 +2112,8 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-find">
+ <indexterm><primary>SPI_cursor_find</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_find</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2122,8 +2124,6 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
   <refpurpose>find an existing cursor by name</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_find</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Portal SPI_cursor_find(const char * <parameter>name</parameter>)
@@ -2168,6 +2168,8 @@ Portal SPI_cursor_find(const char * <parameter>name</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-fetch">
+ <indexterm><primary>SPI_cursor_fetch</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_fetch</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2178,8 +2180,6 @@ Portal SPI_cursor_find(const char * <parameter>name</parameter>)
   <refpurpose>fetch some rows from a cursor</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_fetch</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_cursor_fetch(Portal <parameter>portal</parameter>, bool <parameter>forward</parameter>, long <parameter>count</parameter>)
@@ -2253,6 +2253,8 @@ void SPI_cursor_fetch(Portal <parameter>portal</parameter>, bool <parameter>forw
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-move">
+ <indexterm><primary>SPI_cursor_move</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_move</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2263,8 +2265,6 @@ void SPI_cursor_fetch(Portal <parameter>portal</parameter>, bool <parameter>forw
   <refpurpose>move a cursor</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_move</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_cursor_move(Portal <parameter>portal</parameter>, bool <parameter>forward</parameter>, long <parameter>count</parameter>)
@@ -2328,6 +2328,8 @@ void SPI_cursor_move(Portal <parameter>portal</parameter>, bool <parameter>forwa
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-scroll-cursor-fetch">
+ <indexterm><primary>SPI_scroll_cursor_fetch</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_scroll_cursor_fetch</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2338,8 +2340,6 @@ void SPI_cursor_move(Portal <parameter>portal</parameter>, bool <parameter>forwa
   <refpurpose>fetch some rows from a cursor</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_scroll_cursor_fetch</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirection <parameter>direction</parameter>,
@@ -2427,6 +2427,8 @@ void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirectio
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-scroll-cursor-move">
+ <indexterm><primary>SPI_scroll_cursor_move</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_scroll_cursor_move</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2437,8 +2439,6 @@ void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirectio
   <refpurpose>move a cursor</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_scroll_cursor_move</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection <parameter>direction</parameter>,
@@ -2528,6 +2528,8 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-cursor-close">
+ <indexterm><primary>SPI_cursor_close</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_cursor_close</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2538,8 +2540,6 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
   <refpurpose>close a cursor</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_cursor_close</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_cursor_close(Portal <parameter>portal</parameter>)
@@ -2580,6 +2580,8 @@ void SPI_cursor_close(Portal <parameter>portal</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-keepplan">
+ <indexterm><primary>SPI_keepplan</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_keepplan</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2590,8 +2592,6 @@ void SPI_cursor_close(Portal <parameter>portal</parameter>)
   <refpurpose>save a prepared statement</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_keepplan</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_keepplan(SPIPlanPtr <parameter>plan</parameter>)
@@ -2649,6 +2649,8 @@ int SPI_keepplan(SPIPlanPtr <parameter>plan</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-saveplan">
+ <indexterm><primary>SPI_saveplan</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_saveplan</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2659,8 +2661,6 @@ int SPI_keepplan(SPIPlanPtr <parameter>plan</parameter>)
   <refpurpose>save a prepared statement</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_saveplan</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 SPIPlanPtr SPI_saveplan(SPIPlanPtr <parameter>plan</parameter>)
@@ -2760,6 +2760,8 @@ SPIPlanPtr SPI_saveplan(SPIPlanPtr <parameter>plan</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-fname">
+ <indexterm><primary>SPI_fname</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_fname</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2770,8 +2772,6 @@ SPIPlanPtr SPI_saveplan(SPIPlanPtr <parameter>plan</parameter>)
   <refpurpose>determine the column name for the specified column number</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_fname</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 char * SPI_fname(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnumber</parameter>)
@@ -2827,6 +2827,8 @@ char * SPI_fname(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnum
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-fnumber">
+ <indexterm><primary>SPI_fnumber</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_fnumber</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2837,8 +2839,6 @@ char * SPI_fname(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnum
   <refpurpose>determine the column number for the specified column name</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_fnumber</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_fnumber(TupleDesc <parameter>rowdesc</parameter>, const char * <parameter>colname</parameter>)
@@ -2901,6 +2901,8 @@ int SPI_fnumber(TupleDesc <parameter>rowdesc</parameter>, const char * <paramete
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-getvalue">
+ <indexterm><primary>SPI_getvalue</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getvalue</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2911,8 +2913,6 @@ int SPI_fnumber(TupleDesc <parameter>rowdesc</parameter>, const char * <paramete
   <refpurpose>return the string value of the specified column</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getvalue</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 char * SPI_getvalue(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnumber</parameter>)
@@ -2985,6 +2985,8 @@ char * SPI_getvalue(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>r
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-getbinval">
+ <indexterm><primary>SPI_getbinval</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getbinval</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -2995,8 +2997,6 @@ char * SPI_getvalue(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>r
   <refpurpose>return the binary value of the specified column</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getbinval</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Datum SPI_getbinval(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnumber</parameter>,
@@ -3080,6 +3080,8 @@ Datum SPI_getbinval(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>r
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-gettype">
+ <indexterm><primary>SPI_gettype</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_gettype</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3090,8 +3092,6 @@ Datum SPI_getbinval(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>r
   <refpurpose>return the data type name of the specified column</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_gettype</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 char * SPI_gettype(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnumber</parameter>)
@@ -3146,6 +3146,8 @@ char * SPI_gettype(TupleDesc <parameter>rowdesc</parameter>, int <parameter>coln
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-gettypeid">
+ <indexterm><primary>SPI_gettypeid</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_gettypeid</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3156,8 +3158,6 @@ char * SPI_gettype(TupleDesc <parameter>rowdesc</parameter>, int <parameter>coln
   <refpurpose>return the data type <acronym>OID</acronym> of the specified column</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_gettypeid</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 Oid SPI_gettypeid(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnumber</parameter>)
@@ -3212,6 +3212,8 @@ Oid SPI_gettypeid(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnu
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-getrelname">
+ <indexterm><primary>SPI_getrelname</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getrelname</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3222,8 +3224,6 @@ Oid SPI_gettypeid(TupleDesc <parameter>rowdesc</parameter>, int <parameter>colnu
   <refpurpose>return the name of the specified relation</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getrelname</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 char * SPI_getrelname(Relation <parameter>rel</parameter>)
@@ -3265,6 +3265,8 @@ char * SPI_getrelname(Relation <parameter>rel</parameter>)
 </refentry>
 
 <refentry id="spi-spi-getnspname">
+ <indexterm><primary>SPI_getnspname</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_getnspname</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3275,8 +3277,6 @@ char * SPI_getrelname(Relation <parameter>rel</parameter>)
   <refpurpose>return the namespace of the specified relation</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_getnspname</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 char * SPI_getnspname(Relation <parameter>rel</parameter>)
@@ -3400,6 +3400,8 @@ char * SPI_getnspname(Relation <parameter>rel</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-palloc">
+ <indexterm><primary>SPI_palloc</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_palloc</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3410,8 +3412,6 @@ char * SPI_getnspname(Relation <parameter>rel</parameter>)
   <refpurpose>allocate memory in the upper executor context</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_palloc</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void * SPI_palloc(Size <parameter>size</parameter>)
@@ -3454,6 +3454,8 @@ void * SPI_palloc(Size <parameter>size</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-realloc">
+ <indexterm><primary>SPI_repalloc</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_repalloc</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3464,8 +3466,6 @@ void * SPI_palloc(Size <parameter>size</parameter>)
   <refpurpose>reallocate memory in the upper executor context</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_repalloc</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void * SPI_repalloc(void * <parameter>pointer</parameter>, Size <parameter>size</parameter>)
@@ -3524,6 +3524,8 @@ void * SPI_repalloc(void * <parameter>pointer</parameter>, Size <parameter>size<
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-pfree">
+ <indexterm><primary>SPI_pfree</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_pfree</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3534,8 +3536,6 @@ void * SPI_repalloc(void * <parameter>pointer</parameter>, Size <parameter>size<
   <refpurpose>free memory in the upper executor context</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_pfree</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_pfree(void * <parameter>pointer</parameter>)
@@ -3577,6 +3577,8 @@ void SPI_pfree(void * <parameter>pointer</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-copytuple">
+ <indexterm><primary>SPI_copytuple</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_copytuple</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3587,8 +3589,6 @@ void SPI_pfree(void * <parameter>pointer</parameter>)
   <refpurpose>make a copy of a row in the upper executor context</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_copytuple</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 HeapTuple SPI_copytuple(HeapTuple <parameter>row</parameter>)
@@ -3634,6 +3634,8 @@ HeapTuple SPI_copytuple(HeapTuple <parameter>row</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-returntuple">
+ <indexterm><primary>SPI_returntuple</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_returntuple</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3644,8 +3646,6 @@ HeapTuple SPI_copytuple(HeapTuple <parameter>row</parameter>)
   <refpurpose>prepare to return a tuple as a Datum</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_returntuple</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 HeapTupleHeader SPI_returntuple(HeapTuple <parameter>row</parameter>, TupleDesc <parameter>rowdesc</parameter>)
@@ -3709,6 +3709,8 @@ HeapTupleHeader SPI_returntuple(HeapTuple <parameter>row</parameter>, TupleDesc
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-modifytuple">
+ <indexterm><primary>SPI_modifytuple</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_modifytuple</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3719,8 +3721,6 @@ HeapTupleHeader SPI_returntuple(HeapTuple <parameter>row</parameter>, TupleDesc
   <refpurpose>create a row by replacing selected fields of a given row</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_modifytuple</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parameter>row</parameter>, int <parameter>ncols</parameter>,
@@ -3857,6 +3857,8 @@ HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parame
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-freetuple">
+ <indexterm><primary>SPI_freetuple</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_freetuple</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3867,8 +3869,6 @@ HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parame
   <refpurpose>free a row allocated in the upper executor context</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_freetuple</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_freetuple(HeapTuple <parameter>row</parameter>)
@@ -3909,6 +3909,8 @@ void SPI_freetuple(HeapTuple <parameter>row</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-freetupletable">
+ <indexterm><primary>SPI_freetuptable</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_freetuptable</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3920,8 +3922,6 @@ void SPI_freetuple(HeapTuple <parameter>row</parameter>)
   function</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_freetuptable</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 void SPI_freetuptable(SPITupleTable * <parameter>tuptable</parameter>)
@@ -3976,6 +3976,8 @@ void SPI_freetuptable(SPITupleTable * <parameter>tuptable</parameter>)
 <!-- *********************************************** -->
 
 <refentry id="spi-spi-freeplan">
+ <indexterm><primary>SPI_freeplan</primary></indexterm>
+
  <refmeta>
   <refentrytitle>SPI_freeplan</refentrytitle>
   <manvolnum>3</manvolnum>
@@ -3986,8 +3988,6 @@ void SPI_freetuptable(SPITupleTable * <parameter>tuptable</parameter>)
   <refpurpose>free a previously saved prepared statement</refpurpose>
  </refnamediv>
 
- <indexterm><primary>SPI_freeplan</primary></indexterm>
-
  <refsynopsisdiv>
 <synopsis>
 int SPI_freeplan(SPIPlanPtr <parameter>plan</parameter>)
diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml
index b9629bf2f54..9da61c93fe4 100644
--- a/doc/src/sgml/vacuumlo.sgml
+++ b/doc/src/sgml/vacuumlo.sgml
@@ -1,6 +1,10 @@
 <!-- doc/src/sgml/vacuumlo.sgml -->
 
 <refentry id="vacuumlo">
+ <indexterm zone="vacuumlo">
+  <primary>vacuumlo</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>vacuumlo</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -12,10 +16,6 @@
   <refpurpose>remove orphaned large objects from a <productname>PostgreSQL</productname> database</refpurpose>
  </refnamediv>
 
- <indexterm zone="vacuumlo">
-  <primary>vacuumlo</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>vacuumlo</command>