doc: Improve DocBook XML validity

DocBook XML is superficially compatible with DocBook SGML but has a
slightly stricter DTD that we have been violating in a few cases.
Although XSLT doesn't care whether the document is valid, the style
sheets don't necessarily process invalid documents correctly, so we need
to work toward fixing this.

This first commit moves the indexterms in refentry elements to an
allowed position.  It has no impact on the output.

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,

doc/src/sgml/oid2name.sgml

 <!-- 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>

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>

doc/src/sgml/pgarchivecleanup.sgml

 <!-- 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>

doc/src/sgml/pgbench.sgml

 <!-- 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>

doc/src/sgml/pgstandby.sgml

 <!-- 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>

doc/src/sgml/pgtestfsync.sgml

 <!-- 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>

doc/src/sgml/pgtesttiming.sgml

 <!-- 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>

doc/src/sgml/pgupgrade.sgml

 <!-- 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>

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 ]

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>

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>

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>

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> [ ... ] ]

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

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>

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

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> ]

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>

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>