diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 5ae2f59baeafc8036e719005fc5fd40729ae3ba3..6bb6ca99d108e7c83b24739e79b020969230810c 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.59 2009/06/17 21:58:48 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.60 2010/04/03 07:22:52 petere Exp $ -->
 
  <chapter id="tutorial-advanced">
   <title>Advanced Features</title>
@@ -318,7 +318,7 @@ COMMIT;
 
 
   <sect1 id="tutorial-window">
-   <title id="tutorial-window-title">Window Functions</title>
+   <title>Window Functions</title>
 
    <indexterm zone="tutorial-window">
     <primary>window function</primary>
@@ -555,7 +555,7 @@ SELECT sum(salary) OVER w, avg(salary) OVER w
     More details about window functions can be found in
     <xref linkend="syntax-window-functions">,
     <xref linkend="queries-window">, and the
-    <xref linkend="sql-select" endterm="sql-select-title"> reference page.
+    <xref linkend="sql-select"> reference page.
    </para>
   </sect1>
 
diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index 0863920ab236439d4b2c94a0e81e1e2143e0aaa1..888f6c2a50ee133a0fb2c1c2c8e43b7da3e0fcb5 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.33 2009/10/10 01:43:45 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.34 2010/04/03 07:22:52 petere Exp $ -->
 
  <chapter id="overview">
   <title>Overview of PostgreSQL Internals</title>
@@ -346,8 +346,8 @@
      space. In particular, this occurs when executing queries
      involving large numbers of join operations. In order to determine
      a reasonable (not necessarily optimal) query plan in a reasonable amount
-     of time, <productname>PostgreSQL</productname> uses a <xref
-     linkend="geqo" endterm="geqo-title"> when the number of joins
+     of time, <productname>PostgreSQL</productname> uses a <firstterm>Genetic
+     Query Optimizer</firstterm> (see <xref linkend="geqo">) when the number of joins
      exceeds a threshold (see <xref linkend="guc-geqo-threshold">).
     </para>
    </note>
diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml
index 2612bf6dbaf9f8d0e804830f6b3c8415b7c86541..56340b11de91fa36d17b3f2e61c4d902c6dde2cc 100644
--- a/doc/src/sgml/auto-explain.sgml
+++ b/doc/src/sgml/auto-explain.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/auto-explain.sgml,v 1.7 2010/02/20 22:24:29 adunstan Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/auto-explain.sgml,v 1.8 2010/04/03 07:22:52 petere Exp $ -->
 
 <sect1 id="auto-explain">
  <title>auto_explain</title>
@@ -10,7 +10,7 @@
  <para>
   The <filename>auto_explain</filename> module provides a means for
   logging execution plans of slow statements automatically, without
-  having to run <xref linkend="sql-explain" endterm="sql-explain-title">
+  having to run <xref linkend="sql-explain">
   by hand.  This is especially helpful for tracking down un-optimized queries
   in large applications.
  </para>
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 4180306a7cef03fcea93138e16bcd1c16684b633..1007fdc5f2880d71942b9346007ab9a2506fd38d 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.149 2010/04/01 13:52:56 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.150 2010/04/03 07:22:52 petere Exp $ -->
 
 <chapter id="backup">
  <title>Backup and Restore</title>
@@ -166,10 +166,10 @@ pg_dump -h <replaceable>host1</> <replaceable>dbname</> | psql -h <replaceable>h
 
    <para>
     After restoring a backup, it is wise to run <xref
-    linkend="sql-analyze" endterm="sql-analyze-title"> on each
+    linkend="sql-analyze"> on each
     database so the query optimizer has useful statistics;
-    see <xref linkend="vacuum-for-statistics" endterm="vacuum-for-statistics-title">
-    and <xref linkend="autovacuum" endterm="autovacuum-title"> for more information.
+    see <xref linkend="vacuum-for-statistics">
+    and <xref linkend="autovacuum"> for more information.
     For more advice on how to load large amounts of data
     into <productname>PostgreSQL</> efficiently, refer to <xref
     linkend="populate">.
@@ -1293,14 +1293,14 @@ archive_command = 'local_backup_script.sh'
      deleted rows will still retain pointers. In other words, if you modify a
      table with a hash index on it then you will get incorrect query results
      on a standby server.  When recovery completes it is recommended that you
-     manually <xref linkend="sql-reindex" endterm="sql-reindex-title">
+     manually <xref linkend="sql-reindex">
      each such index after completing a recovery operation.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     If a <xref linkend="sql-createdatabase" endterm="sql-createdatabase-title">
+     If a <xref linkend="sql-createdatabase">
      command is executed while a base backup is being taken, and then
      the template database that the <command>CREATE DATABASE</> copied
      is modified while the base backup is still in progress, it is
@@ -1313,7 +1313,7 @@ archive_command = 'local_backup_script.sh'
 
    <listitem>
     <para>
-     <xref linkend="sql-createtablespace" endterm="sql-createtablespace-title">
+     <xref linkend="sql-createtablespace">
      commands are WAL-logged with the literal absolute path, and will
      therefore be replayed as tablespace creations with the same
      absolute path.  This might be undesirable if the log is being
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index b104e0ef2c0abbcdab408952bae43f5bf1cc5618..4ab833133c316a8afa0bf3f3e09c03a86b1f6f42 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.224 2010/03/25 14:44:33 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.225 2010/04/03 07:22:52 petere Exp $ -->
 <!--
  Documentation of the system catalogs, directed toward PostgreSQL developers
  -->
@@ -354,7 +354,7 @@
 
   <para>
    New aggregate functions are registered with the <xref
-   linkend="sql-createaggregate" endterm="sql-createaggregate-title">
+   linkend="sql-createaggregate">
    command.  See <xref linkend="xaggr"> for more information about
    writing aggregate functions and the meaning of the transition
    functions, etc.
@@ -886,7 +886,7 @@
       <entry>
        <structfield>attstattarget</structfield> controls the level of detail
        of statistics accumulated for this column by
-       <xref linkend="sql-analyze" endterm="sql-analyze-title">.
+       <xref linkend="sql-analyze">.
        A zero value indicates that no statistics should be collected.
        A negative value says to use the system default statistics target.
        The exact meaning of positive values is data type-dependent.
@@ -1274,7 +1274,7 @@
   <para>
    The catalog <structname>pg_cast</structname> stores data type conversion
    paths, both built-in paths and those defined with
-   <xref linkend="sql-createcast" endterm="sql-createcast-title">.
+   <xref linkend="sql-createcast">.
   </para>
 
   <para>
@@ -1662,8 +1662,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -1962,7 +1962,7 @@
   <para>
    The catalog <structname>pg_conversion</structname> describes the
    available encoding conversion procedures.  See
-   <xref linkend="sql-createconversion" endterm="sql-createconversion-title">
+   <xref linkend="sql-createconversion">
    for more information.
   </para>
 
@@ -2047,7 +2047,7 @@
   <para>
    The catalog <structname>pg_database</structname> stores information about
    the available databases.  Databases are created with the <xref
-   linkend="sql-createdatabase" endterm="sql-createdatabase-title"> command.
+   linkend="sql-createdatabase"> command.
    Consult <xref linkend="managing-databases"> for details about the meaning
    of some of the parameters.
   </para>
@@ -2185,8 +2185,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -2467,7 +2467,7 @@
   <para>
    The catalog <structname>pg_description</> stores optional descriptions
    (comments) for each database object.  Descriptions can be manipulated
-   with the <xref linkend="sql-comment" endterm="sql-comment-title"> command and viewed with
+   with the <xref linkend="sql-comment"> command and viewed with
    <application>psql</application>'s <literal>\d</literal> commands.
    Descriptions of many built-in system objects are provided in the initial
    contents of <structname>pg_description</structname>.
@@ -2643,8 +2643,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -2732,8 +2732,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -3000,7 +3000,7 @@
   <para>
    The catalog <structname>pg_language</structname> registers
    languages in which you can write functions or stored procedures.
-   See <xref linkend="sql-createlanguage" endterm="sql-createlanguage-title">
+   See <xref linkend="sql-createlanguage">
    and <xref linkend="xplang"> for more information about language handlers.
   </para>
 
@@ -3076,7 +3076,7 @@
       <entry>
        This references a function that is responsible for executing
        <quote>inline</> anonymous code blocks
-       (<xref linkend="sql-do" endterm="sql-do-title"> blocks).
+       (<xref linkend="sql-do"> blocks).
        Zero if inline blocks are not supported
       </entry>
      </row>
@@ -3098,8 +3098,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -3231,8 +3231,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -3290,8 +3290,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -3418,7 +3418,7 @@
 
   <para>
    The catalog <structname>pg_operator</> stores information about operators.
-   See <xref linkend="sql-createoperator" endterm="sql-createoperator-title">
+   See <xref linkend="sql-createoperator">
    and <xref linkend="xoper"> for more information.
   </para>
 
@@ -3745,7 +3745,7 @@
 
   <para>
    The catalog <structname>pg_proc</> stores information about functions (or procedures).
-   See <xref linkend="sql-createfunction" endterm="sql-createfunction-title">
+   See <xref linkend="sql-createfunction">
    and <xref linkend="xfunc"> for more information.
   </para>
 
@@ -4011,8 +4011,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -4368,8 +4368,7 @@
   <para>
    The catalog <structname>pg_shdescription</structname> stores optional
    descriptions (comments) for shared database objects.  Descriptions can be
-   manipulated with the <xref linkend="sql-comment"
-   endterm="sql-comment-title"> command and viewed with
+   manipulated with the <xref linkend="sql-comment"> command and viewed with
    <application>psql</application>'s <literal>\d</literal> commands.
   </para>
 
@@ -4437,7 +4436,7 @@
   <para>
    The catalog <structname>pg_statistic</structname> stores
    statistical data about the contents of the database.  Entries are
-   created by <xref linkend="sql-analyze" endterm="sql-analyze-title">
+   created by <xref linkend="sql-analyze">
    and subsequently used by the query planner.  Note that all the
    statistical data is inherently approximate, even assuming that it
    is up-to-date.
@@ -4668,8 +4667,8 @@
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant" endterm="sql-grant-title"> and
-       <xref linkend="sql-revoke" endterm="sql-revoke-title">
+       <xref linkend="sql-grant"> and
+       <xref linkend="sql-revoke">
        for details
       </entry>
      </row>
@@ -4697,7 +4696,7 @@
 
   <para>
    The catalog <structname>pg_trigger</structname> stores triggers on tables.
-   See <xref linkend="sql-createtrigger" endterm="sql-createtrigger-title">
+   See <xref linkend="sql-createtrigger">
    for more information.
   </para>
 
@@ -5250,9 +5249,9 @@
   <para>
    The catalog <structname>pg_type</structname> stores information about data
    types.  Base types and enum types (scalar types) are created with
-   <xref linkend="sql-createtype" endterm="sql-createtype-title">, and
+   <xref linkend="sql-createtype">, and
    domains with
-   <xref linkend="sql-createdomain" endterm="sql-createdomain-title">.
+   <xref linkend="sql-createdomain">.
    A composite type is automatically created for each table in the database, to
    represent the row structure of the table.  It is also possible to create
    composite types with <command>CREATE TYPE AS</command>.
@@ -5917,7 +5916,7 @@
    <itemizedlist>
     <listitem>
      <para>
-      via the <xref linkend="sql-declare" endterm="sql-declare-title">
+      via the <xref linkend="sql-declare">
       statement in SQL
      </para>
     </listitem>
@@ -6414,8 +6413,7 @@
   <para>
    The <structname>pg_prepared_statements</structname> view displays
    all the prepared statements that are available in the current
-   session. See <xref linkend="sql-prepare"
-   endterm="sql-prepare-title"> for more information about prepared
+   session. See <xref linkend="sql-prepare"> for more information about prepared
    statements.
   </para>
 
@@ -6423,8 +6421,7 @@
    <structname>pg_prepared_statements</structname> contains one row
    for each prepared statement. Rows are added to the view when a new
    prepared statement is created and removed when a prepared statement
-   is released (for example, via the <xref linkend="sql-deallocate"
-   endterm="sql-deallocate-title"> command).
+   is released (for example, via the <xref linkend="sql-deallocate"> command).
   </para>
 
   <table>
@@ -6504,8 +6501,7 @@
   <para>
    The view <structname>pg_prepared_xacts</structname> displays
    information about transactions that are currently prepared for two-phase
-   commit (see <xref linkend="sql-prepare-transaction"
-   endterm="sql-prepare-transaction-title"> for details).
+   commit (see <xref linkend="sql-prepare-transaction"> for details).
   </para>
 
   <para>
@@ -6780,8 +6776,8 @@
   <para>
    The view <structname>pg_settings</structname> provides access to
    run-time parameters of the server.  It is essentially an alternative
-   interface to the <xref linkend="sql-show" endterm="sql-show-title">
-   and <xref linkend="sql-set" endterm="sql-set-title"> commands.
+   interface to the <xref linkend="sql-show">
+   and <xref linkend="sql-set"> commands.
    It also provides access to some facts about each parameter that are
    not directly available from <command>SHOW</>, such as minimum and
    maximum values.
@@ -6900,7 +6896,7 @@
    The <structname>pg_settings</structname> view cannot be inserted into or
    deleted from, but it can be updated.  An <command>UPDATE</command> applied
    to a row of <structname>pg_settings</structname> is equivalent to executing
-   the <xref linkend="sql-set" endterm="sql-set-title"> command on that named
+   the <xref linkend="sql-set"> command on that named
    parameter. The change only affects the value used by the current
    session. If an <command>UPDATE</command> is issued within a transaction
    that is later aborted, the effects of the <command>UPDATE</command> command
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 59d19383fba4c17d02b80a4a88d78a8f503e4c85..38b13954ea5ac28d7300b27ac7b03a7ab8791423 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.135 2010/03/31 20:18:10 heikki Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.136 2010/04/03 07:22:53 petere Exp $ -->
 
 <chapter id="client-authentication">
  <title>Client Authentication</title>
@@ -785,8 +785,8 @@ omicron         bryanh                  guest1
     separate from operating system user passwords. The password for
     each database user is stored in the <literal>pg_authid</> system
     catalog. Passwords can be managed with the SQL commands
-    <xref linkend="sql-createuser" endterm="sql-createuser-title"> and
-    <xref linkend="sql-alteruser" endterm="sql-alteruser-title">,
+    <xref linkend="sql-createuser"> and
+    <xref linkend="sql-alteruser">,
     e.g., <userinput>CREATE USER foo WITH PASSWORD 'secret'</userinput>.
     If no password has been set up for a user, the stored password
     is null and password authentication will always fail for that user.
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 988775dd123f5bfab8bb88b183dc6749bccdc0bf..81b0ba34457509b1e857fda5744eea0c995ba1a7 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.261 2010/03/17 18:03:55 mha Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.262 2010/04/03 07:22:53 petere Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -135,8 +135,8 @@ env PGOPTIONS='-c geqo=off' psql
     Furthermore, it is possible to assign a set of parameter settings to
     a user or a database.  Whenever a session is started, the default
     settings for the user and database involved are loaded.  The
-    commands <xref linkend="sql-alteruser" endterm="sql-alteruser-title">
-    and <xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title">,
+    commands <xref linkend="sql-alteruser">
+    and <xref linkend="sql-alterdatabase">,
     respectively, are used to configure these settings.  Per-database
     settings override anything received from the
     <command>postgres</command> command-line or the configuration
@@ -146,7 +146,7 @@ env PGOPTIONS='-c geqo=off' psql
 
    <para>
     Some parameters can be changed in individual <acronym>SQL</acronym>
-    sessions with the <xref linkend="SQL-SET" endterm="SQL-SET-title">
+    sessions with the <xref linkend="SQL-SET">
     command, for example:
 <screen>
 SET ENABLE_SEQSCAN TO OFF;
@@ -161,7 +161,7 @@ SET ENABLE_SEQSCAN TO OFF;
    </para>
 
    <para>
-    The <xref linkend="SQL-SHOW" endterm="SQL-SHOW-title">
+    The <xref linkend="SQL-SHOW">
     command allows inspection of the current values of all parameters.
    </para>
 
@@ -654,8 +654,8 @@ SET ENABLE_SEQSCAN TO OFF;
       <listitem>
        <para>
         When a password is specified in <xref
-        linkend="sql-createuser" endterm="sql-createuser-title"> or
-        <xref linkend="sql-alteruser" endterm="sql-alteruser-title">
+        linkend="sql-createuser"> or
+        <xref linkend="sql-alteruser">
         without writing either <literal>ENCRYPTED</> or
         <literal>UNENCRYPTED</>, this parameter determines whether the
         password is to be encrypted. The default is <literal>on</>
@@ -836,8 +836,7 @@ SET ENABLE_SEQSCAN TO OFF;
        <para>
         Sets the maximum number of transactions that can be in the
         <quote>prepared</> state simultaneously (see <xref
-        linkend="sql-prepare-transaction"
-        endterm="sql-prepare-transaction-title">).
+        linkend="sql-prepare-transaction">).
         Setting this parameter to zero (which is the default)
         disables the prepared-transaction feature.
         This parameter can only be set at server start.
@@ -1039,14 +1038,12 @@ SET ENABLE_SEQSCAN TO OFF;
     </sect2>
 
     <sect2 id="runtime-config-resource-vacuum-cost">
-     <title id="runtime-config-resource-vacuum-cost-title">
-       Cost-Based Vacuum Delay
-     </title>
+     <title>Cost-Based Vacuum Delay</title>
 
      <para>
-      During the execution of <xref linkend="sql-vacuum"
-      endterm="sql-vacuum-title"> and <xref linkend="sql-analyze"
-      endterm="sql-analyze-title"> commands, the system maintains an
+      During the execution of <xref linkend="sql-vacuum">
+      and <xref linkend="sql-analyze">
+      commands, the system maintains an
       internal counter that keeps track of the estimated cost of the
       various I/O operations that are performed.  When the accumulated
       cost reaches a limit (specified by
@@ -1908,10 +1905,9 @@ archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
        of these configuration parameters to force the optimizer to
        choose a different plan.
        Better ways to improve the quality of the
-       plans chosen by the optimizer include adjusting the <xref
-       linkend="runtime-config-query-constants"
-       endterm="runtime-config-query-constants-title">,  running <xref
-       linkend="sql-analyze" endterm="sql-analyze-title"> manually, increasing
+       plans chosen by the optimizer include adjusting the planer cost
+       constants (see <xref linkend="runtime-config-query-constants">),
+       running <xref linkend="sql-analyze"> manually, increasing
        the value of the <xref
        linkend="guc-default-statistics-target"> configuration parameter,
        and increasing the amount of statistics collected for
@@ -2058,9 +2054,7 @@ archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
      </variablelist>
      </sect2>
      <sect2 id="runtime-config-query-constants">
-     <title id="runtime-config-query-constants-title">
-      Planner Cost Constants
-     </title>
+     <title>Planner Cost Constants</title>
 
     <para>
      The <firstterm>cost</> variables described in this section are measured
@@ -4182,8 +4176,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <para>
         This parameter is normally on. When set to <literal>off</>, it
         disables validation of the function body string during <xref
-        linkend="sql-createfunction"
-        endterm="sql-createfunction-title">. Disabling validation is
+        linkend="sql-createfunction">. Disabling validation is
         occasionally useful to avoid problems such as forward references
         when restoring function definitions from a dump.
        </para>
@@ -4210,8 +4203,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
        <para>
         Consult <xref linkend="mvcc"> and <xref
-        linkend="sql-set-transaction"
-        endterm="sql-set-transaction-title"> for more information.
+        linkend="sql-set-transaction"> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -4233,8 +4225,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        </para>
 
        <para>
-        Consult <xref linkend="sql-set-transaction"
-        endterm="sql-set-transaction-title"> for more information.
+        Consult <xref linkend="sql-set-transaction"> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -4251,7 +4242,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         superuser privilege and results in discarding any previously cached
         query plans.  Possible values are <literal>origin</> (the default),
         <literal>replica</> and <literal>local</>.
-        See <xref linkend="sql-altertable" endterm="sql-altertable-title"> for
+        See <xref linkend="sql-altertable"> for
         more information.
        </para>
       </listitem>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 0ad4fd7567de77f849e363746d19eaaddcc48356..59a46ad0a3ad190b5e8f913f92e6831a240be070 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.247 2010/03/29 22:01:08 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.248 2010/04/03 07:22:53 petere Exp $ -->
 
  <chapter id="datatype">
-  <title id="datatype-title">Data Types</title>
+  <title>Data Types</title>
 
   <indexterm zone="datatype">
    <primary>data type</primary>
@@ -16,7 +16,7 @@
    <productname>PostgreSQL</productname> has a rich set of native data
    types available to users.  Users can add new types to
    <productname>PostgreSQL</productname> using the <xref
-   linkend="sql-createtype" endterm="sql-createtype-title"> command.
+   linkend="sql-createtype"> command.
   </para>
 
   <para>
@@ -2843,7 +2843,7 @@ SELECT * FROM test1 WHERE a;
 
     <para>
      Enum types are created using the <xref
-     linkend="sql-createtype" endterm="sql-createtype-title"> command,
+     linkend="sql-createtype"> command,
      for example:
 
 <programlisting>
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index 5672c1bb630e5580d317d85263550305d3cf671d..d90ea59982b2a60985c61170225cf646bd4c00d5 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.10 2010/01/06 19:07:05 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.11 2010/04/03 07:22:53 petere Exp $ -->
 
 <sect1 id="dblink">
  <title>dblink</title>
@@ -51,9 +51,9 @@
     the corresponding foreign-data wrapper.  See the example below, as
     well as the following:
     <simplelist type="inline">
-     <member><xref linkend="sql-createforeigndatawrapper" endterm="sql-createforeigndatawrapper-title"></member>
-     <member><xref linkend="sql-createserver" endterm="sql-createserver-title"></member>
-     <member><xref linkend="sql-createusermapping" endterm="sql-createusermapping-title"></member>
+     <member><xref linkend="sql-createforeigndatawrapper"></member>
+     <member><xref linkend="sql-createserver"></member>
+     <member><xref linkend="sql-createusermapping"></member>
     </simplelist>
    </para>
 
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 334ad51082c567588c3b3325c594edfed71e624d..c1dc645cc8f31741098cdc6dcab8b9430ccf36ae 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.91 2010/04/01 01:18:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.92 2010/04/03 07:22:53 petere Exp $ -->
 
 <chapter id="ddl">
  <title>Data Definition</title>
@@ -78,7 +78,7 @@
 
   <para>
    To create a table, you use the aptly named <xref
-   linkend="sql-createtable" endterm="sql-createtable-title"> command.
+   linkend="sql-createtable"> command.
    In this command you specify at least a name for the new table, the
    names of the columns and the data type of each column.  For
    example:
@@ -138,7 +138,7 @@ CREATE TABLE products (
 
   <para>
    If you no longer need a table, you can remove it using the <xref
-   linkend="sql-droptable" endterm="sql-droptable-title"> command.
+   linkend="sql-droptable"> command.
    For example:
 <programlisting>
 DROP TABLE my_first_table;
@@ -842,7 +842,7 @@ CREATE TABLE order_items (
     If the foreign key references a unique constraint, there are some
     additional possibilities regarding how null values are matched.
     These are explained in the reference documentation for
-    <xref linkend="sql-createtable" endterm="sql-createtable-title">.
+    <xref linkend="sql-createtable">.
    </para>
   </sect2>
 
@@ -1126,7 +1126,7 @@ CREATE TABLE circles (
    </itemizedlist>
 
    All these actions are performed using the
-   <xref linkend="sql-altertable" endterm="sql-altertable-title">
+   <xref linkend="sql-altertable">
    command, whose reference page contains details beyond those given
    here.
   </para>
@@ -1393,7 +1393,7 @@ ALTER TABLE products RENAME TO items;
    object vary depending on the object's type (table, function, etc).
    For complete information on the different types of privileges
    supported by <productname>PostgreSQL</productname>, refer to the
-   <xref linkend="sql-grant" endterm="sql-grant-title"> reference
+   <xref linkend="sql-grant"> reference
    page.  The following sections and chapters will also show you how
    those privileges are used.
   </para>
@@ -1406,7 +1406,7 @@ ALTER TABLE products RENAME TO items;
   <note>
    <para>
     To change the owner of a table, index, sequence, or view, use the
-    <xref linkend="sql-altertable" endterm="sql-altertable-title">
+    <xref linkend="sql-altertable">
     command.  There are corresponding <literal>ALTER</> commands for
     other object types.
    </para>
@@ -1453,9 +1453,8 @@ REVOKE ALL ON accounts FROM PUBLIC;
    the right to grant it in turn to others.  If the grant option is
    subsequently revoked then all who received the privilege from that
    recipient (directly or through a chain of grants) will lose the
-   privilege.  For details see the <xref linkend="sql-grant"
-   endterm="sql-grant-title"> and <xref linkend="sql-revoke"
-   endterm="sql-revoke-title"> reference pages.
+   privilege.  For details see the <xref linkend="sql-grant"> and
+   <xref linkend="sql-revoke"> reference pages.
   </para>
  </sect1>
 
@@ -1536,8 +1535,8 @@ REVOKE ALL ON accounts FROM PUBLIC;
    </indexterm>
 
    <para>
-    To create a schema, use the <xref linkend="sql-createschema"
-    endterm="sql-createschema-title"> command.  Give the schema a name
+    To create a schema, use the <xref linkend="sql-createschema">
+    command.  Give the schema a name
     of your choice.  For example:
 <programlisting>
 CREATE SCHEMA myschema;
@@ -2109,11 +2108,11 @@ VALUES ('New York', NULL, NULL, 'NY');
   <para>
    Table inheritance is typically established when the child table is
    created, using the <literal>INHERITS</> clause of the
-   <xref linkend="sql-createtable" endterm="sql-createtable-title">
+   <xref linkend="sql-createtable">
    statement.
    Alternatively, a table which is already defined in a compatible way can
    have a new parent relationship added, using the <literal>INHERIT</literal>
-   variant of <xref linkend="sql-altertable" endterm="sql-altertable-title">.
+   variant of <xref linkend="sql-altertable">.
    To do this the new child table must already include columns with
    the same names and types as the columns of the parent. It must also include
    check constraints with the same names and check expressions as those of the
@@ -2145,7 +2144,7 @@ VALUES ('New York', NULL, NULL, 'NY');
   </para>
 
   <para>
-   <xref linkend="sql-altertable" endterm="sql-altertable-title"> will
+   <xref linkend="sql-altertable"> will
    propagate any changes in column data definitions and check
    constraints down the inheritance hierarchy.  Again, dropping
    columns that are depended on by other tables is only possible when using
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index d6e18591c532b7727b89fa39a86511fb3d23f082..310787aa128435f5cb47668ab1f7b88243fa24a1 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/dfunc.sgml,v 1.35 2007/02/01 00:28:16 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/dfunc.sgml,v 1.36 2010/04/03 07:22:53 petere Exp $ -->
 
 <sect2 id="dfunc">
- <title id="dfunc-title">Compiling and Linking Dynamically-Loaded Functions</title>
+ <title>Compiling and Linking Dynamically-Loaded Functions</title>
 
  <para>
   Before you are able to use your
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 33ed078e8c3d78dbaf53f7de4e605fa7dc3a369c..69d162efe797d07e33e3125dd00dcdc043000c52 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/dml.sgml,v 1.21 2009/09/11 12:53:24 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/dml.sgml,v 1.22 2010/04/03 07:22:53 petere Exp $ -->
 
 <chapter id="dml">
  <title>Data Manipulation</title>
@@ -37,8 +37,8 @@
   </para>
 
   <para>
-   To create a new row, use the <xref linkend="sql-insert"
-   endterm="sql-insert-title"> command.  The command requires the
+   To create a new row, use the <xref linkend="sql-insert">
+   command.  The command requires the
    table name and column values.  For
    example, consider the products table from <xref linkend="ddl">:
 <programlisting>
@@ -105,9 +105,9 @@ INSERT INTO products (product_no, name, price) VALUES
   <tip>
    <para>
     When inserting a lot of data at the same time, considering using
-    the <xref linkend="sql-copy" endterm="sql-copy-title"> command.
-    It is not as flexible as the <xref linkend="sql-insert"
-    endterm="sql-insert-title"> command, but is more efficient. Refer
+    the <xref linkend="sql-copy"> command.
+    It is not as flexible as the <xref linkend="sql-insert">
+    command, but is more efficient. Refer
     to <xref linkend="populate"> for more information on improving
     bulk loading performance.
    </para>
@@ -133,8 +133,8 @@ INSERT INTO products (product_no, name, price) VALUES
   </para>
 
   <para>
-   To update existing rows, use the <xref linkend="sql-update"
-   endterm="sql-update-title"> command.  This requires
+   To update existing rows, use the <xref linkend="sql-update">
+   command.  This requires
    three pieces of information:
    <orderedlist spacing="compact">
     <listitem>
@@ -235,7 +235,7 @@ UPDATE mytable SET a = 5, b = 3, c = 1 WHERE a &gt; 0;
   </para>
 
   <para>
-   You use the <xref linkend="sql-delete" endterm="sql-delete-title">
+   You use the <xref linkend="sql-delete">
    command to remove rows; the syntax is very similar to the
    <command>UPDATE</command> command.  For instance, to remove all
    rows from the products table that have a price of 10, use:
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index caeda7e75cad27d6d0060ddce35aec033fee785d..476af79bf4d15085dbb1426faa8dc826a3db74aa 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/extend.sgml,v 1.37 2008/07/16 01:30:21 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/extend.sgml,v 1.38 2010/04/03 07:22:53 petere Exp $ -->
 
  <chapter id="extend">
   <title>Extending <acronym>SQL</acronym></title>
@@ -130,7 +130,7 @@
     <para>
      Composite types, or row types, are created whenever the user
      creates a table. It is also possible to use <xref
-     linkend="sql-createtype" endterm="sql-createtype-title"> to
+     linkend="sql-createtype"> to
      define a <quote>stand-alone</> composite type with no associated
      table.  A composite type is simply a list of types with
      associated field names.  A value of a composite type is a row or
@@ -152,7 +152,7 @@
 
     <para>
      Domains can be created using the <acronym>SQL</> command
-     <xref linkend="sql-createdomain" endterm="sql-createdomain-title">.
+     <xref linkend="sql-createdomain">.
      Their creation and use is not discussed in this chapter.
     </para>
    </sect2>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 411aff0aad3852ac1623c58bebe08088385c3eb7..18c4e364b8da6e84052c4908b59b36784291e179 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.510 2010/03/18 15:29:44 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.511 2010/04/03 07:22:54 petere Exp $ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
@@ -8877,7 +8877,7 @@ table2-mapping
    functions for operating on <firstterm>sequence objects</firstterm>.
    Sequence objects (also called sequence generators or just
    sequences) are special single-row tables created with <xref
-   linkend="sql-createsequence" endterm="sql-createsequence-title">.
+   linkend="sql-createsequence">.
    A sequence object is usually used to generate unique identifiers
    for rows of a table.  The sequence functions, listed in <xref
    linkend="functions-sequence-table">, provide simple, multiuser-safe
@@ -9070,7 +9070,7 @@ SELECT setval('foo', 42, false);    <lineannotation>Next <function>nextval</> wi
    If a sequence object has been created with default parameters,
    successive <function>nextval</function> calls will return successive values
    beginning with 1.  Other behaviors can be obtained by using
-   special parameters in the <xref linkend="sql-createsequence" endterm="sql-createsequence-title"> command;
+   special parameters in the <xref linkend="sql-createsequence"> command;
    see its command reference page for more information.
   </para>
 
@@ -11657,11 +11657,11 @@ postgres=# select * from unnest2(array[[1,2],[3,4]]);
    <para>
     The <function>session_user</function> is normally the user who initiated
     the current database connection; but superusers can change this setting
-    with <xref linkend="sql-set-session-authorization" endterm="sql-set-session-authorization-title">.
+    with <xref linkend="sql-set-session-authorization">.
     The <function>current_user</function> is the user identifier
     that is applicable for permission checking. Normally it is equal
     to the session user, but it can be changed with
-    <xref linkend="sql-set-role" endterm="sql-set-role-title">.
+    <xref linkend="sql-set-role">.
     It also changes during the execution of
     functions with the attribute <literal>SECURITY DEFINER</literal>.
     In Unix parlance, the session user is the <quote>real user</quote> and
@@ -11695,7 +11695,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
    <para>
     <function>pg_listening_channels</function> returns a set of names of
     channels that the current session is listening to.  See <xref
-    linkend="sql-listen" endterm="sql-listen-title"> for more information.
+    linkend="sql-listen"> for more information.
    </para>
 
    <indexterm>
@@ -12653,8 +12653,8 @@ SELECT typlen FROM pg_type WHERE oid = pg_typeof(33);
 
    <para>
     The functions shown in <xref linkend="functions-info-comment-table">
-    extract comments previously stored with the <xref linkend="sql-comment"
-    endterm="sql-comment-title"> command.  A null value is returned if no
+    extract comments previously stored with the <xref linkend="sql-comment">
+    command.  A null value is returned if no
     comment could be found for the specified parameters.
    </para>
 
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 8418467acb9154283d096c54e9805aad2a31699b..75ebdaa4c9a6203f5bf138bcacbee97322b9d352 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/geqo.sgml,v 1.42 2009/08/10 22:41:38 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/geqo.sgml,v 1.43 2010/04/03 07:22:54 petere Exp $ -->
 
  <chapter id="geqo">
   <chapterinfo>
@@ -25,7 +25,7 @@
    <date>1997-10-02</date>
   </chapterinfo>
 
-  <title id="geqo-title">Genetic Query Optimizer</title>
+  <title>Genetic Query Optimizer</title>
 
   <para>
    <note>
diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml
index adcb0455e043735e84bd1a599814be2a05115a05..2241dd5d9ac8a0c6a399d66f9d22da1270f53cd6 100644
--- a/doc/src/sgml/gin.sgml
+++ b/doc/src/sgml/gin.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.19 2009/04/09 19:07:44 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.20 2010/04/03 07:22:54 petere Exp $ -->
 
 <chapter id="GIN">
 <title>GIN Indexes</title>
@@ -241,8 +241,8 @@
    If consistent response time is more important than update speed,
    use of pending entries can be disabled by turning off the
    <literal>FASTUPDATE</literal> storage parameter for a
-   <acronym>GIN</acronym> index.  See <xref linkend="sql-createindex"
-   endterm="sql-createindex-title"> for details.
+   <acronym>GIN</acronym> index.  See <xref linkend="sql-createindex">
+   for details.
   </para>
  </sect2>
 
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 2e8a7a95aa4a9afbcee0b25db1e41254947d4549..13b783bc8642315cf383ba35f48aa74d7ebddf99 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.57 2010/03/31 20:41:50 heikki Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.58 2010/04/03 07:22:54 petere Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -201,9 +201,8 @@ protocol to make nodes agree on a serializable transactional order.
      must query such values from a single server and then use those
      values in write queries.  Also, care must be taken that all
      transactions either commit or abort on all servers, perhaps
-     using two-phase commit (<xref linkend="sql-prepare-transaction"
-     endterm="sql-prepare-transaction-title"> and <xref
-     linkend="sql-commit-prepared" endterm="sql-commit-prepared-title">.
+     using two-phase commit (<xref linkend="sql-prepare-transaction">
+     and <xref linkend="sql-commit-prepared">.
      <productname>Pgpool-II</> and <productname>Sequoia</> are examples of
      this type of replication.
     </para>
@@ -250,9 +249,8 @@ protocol to make nodes agree on a serializable transactional order.
     <para>
      <productname>PostgreSQL</> does not offer this type of replication,
      though <productname>PostgreSQL</> two-phase commit (<xref
-     linkend="sql-prepare-transaction"
-     endterm="sql-prepare-transaction-title"> and <xref
-     linkend="sql-commit-prepared" endterm="sql-commit-prepared-title">)
+     linkend="sql-prepare-transaction"> and <xref
+     linkend="sql-commit-prepared">)
      can be used to implement this in application code or middleware.
     </para>
    </listitem>
@@ -552,7 +550,7 @@ protocol to make nodes agree on a serializable transactional order.
     associated with tablespaces will be passed across unmodified, so both
     primary and standby servers must have the same mount paths for
     tablespaces if that feature is used.  Keep in mind that if
-    <xref linkend="sql-createtablespace" endterm="sql-createtablespace-title">
+    <xref linkend="sql-createtablespace">
     is executed on the primary, any new mount point needed for it must
     be created on the primary and all standby servers before the command
     is executed. Hardware need not be exactly the same, but experience shows
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index 0ab3e25e80b8718966288a7f9e779a330cfeabac..6f2887bd16dbb2df8fa3e8eddade0e4deaa5b12e 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.80 2010/01/01 21:53:49 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.81 2010/04/03 07:22:54 petere Exp $ -->
 
 <chapter id="indexes">
- <title id="indexes-title">Indexes</title>
+ <title>Indexes</title>
 
  <indexterm zone="indexes">
   <primary>index</primary>
@@ -997,7 +997,7 @@ SELECT am.amname AS index_method,
    maintenance or tuning, it is still important to check
    which indexes are actually used by the real-life query workload.
    Examining index usage for an individual query is done with the
-   <xref linkend="sql-explain" endterm="sql-explain-title">
+   <xref linkend="sql-explain">
    command; its application for this purpose is
    illustrated in <xref linkend="using-explain">.
    It is also possible to gather overall statistics about index usage
@@ -1015,7 +1015,7 @@ SELECT am.amname AS index_method,
   <itemizedlist>
    <listitem>
     <para>
-     Always run <xref linkend="sql-analyze" endterm="sql-analyze-title">
+     Always run <xref linkend="sql-analyze">
      first.  This command
      collects statistics about the distribution of the values in the
      table.  This information is required to estimate the number of rows
@@ -1025,8 +1025,8 @@ SELECT am.amname AS index_method,
      almost certain to be inaccurate.  Examining an application's
      index usage without having run <command>ANALYZE</command> is
      therefore a lost cause.
-     See <xref linkend="vacuum-for-statistics" endterm="vacuum-for-statistics-title">
-     and <xref linkend="autovacuum" endterm="autovacuum-title"> for more information.
+     See <xref linkend="vacuum-for-statistics">
+     and <xref linkend="autovacuum"> for more information.
     </para>
    </listitem>
 
@@ -1093,7 +1093,7 @@ SELECT am.amname AS index_method,
      An inaccurate selectivity estimate is due to
      insufficient statistics.  It might be possible to improve this by
      tuning the statistics-gathering parameters (see
-     <xref linkend="sql-altertable" endterm="sql-altertable-title">).
+     <xref linkend="sql-altertable">).
     </para>
 
     <para>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 3a22384057b5e8ebfb7edf3e7a3d782db9ebff6f..c880691438fda6be7fb3ded7df17ae1b4554cbc4 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.303 2010/02/27 03:41:34 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.304 2010/04/03 07:22:54 petere Exp $ -->
 
 <chapter id="libpq">
  <title><application>libpq</application> - C Library</title>
@@ -1804,12 +1804,12 @@ PGresult *PQprepare(PGconn *conn,
     </variablelist>
 
     Prepared statements for use with <function>PQexecPrepared</> can also
-    be created by executing SQL <xref linkend="sql-prepare"
-    endterm="sql-prepare-title"> statements.  (But <function>PQprepare</>
+    be created by executing SQL <xref linkend="sql-prepare">
+    statements.  (But <function>PQprepare</>
     is more flexible since it does not require parameter types to be
     pre-specified.)  Also, although there is no <application>libpq</>
     function for deleting a prepared statement, the SQL <xref
-    linkend="sql-deallocate" endterm="sql-deallocate-title"> statement
+    linkend="sql-deallocate"> statement
     can be used for that purpose.
    </para>
 
@@ -4279,7 +4279,7 @@ typedef struct {
        0 indicates the overall copy format is textual (rows separated by
        newlines, columns separated by separator characters, etc).  1
        indicates the overall copy format is binary.  See <xref
-       linkend="sql-copy" endterm="sql-copy-title"> for more information.
+       linkend="sql-copy"> for more information.
       </para>
      </listitem>
     </varlistentry>
@@ -4359,8 +4359,7 @@ typedef struct {
        into buffer loads of any convenient size.  Buffer-load boundaries
        have no semantic significance when sending.  The contents of the
        data stream must match the data format expected by the
-       <command>COPY</> command; see <xref linkend="sql-copy"
-       endterm="sql-copy-title"> for details.
+       <command>COPY</> command; see <xref linkend="sql-copy"> for details.
       </para>
      </listitem>
     </varlistentry>
@@ -6102,8 +6101,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
   <para>
    The following environment variables can be used to specify default
    behavior for each <productname>PostgreSQL</productname> session.  (See
-   also the <xref linkend="sql-alteruser" endterm="sql-alteruser-title">
-   and <xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title">
+   also the <xref linkend="sql-alteruser">
+   and <xref linkend="sql-alterdatabase">
    commands for ways to set default behavior on a per-user or per-database
    basis.)
 
@@ -6151,8 +6150,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
     </listitem>
    </itemizedlist>
 
-   Refer to the <acronym>SQL</acronym> command <xref linkend="sql-set"
-   endterm="sql-set-title"> for information on correct values for these
+   Refer to the <acronym>SQL</acronym> command <xref linkend="sql-set">
+   for information on correct values for these
    environment variables.
   </para>
 
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 0e567e7dbcd78295b7bce82940398c6cc50af40a..ea7d1c8dcec45ffcb3f2715b2a704022dfbbf56f 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.52 2010/02/17 04:19:37 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.53 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="largeObjects">
-  <title id="largeObjects-title">Large Objects</title>
+  <title>Large Objects</title>
 
   <indexterm zone="largeobjects"><primary>large object</></>
   <indexterm><primary>BLOB</><see>large object</></>
@@ -63,8 +63,8 @@
    <para>
     As of <productname>PostgreSQL</> 9.0, large objects have an owner
     and a set of access permissions, which can be managed using
-    <xref linkend="sql-grant" endterm="sql-grant-title"> and
-    <xref linkend="sql-revoke" endterm="sql-revoke-title">.  
+    <xref linkend="sql-grant"> and
+    <xref linkend="sql-revoke">.  
     For compatibility with prior releases, see
     <xref linkend="guc-lo-compat-privileges">.
     <literal>SELECT</literal> privileges are required to read a large
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 91d05b0243479f226d0812492fd40a1e1850c4a8..a0977c157b11c5a78e98b6638150693304c89ae8 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.101 2010/03/17 17:12:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.102 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="maintenance">
  <title>Routine Database Maintenance Tasks</title>
@@ -87,7 +87,7 @@
 
    <para>
     <productname>PostgreSQL</productname>'s
-    <xref linkend="sql-vacuum" endterm="sql-vacuum-title"> command has to
+    <xref linkend="sql-vacuum"> command has to
     process each table on a regular basis for several reasons:
 
     <orderedlist>
@@ -210,7 +210,7 @@
     their busiest tables as often as once every few minutes.) If you have
     multiple databases in a cluster, don't forget to
     <command>VACUUM</command> each one; the program <xref
-    linkend="app-vacuumdb" endterm="app-vacuumdb-title"> might be helpful.
+    linkend="app-vacuumdb"> might be helpful.
    </para>
 
    <tip>
@@ -220,9 +220,9 @@
     massive update or delete activity.  If you have such a table and
     you need to reclaim the excess disk space it occupies, you will need
     to use <command>VACUUM FULL</>, or alternatively
-    <xref linkend="sql-cluster" endterm="sql-cluster-title">
+    <xref linkend="sql-cluster">
     or one of the table-rewriting variants of
-    <xref linkend="sql-altertable" endterm="sql-altertable-title">.
+    <xref linkend="sql-altertable">.
     These commands rewrite an entire new copy of the table and build
     new indexes for it.  All these options require exclusive lock.  Note that
     they also temporarily use extra disk space approximately equal to the size
@@ -235,7 +235,7 @@
    <para>
     If you have a table whose entire contents are deleted on a periodic
     basis, consider doing it with
-    <xref linkend="sql-truncate" endterm="sql-truncate-title"> rather
+    <xref linkend="sql-truncate"> rather
     than using <command>DELETE</command> followed by
     <command>VACUUM</command>. <command>TRUNCATE</command> removes the
     entire content of the table immediately, without requiring a
@@ -247,7 +247,7 @@
   </sect2>
 
   <sect2 id="vacuum-for-statistics">
-   <title id="vacuum-for-statistics-title">Updating Planner Statistics</title>
+   <title>Updating Planner Statistics</title>
 
    <indexterm zone="vacuum-for-statistics">
     <primary>statistics</primary>
@@ -262,7 +262,7 @@
     The <productname>PostgreSQL</productname> query planner relies on
     statistical information about the contents of tables in order to
     generate good plans for queries.  These statistics are gathered by
-    the <xref linkend="sql-analyze" endterm="sql-analyze-title"> command,
+    the <xref linkend="sql-analyze"> command,
     which can be invoked by itself or
     as an optional step in <command>VACUUM</>.  It is important to have
     reasonably accurate statistics, otherwise poor choices of plans might
@@ -555,7 +555,7 @@ HINT:  Stop the postmaster and use a standalone backend to VACUUM in "mydb".
   </sect2>
 
   <sect2 id="autovacuum">
-   <title id="autovacuum-title">The Autovacuum Daemon</title>
+   <title>The Autovacuum Daemon</title>
 
    <indexterm>
     <primary>autovacuum</primary>
@@ -666,10 +666,8 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
     Another two parameters,
     <literal>autovacuum_vacuum_cost_delay</literal> and
     <literal>autovacuum_vacuum_cost_limit</literal>, are used to set
-    table-specific values for the
-    <xref linkend="runtime-config-resource-vacuum-cost"
-    endterm="runtime-config-resource-vacuum-cost-title">
-    feature.
+    table-specific values for the cost-based vacuum delay feature
+    (see <xref linkend="runtime-config-resource-vacuum-cost">).
     <literal>autovacuum_freeze_min_age</literal>,
     <literal>autovacuum_freeze_max_age</literal> and
     <literal>autovacuum_freeze_table_age</literal> are used to set
@@ -697,7 +695,7 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
 
   <para>
    In some situations it is worthwhile to rebuild indexes periodically
-   with the <xref linkend="sql-reindex" endterm="sql-reindex-title">
+   with the <xref linkend="sql-reindex">
    command.
   </para>
 
diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index da27e74d4ea9ebef763cf7f04da0428ec7705e54..e2321d125eb2d39c8302459ae25726f19fbc79ff 100644
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.61 2010/02/03 17:25:05 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.62 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="managing-databases">
  <title>Managing Databases</title>
@@ -86,7 +86,7 @@ SELECT datname FROM pg_database;
 
   <para>
    Databases are created with the SQL command
-   <xref linkend="sql-createdatabase" endterm="sql-createdatabase-title">:<indexterm><primary>CREATE
+   <xref linkend="sql-createdatabase">:<indexterm><primary>CREATE
    DATABASE</></>
 <synopsis>
 CREATE DATABASE <replaceable>name</>;
@@ -314,7 +314,7 @@ ALTER DATABASE mydb SET geqo TO off;
 
   <para>
    Databases are destroyed with the command
-   <xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title">:<indexterm><primary>DROP DATABASE</></>
+   <xref linkend="sql-dropdatabase">:<indexterm><primary>DROP DATABASE</></>
 <synopsis>
 DROP DATABASE <replaceable>name</>;
 </synopsis>
@@ -380,7 +380,7 @@ dropdb <replaceable class="parameter">dbname</replaceable>
 
   <para>
    To define a tablespace, use the <xref
-   linkend="sql-createtablespace" endterm="sql-createtablespace-title">
+   linkend="sql-createtablespace">
    command, for example:<indexterm><primary>CREATE TABLESPACE</></>:
 <programlisting>
 CREATE TABLESPACE fastspace LOCATION '/mnt/sda1/postgresql/data';
@@ -472,7 +472,7 @@ CREATE TABLE foo(i int);
 
   <para>
    To remove an empty tablespace, use the <xref
-   linkend="sql-droptablespace" endterm="sql-droptablespace-title">
+   linkend="sql-droptablespace">
    command.
   </para>
 
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index ae730203df858b82eef4492a7128ea4bfc01bd13..e9fbe9e304323f49a69c20b8877f24da4eb956fe 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.76 2010/02/03 17:25:05 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.77 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="monitoring">
  <title>Monitoring Database Activity</title>
@@ -27,8 +27,7 @@
    <command>ps</>, <command>top</>, <command>iostat</>, and <command>vmstat</>.
    Also, once one has identified a
    poorly-performing query, further investigation might be needed using
-   <productname>PostgreSQL</productname>'s <xref linkend="sql-explain"
-   endterm="sql-explain-title"> command.
+   <productname>PostgreSQL</productname>'s <xref linkend="sql-explain"> command.
    <xref linkend="using-explain"> discusses <command>EXPLAIN</>
    and other methods for understanding the behavior of an individual
    query.
@@ -159,7 +158,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
    Normally these parameters are set in <filename>postgresql.conf</> so
    that they apply to all server processes, but it is possible to turn
    them on or off in individual sessions using the <xref
-   linkend="sql-set" endterm="sql-set-title"> command. (To prevent
+   linkend="sql-set"> command. (To prevent
    ordinary users from hiding their activity from the administrator,
    only superusers are allowed to change these parameters with
    <command>SET</>.)
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index acce32dd9a1a87d9f2f51e20702f0bc27ea3f1e0..e3687aa34f004f8bdca1d30e4d891a4a4bddddcc 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.73 2010/02/24 14:10:24 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.74 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="mvcc">
   <title>Concurrency Control</title>
@@ -227,7 +227,7 @@
 
    <para>
     To set the transaction isolation level of a transaction, use the
-    command <xref linkend="sql-set-transaction" endterm="sql-set-transaction-title">.
+    command <xref linkend="sql-set-transaction">.
    </para>
 
   <sect2 id="xact-read-committed">
@@ -557,7 +557,7 @@ SELECT SUM(value) FROM mytab WHERE class = 2;
     which they are used automatically by
     <productname>PostgreSQL</productname>.  You can also acquire any
     of these locks explicitly with the command <xref
-    linkend="sql-lock" endterm="sql-lock-title">.
+    linkend="sql-lock">.
     Remember that all of these lock modes are table-level locks,
     even if the name contains the word
     <quote>row</quote>; the names of the lock modes are historical.
diff --git a/doc/src/sgml/passwordcheck.sgml b/doc/src/sgml/passwordcheck.sgml
index e46e3dfa034935ca04976d0e0e8c3a0f7e63481f..2da1f52650a0f4caa9a76e5e25ece16e1e3884ab 100644
--- a/doc/src/sgml/passwordcheck.sgml
+++ b/doc/src/sgml/passwordcheck.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/passwordcheck.sgml,v 1.1 2009/11/18 21:57:56 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/passwordcheck.sgml,v 1.2 2010/04/03 07:22:55 petere Exp $ -->
 
 <sect1 id="passwordcheck">
  <title>passwordcheck</title>
@@ -10,8 +10,8 @@
  <para>
   The <filename>passwordcheck</filename> module checks users' passwords
   whenever they are set with
-  <xref linkend="SQL-CREATEROLE" endterm="SQL-CREATEROLE-title"> or
-  <xref linkend="SQL-ALTERROLE" endterm="SQL-ALTERROLE-title">.
+  <xref linkend="SQL-CREATEROLE"> or
+  <xref linkend="SQL-ALTERROLE">.
   If a password is considered too weak, it will be rejected and
   the command will terminate with an error.
  </para>
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 02c5071d2aef612a1a943471dc5e67f990cf0d09..d7c36cc4e9f9a2be2e3873a9226f73b97cb49e34 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.74 2010/02/26 02:31:52 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.75 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="performance-tips">
   <title>Performance Tips</title>
@@ -32,7 +32,7 @@
     is absolutely critical for good performance, so the system includes
     a complex <firstterm>planner</> that tries to choose good plans.
     You can use the
-    <xref linkend="sql-explain" endterm="sql-explain-title"> command
+    <xref linkend="sql-explain"> command
     to see what query plan the planner creates for any query.
     Plan-reading is an art that deserves an extensive tutorial, which
     this is not; but here is some basic information.
@@ -801,7 +801,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
    <title>Use <command>COPY</command></title>
 
    <para>
-    Use <xref linkend="sql-copy" endterm="sql-copy-title"> to load
+    Use <xref linkend="sql-copy"> to load
     all the rows in one command, instead of using a series of
     <command>INSERT</command> commands.  The <command>COPY</command>
     command is optimized for loading large numbers of rows; it is less
@@ -813,7 +813,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
    <para>
     If you cannot use <command>COPY</command>, it might help to use <xref
-    linkend="sql-prepare" endterm="sql-prepare-title"> to create a
+    linkend="sql-prepare"> to create a
     prepared <command>INSERT</command> statement, and then use
     <command>EXECUTE</command> as many times as required.  This avoids
     some of the overhead of repeatedly parsing and planning
@@ -967,8 +967,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
    <para>
     Whenever you have significantly altered the distribution of data
-    within a table, running <xref linkend="sql-analyze"
-    endterm="sql-analyze-title"> is strongly recommended. This
+    within a table, running <xref linkend="sql-analyze"> is strongly recommended. This
     includes bulk loading large amounts of data into the table.  Running
     <command>ANALYZE</command> (or <command>VACUUM ANALYZE</command>)
     ensures that the planner has up-to-date statistics about the
@@ -977,8 +976,8 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     performance on any tables with inaccurate or nonexistent
     statistics.  Note that if the autovacuum daemon is enabled, it might
     run <command>ANALYZE</command> automatically; see
-    <xref linkend="vacuum-for-statistics" endterm="vacuum-for-statistics-title">
-    and <xref linkend="autovacuum" endterm="autovacuum-title"> for more information.
+    <xref linkend="vacuum-for-statistics">
+    and <xref linkend="autovacuum"> for more information.
    </para>
   </sect2>
 
@@ -1062,8 +1061,8 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     <varname>maintenance_work_mem</varname>; rather, you'd do that while
     manually recreating indexes and foreign keys afterwards.
     And don't forget to <command>ANALYZE</> when you're done; see
-    <xref linkend="vacuum-for-statistics" endterm="vacuum-for-statistics-title">
-    and <xref linkend="autovacuum" endterm="autovacuum-title"> for more information.
+    <xref linkend="vacuum-for-statistics">
+    and <xref linkend="autovacuum"> for more information.
    </para>
   </sect2>
   </sect1>
diff --git a/doc/src/sgml/plhandler.sgml b/doc/src/sgml/plhandler.sgml
index eb3c58243ee2861adb7d92430a38f9348ecdb27e..058eefbd655f628a2e21d4d59a6e8d5e538a2219 100644
--- a/doc/src/sgml/plhandler.sgml
+++ b/doc/src/sgml/plhandler.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plhandler.sgml,v 1.9 2009/11/23 21:41:20 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plhandler.sgml,v 1.10 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="plhandler">
    <title>Writing A Procedural Language Handler</title>
@@ -162,10 +162,10 @@ CREATE LANGUAGE plsample
     are a <firstterm>validator</firstterm> and an
     <firstterm>inline handler</firstterm>.  A validator can be provided
     to allow language-specific checking to be done during
-    <xref linkend="sql-createfunction" endterm="sql-createfunction-title">.
+    <xref linkend="sql-createfunction">.
     An inline handler can be provided to allow the language to support
     anonymous code blocks executed via the <xref linkend="sql-do"
-    endterm="sql-do-title"> command.
+   > command.
    </para>
 
    <para>
@@ -218,7 +218,7 @@ CREATE LANGUAGE plsample
     The procedural languages included in the standard distribution
     are good references when trying to write your own language handler.
     Look into the <filename>src/pl</> subdirectory of the source tree.
-    The <xref linkend="sql-createlanguage" endterm="sql-createlanguage-title">
+    The <xref linkend="sql-createlanguage">
     reference page also has some useful details.
    </para>
 
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 9d6c470263ba71b97c7b12e7fc2829eeff7af198..c4129510fc1ca42c10d4b042a8a5e5d7bb2edce5 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.82 2010/02/25 10:02:30 mha Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.83 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="plperl">
   <title>PL/Perl - Perl Procedural Language</title>
@@ -51,7 +51,7 @@
 
   <para>
    To create a function in the PL/Perl language, use the standard
-   <xref linkend="sql-createfunction" endterm="sql-createfunction-title">
+   <xref linkend="sql-createfunction">
    syntax:
 
 <programlisting>
@@ -69,7 +69,7 @@ $$ LANGUAGE plperl;
 
   <para>
    PL/Perl also supports anonymous code blocks called with the
-   <xref linkend="sql-do" endterm="sql-do-title"> statement:
+   <xref linkend="sql-do"> statement:
 
 <programlisting>
 DO $$
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index b682db80bc02b2a75e58e2d1f6b3215e818752bc..e0ecd1f3aa2192b56cf91d8c9dfb4c7c0c1b985d 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.151 2010/02/17 04:19:37 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.152 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="plpgsql">
   <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
@@ -1124,7 +1124,7 @@ EXECUTE 'SELECT count(*) FROM '
     <para>
      The <application>PL/pgSQL</application>
      <command>EXECUTE</command> statement is not related to the
-     <xref linkend="sql-execute" endterm="sql-execute-title"> SQL
+     <xref linkend="sql-execute"> SQL
      statement supported by the
      <productname>PostgreSQL</productname> server. The server's
      <command>EXECUTE</command> statement cannot be used directly within
@@ -2610,8 +2610,8 @@ FETCH <optional> <replaceable>direction</replaceable> { FROM | IN } </optional>
 
     <para>
      The <replaceable>direction</replaceable> clause can be any of the
-     variants allowed in the SQL <xref linkend="sql-fetch"
-     endterm="sql-fetch-title"> command except the ones that can fetch
+     variants allowed in the SQL <xref linkend="sql-fetch">
+     command except the ones that can fetch
      more than one row; namely, it can be
      <literal>NEXT</>,
      <literal>PRIOR</>,
@@ -2662,8 +2662,8 @@ MOVE <optional> <replaceable>direction</replaceable> { FROM | IN } </optional> <
 
     <para>
      The <replaceable>direction</replaceable> clause can be any of the
-     variants allowed in the SQL <xref linkend="sql-fetch"
-     endterm="sql-fetch-title"> command, namely
+     variants allowed in the SQL <xref linkend="sql-fetch">
+     command, namely
      <literal>NEXT</>,
      <literal>PRIOR</>,
      <literal>FIRST</>,
@@ -2705,7 +2705,7 @@ DELETE FROM <replaceable>table</replaceable> WHERE CURRENT OF <replaceable>curso
         restrictions on what the cursor's query can be (in particular,
         no grouping) and it's best to use <literal>FOR UPDATE</> in the
         cursor.  For more information see the
-        <xref linkend="sql-declare" endterm="sql-declare-title">
+        <xref linkend="sql-declare">
         reference page.
        </para>
 
@@ -4625,7 +4625,7 @@ $$ LANGUAGE plpgsql;
      the function always returns the same result when given the same
      arguments) and <quote>strictness</quote> (whether the function
      returns null if any argument is null).  Consult the <xref
-     linkend="sql-createfunction" endterm="sql-createfunction-title">
+     linkend="sql-createfunction">
      reference page for details.
     </para>
 
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 899891bee51130197944b1810b33841cadf1e46e..c4ea226a7fe13321f71fcfe47b0e21681c7da55a 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.48 2008/03/28 00:21:55 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.49 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="pltcl">
   <title>PL/Tcl - Tcl Procedural Language</title>
@@ -79,8 +79,7 @@
 
     <para>
      To create a function in the <application>PL/Tcl</> language, use
-     the standard <xref linkend="sql-createfunction"
-     endterm="sql-createfunction-title"> syntax:
+     the standard <xref linkend="sql-createfunction"> syntax:
 
 <programlisting>
 CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-types</replaceable>) RETURNS <replaceable>return-type</replaceable> AS $$
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index bb95ab71499c233029b76ceab312bce92141d58b..70762671610afe35bec1752ba3df531d8fcfabe6 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.86 2010/03/17 00:28:15 sriggs Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.87 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="protocol">
  <title>Frontend/Backend Protocol</title>
@@ -2419,7 +2419,7 @@ CopyInResponse (B)
                 characters, etc).
                 1 indicates the overall copy format is binary (similar
                 to DataRow format).
-                See <xref linkend="sql-copy" endterm="sql-copy-title">
+                See <xref linkend="sql-copy">
                 for more information.
 </para>
 </listitem>
@@ -2493,8 +2493,7 @@ CopyOutResponse (B)
                 is textual (rows separated by newlines, columns
                 separated by separator characters, etc). 1 indicates
                 the overall copy format is binary (similar to DataRow
-                format). See <xref linkend="sql-copy"
-                endterm="sql-copy-title"> for more information.
+                format). See <xref linkend="sql-copy"> for more information.
 </para>
 </listitem>
 </varlistentry>
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index 479d9baf44844c40f779af397568bcf4be0f89fc..5e165a38f2b48a68bd445178fbe08ffa019f3f58 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.56 2009/10/21 20:22:38 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.57 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="queries">
  <title>Queries</title>
@@ -24,7 +24,7 @@
   <para>
    The process of retrieving or the command to retrieve data from a
    database is called a <firstterm>query</firstterm>.  In SQL the
-   <xref linkend="sql-select" endterm="sql-select-title"> command is
+   <xref linkend="sql-select"> command is
    used to specify queries.  The general syntax of the
    <command>SELECT</command> command is
 <synopsis>
@@ -1508,8 +1508,7 @@ SELECT <replaceable>select_list</replaceable> FROM <replaceable>table_expression
   </para>
 
   <para>
-   For more information see <xref linkend="sql-values"
-   endterm="sql-values-title">.
+   For more information see <xref linkend="sql-values">.
   </para>
 
  </sect1>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index d9fcc23cd99e113e0310f31d279d663d9a02085a..0fd711368fe470483796ea52414d2656874904a6 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.54 2010/02/19 01:15:54 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.55 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="tutorial-sql">
   <title>The <acronym>SQL</acronym> Language</title>
@@ -267,8 +267,7 @@ COPY weather FROM '/home/user/weather.txt';
     where the file name for the source file must be available to the
     backend server machine, not the client, since the backend server
     reads the file directly.  You can read more about the
-    <command>COPY</command> command in <xref linkend="sql-copy"
-    endterm="sql-copy-title">.
+    <command>COPY</command> command in <xref linkend="sql-copy">.
    </para>
   </sect1>
 
diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index 527a7bbf7e7e6bdfeb44c2f9c75917c0bca2922b..4261cafe9b5648002b545b8009c02a81b5f0d06c 100644
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/abort.sgml,v 1.18 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/abort.sgml,v 1.19 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ABORT">
  <refmeta>
-  <refentrytitle id="sql-abort-title">ABORT</refentrytitle>
+  <refentrytitle>ABORT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -33,7 +33,7 @@ ABORT [ WORK | TRANSACTION ]
    all the updates made by the transaction to be discarded. 
    This command is identical
    in behavior to the standard <acronym>SQL</acronym> command
-   <xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE">,
+   <xref linkend="SQL-ROLLBACK">,
    and is present only for historical reasons.
   </para>
  </refsect1>
@@ -58,7 +58,7 @@ ABORT [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-COMMIT" endterm="SQL-COMMIT-TITLE"> to
+   Use <xref linkend="SQL-COMMIT"> to
    successfully terminate a transaction.
   </para>
 
@@ -93,9 +93,9 @@ ABORT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml
index 3f9f97a49ff2c074f08261f6b1f9d5f88ee34d9c..9c9cc464c384ce47c27eb8920b4fede17e205321 100644
--- a/doc/src/sgml/ref/alter_aggregate.sgml
+++ b/doc/src/sgml/ref/alter_aggregate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_aggregate.sgml,v 1.10 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_aggregate.sgml,v 1.11 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERAGGREGATE">
  <refmeta>
-  <refentrytitle id="SQL-ALTERAGGREGATE-TITLE">ALTER AGGREGATE</refentrytitle>
+  <refentrytitle>ALTER AGGREGATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -142,8 +142,8 @@ ALTER AGGREGATE myavg(integer) SET SCHEMA myschema;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createaggregate" endterm="sql-createaggregate-title"></member>
-   <member><xref linkend="sql-dropaggregate" endterm="sql-dropaggregate-title"></member>
+   <member><xref linkend="sql-createaggregate"></member>
+   <member><xref linkend="sql-dropaggregate"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml
index 4be65d30a7a52f8fb75a1c235f67f0ad1b4fc95f..0576fd4eda53f4aa8f69179b7a14b7f5ac90c7a2 100644
--- a/doc/src/sgml/ref/alter_conversion.sgml
+++ b/doc/src/sgml/ref/alter_conversion.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.10 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.11 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERCONVERSION">
  <refmeta>
-  <refentrytitle id="SQL-ALTERCONVERSION-TITLE">ALTER CONVERSION</refentrytitle>
+  <refentrytitle>ALTER CONVERSION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -111,8 +111,8 @@ ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createconversion" endterm="sql-createconversion-title"></member>
-   <member><xref linkend="sql-dropconversion" endterm="sql-dropconversion-title"></member>
+   <member><xref linkend="sql-createconversion"></member>
+   <member><xref linkend="sql-dropconversion"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index a30e39718adb783540861d947252a2d142ca8bfd..f150fbb7556509b973675ee0e9fcf92300a39972 100644
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.24 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.25 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERDATABASE">
  <refmeta>
-  <refentrytitle id="sql-alterdatabase-title">ALTER DATABASE</refentrytitle>
+  <refentrytitle>ALTER DATABASE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -160,7 +160,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
        </para>
 
        <para>
-        See <xref linkend="sql-set" endterm="sql-set-title"> and <xref linkend="runtime-config">
+        See <xref linkend="sql-set"> and <xref linkend="runtime-config">
         for more information about allowed parameter names
         and values.
        </para>
@@ -175,7 +175,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
   <para>
    It is also possible to tie a session default to a specific role
    rather than to a database; see
-   <xref linkend="sql-alterrole" endterm="sql-alterrole-title">.
+   <xref linkend="sql-alterrole">.
    Role-specific settings override database-specific
    ones if there is a conflict.
   </para>
@@ -207,10 +207,10 @@ ALTER DATABASE test SET enable_indexscan TO off;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase" endterm="sql-createdatabase-title"></member>
-   <member><xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title"></member>
-   <member><xref linkend="sql-set" endterm="sql-set-title"></member>
-   <member><xref linkend="sql-createtablespace" endterm="sql-createtablespace-title"></member>
+   <member><xref linkend="sql-createdatabase"></member>
+   <member><xref linkend="sql-dropdatabase"></member>
+   <member><xref linkend="sql-set"></member>
+   <member><xref linkend="sql-createtablespace"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml
index 66bf72b4e34892a18a700c6a87f93ed65f6762d7..9c16903f8aa74c334938e35ea366260e2b0aa2c1 100644
--- a/doc/src/sgml/ref/alter_default_privileges.sgml
+++ b/doc/src/sgml/ref/alter_default_privileges.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_default_privileges.sgml,v 1.2 2009/10/12 23:41:43 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_default_privileges.sgml,v 1.3 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERDEFAULTPRIVILEGES">
  <refmeta>
-  <refentrytitle id="SQL-ALTERDEFAULTPRIVILEGES-TITLE">ALTER DEFAULT PRIVILEGES</refentrytitle>
+  <refentrytitle>ALTER DEFAULT PRIVILEGES</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -85,7 +85,7 @@ REVOKE [ GRANT OPTION FOR ]
   </para>
 
   <para>
-   As explained under <xref linkend="sql-grant" endterm="sql-grant-title">,
+   As explained under <xref linkend="sql-grant">,
    the default privileges for any object type normally grant all grantable
    permissions to the object owner, and may grant some privileges to
    <literal>PUBLIC</> as well.  However, this behavior can be changed by
@@ -127,8 +127,8 @@ REVOKE [ GRANT OPTION FOR ]
       This parameter, and all the other parameters in
       <replaceable class="parameter">abbreviated_grant_or_revoke</>,
       act as described under
-      <xref linkend="sql-grant" endterm="sql-grant-title"> or
-      <xref linkend="sql-revoke" endterm="sql-revoke-title">,
+      <xref linkend="sql-grant"> or
+      <xref linkend="sql-revoke">,
       except that one is setting permissions for a whole class of objects
       rather than specific named objects.
      </para>
@@ -146,7 +146,7 @@ REVOKE [ GRANT OPTION FOR ]
    to obtain information about existing assignments of default privileges.
    The meaning of the privilege values is the same as explained for
    <command>\dp</command> under
-   <xref linkend="sql-grant" endterm="sql-grant-title">.
+   <xref linkend="sql-grant">.
   </para>
 
   <para>
@@ -203,8 +203,8 @@ ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-grant" endterm="sql-grant-title"></member>
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
+   <member><xref linkend="sql-grant"></member>
+   <member><xref linkend="sql-revoke"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index b265ce216f0a593ad2472feb20f70c924ad30b1c..dd921e1dc556ad2def4c1256bd4beae833cf3847 100644
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.24 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.25 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERDOMAIN">
  <refmeta>
-  <refentrytitle id="sql-alterdomain-title">ALTER DOMAIN</refentrytitle>
+  <refentrytitle>ALTER DOMAIN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -74,7 +74,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form adds a new constraint to a domain using the same syntax as
-      <xref linkend="SQL-CREATEDOMAIN" endterm="SQL-CREATEDOMAIN-TITLE">.
+      <xref linkend="SQL-CREATEDOMAIN">.
       This will only succeed if all columns using the domain satisfy the
       new constraint.
      </para>
@@ -260,8 +260,8 @@ ALTER DOMAIN zipcode SET SCHEMA customers;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdomain" endterm="sql-createdomain-title"></member>
-   <member><xref linkend="sql-dropdomain" endterm="sql-dropdomain-title"></member>
+   <member><xref linkend="sql-createdomain"></member>
+   <member><xref linkend="sql-dropdomain"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
index 79348bda6fd17e6faa9b14375a775a083aedc55b..41a195db4c002ac6a5707cdfc435eb36257e52d4 100644
--- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml,v 1.3 2009/06/19 15:28:25 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml,v 1.4 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERFOREIGNDATAWRAPPER">
  <refmeta>
-  <refentrytitle id="sql-alterforeigndatawrapper-title">ALTER FOREIGN DATA WRAPPER</refentrytitle>
+  <refentrytitle>ALTER FOREIGN DATA WRAPPER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -136,8 +136,8 @@ ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigndatawrapper" endterm="sql-createforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-dropforeigndatawrapper" endterm="sql-dropforeigndatawrapper-title"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"></member>
+   <member><xref linkend="sql-dropforeigndatawrapper"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml
index cce237600409631b057c750bfbff1ab26d1dba8f..23145932f41bbe804f78eebc78863e138d023c2d 100644
--- a/doc/src/sgml/ref/alter_function.sgml
+++ b/doc/src/sgml/ref/alter_function.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.18 2009/09/18 05:00:41 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.19 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERFUNCTION">
  <refmeta>
-  <refentrytitle id="SQL-ALTERFUNCTION-TITLE">ALTER FUNCTION</refentrytitle>
+  <refentrytitle>ALTER FUNCTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -159,8 +159,8 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
        null. <literal>RETURNS NULL ON NULL INPUT</literal> or
        <literal>STRICT</literal> changes the function so that it is not
        invoked if any of its arguments are null; instead, a null result
-       is assumed automatically.  See <xref linkend="sql-createfunction"
-       endterm="sql-createfunction-title"> for more information.
+       is assumed automatically.  See <xref linkend="sql-createfunction">
+       for more information.
       </para>
      </listitem>
    </varlistentry>
@@ -173,8 +173,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
      <listitem>
       <para>
        Change the volatility of the function to the specified setting.
-       See <xref linkend="sql-createfunction"
-       endterm="sql-createfunction-title"> for details.
+       See <xref linkend="sql-createfunction"> for details.
       </para>
     </listitem>
    </varlistentry>
@@ -187,8 +186,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
      <para>
       Change whether the function is a security definer or not. The
       key word <literal>EXTERNAL</literal> is ignored for SQL
-      conformance. See <xref linkend="sql-createfunction"
-      endterm="sql-createfunction-title"> for more information about
+      conformance. See <xref linkend="sql-createfunction"> for more information about
       this capability.
      </para>
     </listitem>
@@ -200,8 +198,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
      <listitem>
       <para>
        Change the estimated execution cost of the function.
-       See <xref linkend="sql-createfunction"
-       endterm="sql-createfunction-title"> for more information.
+       See <xref linkend="sql-createfunction"> for more information.
       </para>
      </listitem>
    </varlistentry>
@@ -212,8 +209,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
      <listitem>
       <para>
        Change the estimated number of rows returned by a set-returning
-       function.  See <xref linkend="sql-createfunction"
-       endterm="sql-createfunction-title"> for more information.
+       function.  See <xref linkend="sql-createfunction"> for more information.
       </para>
      </listitem>
    </varlistentry>
@@ -235,7 +231,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
        </para>
 
        <para>
-        See <xref linkend="sql-set" endterm="sql-set-title"> and
+        See <xref linkend="sql-set"> and
         <xref linkend="runtime-config">
         for more information about allowed parameter names and values.
        </para>
@@ -317,8 +313,8 @@ ALTER FUNCTION check_password(text) RESET search_path;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-dropfunction" endterm="sql-dropfunction-title"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-dropfunction"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml
index 2d4d3e90159a7b4ee363ffcf40ecdb1ef3afe903..64e5da8d0ffa7cfeab4faba35219126f66801e95 100644
--- a/doc/src/sgml/ref/alter_group.sgml
+++ b/doc/src/sgml/ref/alter_group.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.19 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.20 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERGROUP">
  <refmeta>
-  <refentrytitle id="SQL-ALTERGROUP-title">ALTER GROUP</refentrytitle>
+  <refentrytitle>ALTER GROUP</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -44,14 +44,14 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r
    <quote>group</> for this purpose.)  These variants are effectively
    equivalent to granting or revoking membership in the role named as the
    <quote>group</>; so the preferred way to do this is to use
-   <xref linkend="SQL-GRANT" endterm="SQL-GRANT-title"> or
-   <xref linkend="SQL-REVOKE" endterm="SQL-REVOKE-title">.
+   <xref linkend="SQL-GRANT"> or
+   <xref linkend="SQL-REVOKE">.
   </para>
 
   <para>
    The third variant changes the name of the group.  This is exactly
    equivalent to renaming the role with 
-   <xref linkend="sql-alterrole" endterm="sql-alterrole-title">.
+   <xref linkend="sql-alterrole">.
   </para>
  </refsect1>
 
@@ -121,9 +121,9 @@ ALTER GROUP workers DROP USER beth;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-grant" endterm="sql-grant-title"></member>
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
-   <member><xref linkend="sql-alterrole" endterm="sql-alterrole-title"></member>
+   <member><xref linkend="sql-grant"></member>
+   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="sql-alterrole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml
index dd9912ec4e20cb1d52e06dee77ebbedf67ed0dd5..6d04b108f0878b7c03c0a3fe4a54ba7516a75bc5 100644
--- a/doc/src/sgml/ref/alter_index.sgml
+++ b/doc/src/sgml/ref/alter_index.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_index.sgml,v 1.14 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_index.sgml,v 1.15 2010/04/03 07:22:56 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERINDEX">
  <refmeta>
-  <refentrytitle id="sql-alterindex-title">ALTER INDEX</refentrytitle>
+  <refentrytitle>ALTER INDEX</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -54,7 +54,7 @@ ALTER INDEX <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceab
       This form changes the index's tablespace to the specified tablespace and
       moves the data file(s) associated with the index to the new tablespace.
       See also 
-      <xref linkend="SQL-CREATETABLESPACE" endterm="sql-createtablespace-title">.
+      <xref linkend="SQL-CREATETABLESPACE">.
      </para>
     </listitem>
    </varlistentry>
@@ -65,11 +65,11 @@ ALTER INDEX <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceab
      <para>
       This form changes one or more index-method-specific storage parameters
       for the index.  See
-      <xref linkend="SQL-CREATEINDEX" endterm="sql-createindex-title">
+      <xref linkend="SQL-CREATEINDEX">
       for details on the available parameters.  Note that the index contents
       will not be modified immediately by this command; depending on the
       parameter you might need to rebuild the index with
-      <xref linkend="SQL-REINDEX" endterm="sql-reindex-title">
+      <xref linkend="SQL-REINDEX">
       to get the desired effects.
      </para>
     </listitem>
@@ -151,7 +151,7 @@ ALTER INDEX <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceab
 
    <para>
     These operations are also possible using
-    <xref linkend="SQL-ALTERTABLE" endterm="SQL-ALTERTABLE-TITLE">.
+    <xref linkend="SQL-ALTERTABLE">.
     <command>ALTER INDEX</> is in fact just an alias for the forms
     of <command>ALTER TABLE</> that apply to indexes.
    </para>
@@ -209,8 +209,8 @@ REINDEX INDEX distributors;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createindex" endterm="sql-createindex-title"></member>
-   <member><xref linkend="sql-reindex" endterm="sql-reindex-title"></member>
+   <member><xref linkend="sql-createindex"></member>
+   <member><xref linkend="sql-reindex"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgml
index 94c9222c1f0b830a28da531585dd3f087db5954b..362b3411fb95fbdfd5952a5eb5a1effabf937e8e 100644
--- a/doc/src/sgml/ref/alter_language.sgml
+++ b/doc/src/sgml/ref/alter_language.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_language.sgml,v 1.9 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_language.sgml,v 1.10 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERLANGUAGE">
  <refmeta>
-  <refentrytitle id="SQL-ALTERLANGUAGE-title">ALTER LANGUAGE</refentrytitle>
+  <refentrytitle>ALTER LANGUAGE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -83,8 +83,8 @@ ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO <replacea
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createlanguage" endterm="sql-createlanguage-title"></member>
-   <member><xref linkend="sql-droplanguage" endterm="sql-droplanguage-title"></member>
+   <member><xref linkend="sql-createlanguage"></member>
+   <member><xref linkend="sql-droplanguage"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgml
index fb278f8e33022ddf84974cee2c4be767308d7769..1e90a165a99b98a6d4c49698a2dccf0ff1adbfe1 100755
--- a/doc/src/sgml/ref/alter_large_object.sgml
+++ b/doc/src/sgml/ref/alter_large_object.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_large_object.sgml,v 1.2 2009/12/19 03:29:28 itagaki Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_large_object.sgml,v 1.3 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERLARGEOBJECT">
  <refmeta>
-  <refentrytitle id="SQL-ALTERLARGEOBJECT-title">ALTER LARGE OBJECT</refentrytitle>
+  <refentrytitle>ALTER LARGE OBJECT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -73,7 +73,7 @@ ALTER LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="largeObjects" endterm="largeObjects-title"></member>
+   <member><xref linkend="largeobjects"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgml
index fbdc051b80e520fc44c857f6dba76774aa5d5a4a..ef3078bfe430e0f16fc603941caa0ef555005d07 100644
--- a/doc/src/sgml/ref/alter_opclass.sgml
+++ b/doc/src/sgml/ref/alter_opclass.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opclass.sgml,v 1.10 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opclass.sgml,v 1.11 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTEROPCLASS">
  <refmeta>
-  <refentrytitle id="SQL-ALTEROPCLASS-TITLE">ALTER OPERATOR CLASS</refentrytitle>
+  <refentrytitle>ALTER OPERATOR CLASS</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -101,9 +101,9 @@ ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="p
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-dropopclass" endterm="sql-dropopclass-title"></member>
-   <member><xref linkend="sql-alteropfamily" endterm="sql-alteropfamily-title"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-dropopclass"></member>
+   <member><xref linkend="sql-alteropfamily"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml
index 9e6e8aff4792f08f047d548f082a02e759f2ea23..d67ae302d041a2268880983076fb94d135315943 100644
--- a/doc/src/sgml/ref/alter_operator.sgml
+++ b/doc/src/sgml/ref/alter_operator.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_operator.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_operator.sgml,v 1.6 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTEROPERATOR">
  <refmeta>
-  <refentrytitle id="SQL-ALTEROPERATOR-TITLE">ALTER OPERATOR</refentrytitle>
+  <refentrytitle>ALTER OPERATOR</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -112,8 +112,8 @@ ALTER OPERATOR @@ (text, text) OWNER TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createoperator" endterm="sql-createoperator-title"></member>
-   <member><xref linkend="sql-dropoperator" endterm="sql-dropoperator-title"></member>
+   <member><xref linkend="sql-createoperator"></member>
+   <member><xref linkend="sql-dropoperator"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml
index 6e28b8540a81c4ef9e3cf204a9275e43c8f2f21e..70f20db2b404acabc3062f9ce61fdc9467ee43c1 100644
--- a/doc/src/sgml/ref/alter_opfamily.sgml
+++ b/doc/src/sgml/ref/alter_opfamily.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.6 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.7 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTEROPFAMILY">
  <refmeta>
-  <refentrytitle id="SQL-ALTEROPFAMILY-TITLE">ALTER OPERATOR FAMILY</refentrytitle>
+  <refentrytitle>ALTER OPERATOR FAMILY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -52,8 +52,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
    are compatible with the family's semantics, but are not required for
    correct functioning of any specific index.  (Operators and functions
    that are so required should be declared as part of an operator class,
-   instead; see <xref linkend="sql-createopclass"
-   endterm="sql-createopclass-title">.)
+   instead; see <xref linkend="sql-createopclass">.)
    <productname>PostgreSQL</productname> will allow loose members of a
    family to be dropped from the family at any time, but members of an
    operator class cannot be dropped without dropping the whole class and
@@ -313,11 +312,11 @@ ALTER OPERATOR FAMILY integer_ops USING btree DROP
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createopfamily" endterm="sql-createopfamily-title"></member>
-   <member><xref linkend="sql-dropopfamily" endterm="sql-dropopfamily-title"></member>
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-alteropclass" endterm="sql-alteropclass-title"></member>
-   <member><xref linkend="sql-dropopclass" endterm="sql-dropopclass-title"></member>
+   <member><xref linkend="sql-createopfamily"></member>
+   <member><xref linkend="sql-dropopfamily"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-alteropclass"></member>
+   <member><xref linkend="sql-dropopclass"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml
index 2d09de10c4c1c5af7f31bb68fc07e740ee37a3ce..3a2504cd0a0c3e5207a314850e46a1fa11988a82 100644
--- a/doc/src/sgml/ref/alter_role.sgml
+++ b/doc/src/sgml/ref/alter_role.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.15 2009/10/07 22:14:16 alvherre Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.16 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERROLE">
  <refmeta>
-  <refentrytitle id="sql-alterrole-title">ALTER ROLE</refentrytitle>
+  <refentrytitle>ALTER ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -55,11 +55,11 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
   <para>
    The first variant of this command listed in the synopsis can change
    many of the role attributes that can be specified in 
-   <xref linkend="sql-createrole" endterm="sql-createrole-title">.
+   <xref linkend="sql-createrole">.
    (All the possible attributes are covered,
    except that there are no options for adding or removing memberships; use
-   <xref linkend="SQL-GRANT" endterm="SQL-GRANT-title"> and
-   <xref linkend="SQL-REVOKE" endterm="SQL-REVOKE-title"> for that.)
+   <xref linkend="SQL-GRANT"> and
+   <xref linkend="SQL-REVOKE"> for that.)
    Attributes not mentioned in the command retain their previous settings.
    Database superusers can change any of these settings for any role.
    Roles having <literal>CREATEROLE</> privilege can change any of these
@@ -88,7 +88,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
    <filename>postgresql.conf</> or has been received from the postgres
    command line. This only happens at login time, so configuration
    settings associated with a role to which you've <xref
-   linkend="sql-set-role" endterm="sql-set-role-title"> will be ignored. Settings set to
+   linkend="sql-set-role"> will be ignored. Settings set to
    a role directly are overridden by any database specific settings attached to a role.
    Superusers can change anyone's session defaults. Roles having
    <literal>CREATEROLE</> privilege can change defaults for non-superuser
@@ -131,8 +131,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
       <listitem>
        <para>
         These clauses alter attributes originally set by
-        <xref linkend="SQL-CREATEROLE"
-        endterm="SQL-CREATEROLE-title">. For more information, see the
+        <xref linkend="SQL-CREATEROLE">. For more information, see the
         <command>CREATE ROLE</command> reference page.
        </para>
       </listitem>
@@ -176,12 +175,12 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
 
        <para>
         Role-specific variable setting take effect only at login;
-        <xref linkend="sql-set-role" endterm="sql-set-role-title">
+        <xref linkend="sql-set-role">
         does not process role-specific variable settings.
        </para>
 
        <para>
-        See <xref linkend="sql-set" endterm="sql-set-title"> and <xref
+        See <xref linkend="sql-set"> and <xref
         linkend="runtime-config"> for more information about allowed
         parameter names and values.
        </para>
@@ -194,15 +193,14 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-CREATEROLE" endterm="SQL-CREATEROLE-title">
-   to add new roles, and <xref linkend="SQL-DROPROLE"
-   endterm="SQL-DROPROLE-title"> to remove a role.
+   Use <xref linkend="SQL-CREATEROLE">
+   to add new roles, and <xref linkend="SQL-DROPROLE"> to remove a role.
   </para>
 
   <para>
    <command>ALTER ROLE</command> cannot change a role's memberships.
-   Use <xref linkend="SQL-GRANT" endterm="SQL-GRANT-title"> and
-   <xref linkend="SQL-REVOKE" endterm="SQL-REVOKE-title">
+   Use <xref linkend="SQL-GRANT"> and
+   <xref linkend="SQL-REVOKE">
    to do that.
   </para>
 
@@ -210,8 +208,8 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
    Caution must be exercised when specifying an unencrypted password
    with this command.  The password will be transmitted to the server
    in cleartext, and it might also be logged in the client's command
-   history or the server log.  <xref linkend="app-psql"
-   endterm="app-psql-title"> contains a command
+   history or the server log.  <xref linkend="app-psql">
+   contains a command
    <command>\password</command> that can be used to safely change a
    role's password.
   </para>
@@ -219,7 +217,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
   <para>
    It is also possible to tie a
    session default to a specific database rather than to a role; see
-   <xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title">.
+   <xref linkend="sql-alterdatabase">.
    If there is a conflict, database-role-specific settings override role-specific
    ones, which in turn override database-specific ones.
   </para>
@@ -300,9 +298,9 @@ ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole" endterm="sql-createrole-title"></member>
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
-   <member><xref linkend="sql-set" endterm="sql-set-title"></member>
+   <member><xref linkend="sql-createrole"></member>
+   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="sql-set"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgml
index 122b07460973e6cf65b02eb0fe938e7ee3778b0d..7f510e9ad42af17aaaa7164b0dd43a2a533824b6 100644
--- a/doc/src/sgml/ref/alter_schema.sgml
+++ b/doc/src/sgml/ref/alter_schema.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_schema.sgml,v 1.11 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_schema.sgml,v 1.12 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERSCHEMA">
  <refmeta>
-  <refentrytitle id="SQL-ALTERSCHEMA-title">ALTER SCHEMA</refentrytitle>
+  <refentrytitle>ALTER SCHEMA</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -92,8 +92,8 @@ ALTER SCHEMA <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</re
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createschema" endterm="sql-createschema-title"></member>
-   <member><xref linkend="sql-dropschema" endterm="sql-dropschema-title"></member>
+   <member><xref linkend="sql-createschema"></member>
+   <member><xref linkend="sql-dropschema"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 6d6a9a62f2b495d3ad2977897432a6a4cad04b8b..34f13d4bc075393274de2943e5d72bad5704b2f2 100644
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.24 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.25 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERSEQUENCE">
  <refmeta>
-  <refentrytitle id="SQL-ALTERSEQUENCE-TITLE">ALTER SEQUENCE</refentrytitle>
+  <refentrytitle>ALTER SEQUENCE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -302,8 +302,8 @@ ALTER SEQUENCE serial RESTART WITH 105;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsequence" endterm="sql-createsequence-title"></member>
-   <member><xref linkend="sql-dropsequence" endterm="sql-dropsequence-title"></member>
+   <member><xref linkend="sql-createsequence"></member>
+   <member><xref linkend="sql-dropsequence"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml
index 1bce7fb4de857c5b9695e7f0b38aaa377592dfea..dfd72431b2ae4356f8b02d328bfe637514252fb9 100644
--- a/doc/src/sgml/ref/alter_server.sgml
+++ b/doc/src/sgml/ref/alter_server.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_server.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_server.sgml,v 1.4 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERSERVER">
  <refmeta>
-  <refentrytitle id="sql-alterserver-title">ALTER SERVER</refentrytitle>
+  <refentrytitle>ALTER SERVER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -116,8 +116,8 @@ ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createserver" endterm="sql-createserver-title"></member>
-   <member><xref linkend="sql-dropserver" endterm="sql-dropserver-title"></member>
+   <member><xref linkend="sql-createserver"></member>
+   <member><xref linkend="sql-dropserver"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 222637eb12f7bf4c527bed8378d26aec4d94418f..16007ef2734389f272d7df80948c08c1453a29d0 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.111 2010/01/22 17:30:24 rhaas Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.112 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTABLE">
  <refmeta>
-  <refentrytitle id="sql-altertable-title">ALTER TABLE</refentrytitle>
+  <refentrytitle>ALTER TABLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -78,7 +78,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form adds a new column to the table, using the same syntax as
-      <xref linkend="SQL-CREATETABLE" endterm="SQL-CREATETABLE-TITLE">.
+      <xref linkend="SQL-CREATETABLE">.
      </para>
     </listitem>
    </varlistentry>
@@ -147,7 +147,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
      <para>
       This form
       sets the per-column statistics-gathering target for subsequent
-      <xref linkend="sql-analyze" endterm="sql-analyze-title"> operations.
+      <xref linkend="sql-analyze"> operations.
       The target can be set in the range 0 to 10000; alternatively, set it
       to -1 to revert to using the system default statistics
       target (<xref linkend="guc-default-statistics-target">).
@@ -167,7 +167,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
       define attribute-level options are <literal>n_distinct</> and
       <literal>n_distinct_inherited</>, which override the
       number-of-distinct-values estimate made by subsequent
-      <xref linkend="sql-analyze" endterm="sql-analyze-title">
+      <xref linkend="sql-analyze">
       operations.  <literal>n_distinct</> affects the statistics for the table
       itself, while <literal>n_distinct_inherited</> affects the statistics
       gathered for the table and its inheritance children.  When set to a
@@ -223,7 +223,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form adds a new constraint to a table using the same syntax as
-      <xref linkend="SQL-CREATETABLE" endterm="SQL-CREATETABLE-TITLE">.
+      <xref linkend="SQL-CREATETABLE">.
      </para>
     </listitem>
    </varlistentry>
@@ -284,7 +284,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form selects the default index for future
-      <xref linkend="SQL-CLUSTER" endterm="sql-cluster-title">
+      <xref linkend="SQL-CLUSTER">
       operations.  It does not actually re-cluster the table.
      </para>
     </listitem>
@@ -295,7 +295,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form removes the most recently used
-      <xref linkend="SQL-CLUSTER" endterm="sql-cluster-title">
+      <xref linkend="SQL-CLUSTER">
       index specification from the table.  This affects
       future cluster operations that don't specify an index.
      </para>
@@ -338,12 +338,12 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
      <para>
       This form changes one or more storage parameters for the table.  See
       <xref linkend="SQL-CREATETABLE-storage-parameters"
-      endterm="sql-createtable-storage-parameters-title">
+      endterm="SQL-CREATETABLE-storage-parameters-title">
       for details on the available parameters.  Note that the table contents
       will not be modified immediately by this command; depending on the
       parameter you might need to rewrite the table to get the desired effects.
-      That can be done with <xref linkend="SQL-CLUSTER"
-      endterm="sql-cluster-title"> or one of the forms of <command>ALTER
+      That can be done with <xref linkend="SQL-CLUSTER">
+      or one of the forms of <command>ALTER
       TABLE</> that forces a table rewrite.
      </para>
 
@@ -426,7 +426,7 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
       Indexes on the table, if any, are not moved; but they can be moved
       separately with additional <literal>SET TABLESPACE</literal> commands.
       See also
-      <xref linkend="SQL-CREATETABLESPACE" endterm="sql-createtablespace-title">.
+      <xref linkend="SQL-CREATETABLESPACE">.
      </para>
     </listitem>
    </varlistentry>
@@ -774,8 +774,7 @@ ALTER TABLE table ALTER COLUMN anycol TYPE anytype;
    </para>
 
    <para>
-    Refer to <xref linkend="sql-createtable"
-    endterm="sql-createtable-title"> for a further description of valid
+    Refer to <xref linkend="sql-createtable"> for a further description of valid
     parameters. <xref linkend="ddl"> has further information on
     inheritance.
    </para>
diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml
index 758ee13aa6910d5edeb0594e3e311ccfb1e2f3c6..d778992bae096cda55bca93402a44308ee38dcc9 100644
--- a/doc/src/sgml/ref/alter_tablespace.sgml
+++ b/doc/src/sgml/ref/alter_tablespace.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tablespace.sgml,v 1.6 2010/01/05 21:53:58 rhaas Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tablespace.sgml,v 1.7 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTABLESPACE">
  <refmeta>
-  <refentrytitle id="SQL-ALTERTABLESPACE-TITLE">ALTER TABLESPACE</refentrytitle>
+  <refentrytitle>ALTER TABLESPACE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -128,8 +128,8 @@ ALTER TABLESPACE index_space OWNER TO mary;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtablespace" endterm="sql-createtablespace-title"></member>
-   <member><xref linkend="sql-droptablespace" endterm="sql-droptablespace-title"></member>
+   <member><xref linkend="sql-createtablespace"></member>
+   <member><xref linkend="sql-droptablespace"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 6406595c549905de841f5a0465e08b0bb567e3c9..1e508d2401dcea2c0d0e29ec70c541f38aa0cac6 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.12 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.13 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTRIGGER">
  <refmeta>
-  <refentrytitle id="sql-altertrigger-title">ALTER TRIGGER</refentrytitle>
+  <refentrytitle>ALTER TRIGGER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -78,7 +78,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
 
    <para>
     The ability to temporarily enable or disable a trigger is provided by
-    <xref linkend="SQL-ALTERTABLE" endterm="SQL-ALTERTABLE-TITLE">, not by
+    <xref linkend="SQL-ALTERTABLE">, not by
     <command>ALTER TRIGGER</>, because <command>ALTER TRIGGER</> has no
     convenient way to express the option of enabling or disabling all of
     a table's triggers at once.
@@ -109,7 +109,7 @@ ALTER TRIGGER emp_stamp ON emp RENAME TO emp_track_chgs;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable" endterm="sql-altertable-title"></member>
+   <member><xref linkend="sql-altertable"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml
index cf31eab5aca92c30acbdd6cb42a93c65b70b0323..7f70ca9e020f5b7f7b9d0ee0bf819677e64c1e26 100644
--- a/doc/src/sgml/ref/alter_tsconfig.sgml
+++ b/doc/src/sgml/ref/alter_tsconfig.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.6 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTSCONFIG">
  <refmeta>
-  <refentrytitle id="SQL-ALTERTSCONFIG-TITLE">ALTER TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refentrytitle>ALTER TEXT SEARCH CONFIGURATION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -172,8 +172,8 @@ ALTER TEXT SEARCH CONFIGURATION my_config
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsconfig" endterm="sql-createtsconfig-title"></member>
-   <member><xref linkend="sql-droptsconfig" endterm="sql-droptsconfig-title"></member>
+   <member><xref linkend="sql-createtsconfig"></member>
+   <member><xref linkend="sql-droptsconfig"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml
index 7c55f5f993e9184d7940651e0b15a0405f329e36..458e4c48f5e098feb7fa9454d96ea5ffcbfe5e02 100644
--- a/doc/src/sgml/ref/alter_tsdictionary.sgml
+++ b/doc/src/sgml/ref/alter_tsdictionary.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsdictionary.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsdictionary.sgml,v 1.6 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTSDICTIONARY">
  <refmeta>
-  <refentrytitle id="SQL-ALTERTSDICTIONARY-TITLE">ALTER TEXT SEARCH DICTIONARY</refentrytitle>
+  <refentrytitle>ALTER TEXT SEARCH DICTIONARY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -153,8 +153,8 @@ ALTER TEXT SEARCH DICTIONARY my_dict ( dummy );
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsdictionary" endterm="sql-createtsdictionary-title"></member>
-   <member><xref linkend="sql-droptsdictionary" endterm="sql-droptsdictionary-title"></member>
+   <member><xref linkend="sql-createtsdictionary"></member>
+   <member><xref linkend="sql-droptsdictionary"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml
index a47e893c2e04abbc15c68796e42f854c96328a58..eed1b58e8a6935daced30c6fa594aecb9522632b 100644
--- a/doc/src/sgml/ref/alter_tsparser.sgml
+++ b/doc/src/sgml/ref/alter_tsparser.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsparser.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsparser.sgml,v 1.4 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTSPARSER">
  <refmeta>
-  <refentrytitle id="SQL-ALTERTSPARSER-TITLE">ALTER TEXT SEARCH PARSER</refentrytitle>
+  <refentrytitle>ALTER TEXT SEARCH PARSER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -76,8 +76,8 @@ ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsparser" endterm="sql-createtsparser-title"></member>
-   <member><xref linkend="sql-droptsparser" endterm="sql-droptsparser-title"></member>
+   <member><xref linkend="sql-createtsparser"></member>
+   <member><xref linkend="sql-droptsparser"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml
index 16c76339fd39f57597879639e3b520fb8cc6a4ee..cb4b97b030181827cd952beb49b7f289c0a09d15 100644
--- a/doc/src/sgml/ref/alter_tstemplate.sgml
+++ b/doc/src/sgml/ref/alter_tstemplate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tstemplate.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tstemplate.sgml,v 1.4 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTSTEMPLATE">
  <refmeta>
-  <refentrytitle id="SQL-ALTERTSTEMPLATE-TITLE">ALTER TEXT SEARCH TEMPLATE</refentrytitle>
+  <refentrytitle>ALTER TEXT SEARCH TEMPLATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -76,8 +76,8 @@ ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceabl
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtstemplate" endterm="sql-createtstemplate-title"></member>
-   <member><xref linkend="sql-droptstemplate" endterm="sql-droptstemplate-title"></member>
+   <member><xref linkend="sql-createtstemplate"></member>
+   <member><xref linkend="sql-droptstemplate"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml
index 71c922a4e119cad075cbeb8636f5b09f19c72856..92e90a039beae98f1664f675465f5783db768ca4 100644
--- a/doc/src/sgml/ref/alter_type.sgml
+++ b/doc/src/sgml/ref/alter_type.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_type.sgml,v 1.7 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_type.sgml,v 1.8 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERTYPE">
  <refmeta>
-  <refentrytitle id="sql-altertype-title">ALTER TYPE</refentrytitle>
+  <refentrytitle>ALTER TYPE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 3d22e75050bccd4720b60dd432438e897791666b..6046155be420feb9c8b881be941547faba8ab736 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.47 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.48 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERUSER">
  <refmeta>
-  <refentrytitle id="sql-alteruser-title">ALTER USER</refentrytitle>
+  <refentrytitle>ALTER USER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -49,7 +49,7 @@ ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET ALL
 
   <para>
    <command>ALTER USER</command> is now an alias for
-   <xref linkend="sql-alterrole" endterm="sql-alterrole-title">.
+   <xref linkend="sql-alterrole">.
   </para>
  </refsect1>
 
@@ -67,7 +67,7 @@ ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET ALL
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterrole" endterm="sql-alterrole-title"></member>
+   <member><xref linkend="sql-alterrole"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml
index c98ea7709fa68e27ca5c0bd32c0f2b69f1aab297..99e489e49c423065b87e95564d1ee418630d1911 100644
--- a/doc/src/sgml/ref/alter_user_mapping.sgml
+++ b/doc/src/sgml/ref/alter_user_mapping.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user_mapping.sgml,v 1.4 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user_mapping.sgml,v 1.5 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERUSERMAPPING">
  <refmeta>
-  <refentrytitle id="sql-alterusermapping-title">ALTER USER MAPPING</refentrytitle>
+  <refentrytitle>ALTER USER MAPPING</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -117,8 +117,8 @@ ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createusermapping" endterm="sql-createusermapping-title"></member>
-   <member><xref linkend="sql-dropusermapping" endterm="sql-dropusermapping-title"></member>
+   <member><xref linkend="sql-createusermapping"></member>
+   <member><xref linkend="sql-dropusermapping"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
index da5a1ea37546b52ffebf6a3ba672b9cb94019d68..6f175c97b954f3e33667f73eb02d976a1e4e4aa6 100644
--- a/doc/src/sgml/ref/alter_view.sgml
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_view.sgml,v 1.5 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_view.sgml,v 1.6 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ALTERVIEW">
  <refmeta>
-  <refentrytitle id="SQL-ALTERVIEW-TITLE">ALTER VIEW</refentrytitle>
+  <refentrytitle>ALTER VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -140,8 +140,8 @@ ALTER VIEW foo RENAME TO bar;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
-   <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member>
+   <member><xref linkend="sql-createview"></member>
+   <member><xref linkend="sql-dropview"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index 7564ce1448edad13a15e5c9590619fabe666ba86..1f2e4c1bad7286e1bcd67216833ab99a511f7b72 100644
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.28 2010/01/22 16:40:18 rhaas Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.29 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ANALYZE">
  <refmeta>
-  <refentrytitle id="sql-analyze-title">ANALYZE</refentrytitle>
+  <refentrytitle>ANALYZE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -102,7 +102,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <re
    just after making major changes in the contents of a table.  Accurate
    statistics will help the planner to choose the most appropriate query
    plan, and thereby improve the speed of query processing.  A common
-   strategy is to run <xref linkend="sql-vacuum" endterm="sql-vacuum-title">
+   strategy is to run <xref linkend="sql-vacuum">
    and <command>ANALYZE</command> once a day during a low-usage time of day.
   </para>
 
@@ -132,7 +132,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <re
    will change slightly each time <command>ANALYZE</command> is run,
    even if the actual table contents did not change.  This might result
    in small changes in the planner's estimated costs shown by
-   <xref linkend="sql-explain" endterm="sql-explain-title">.
+   <xref linkend="sql-explain">.
    In rare situations, this non-determinism will cause the planner's
    choices of query plans to change after <command>ANALYZE</command> is run.
    To avoid this, raise the amount of statistics collected by
@@ -144,8 +144,8 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <re
    <xref linkend="guc-default-statistics-target"> configuration variable, or
    on a column-by-column basis by setting the per-column statistics
    target with <command>ALTER TABLE ... ALTER COLUMN ... SET
-   STATISTICS</command> (see <xref linkend="sql-altertable"
-   endterm="sql-altertable-title">).  The target value sets the
+   STATISTICS</command> (see <xref linkend="sql-altertable">).
+   The target value sets the
    maximum number of entries in the most-common-value list and the
    maximum number of bins in the histogram.  The default target value
    is 100, but this can be adjusted up or down to trade off accuracy of
@@ -174,7 +174,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <re
    bad query plans, a more accurate value can be determined manually and then
    installed with
    <command>ALTER TABLE ... ALTER COLUMN ... SET (n_distinct = ...)</>
-   (see <xref linkend="sql-altertable" endterm="sql-altertable-title">).
+   (see <xref linkend="sql-altertable">).
   </para>
  </refsect1>
 
@@ -190,10 +190,10 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <re
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-vacuum" endterm="sql-vacuum-title"></member>
-   <member><xref linkend="app-vacuumdb" endterm="app-vacuumdb-title"></member>
-   <member><xref linkend="runtime-config-resource-vacuum-cost" endterm="runtime-config-resource-vacuum-cost-title"></member>
-   <member><xref linkend="autovacuum" endterm="autovacuum-title"></member>
+   <member><xref linkend="sql-vacuum"></member>
+   <member><xref linkend="app-vacuumdb"></member>
+   <member><xref linkend="runtime-config-resource-vacuum-cost"></member>
+   <member><xref linkend="autovacuum"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 9b05454636f849be1a626c5e8a88bf551197f1e2..67dd49cd1bac39ca4f1cd91b2b6ff28b76614a23 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/begin.sgml,v 1.38 2009/09/18 05:00:41 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/begin.sgml,v 1.39 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-BEGIN">
  <refmeta>
-  <refentrytitle id="SQL-BEGIN-TITLE">BEGIN</refentrytitle>
+  <refentrytitle>BEGIN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -37,8 +37,8 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
    <command>BEGIN</command> initiates a transaction block, that is,
    all statements after a <command>BEGIN</command> command will be
    executed in a single transaction until an explicit <xref
-   linkend="sql-commit" endterm="sql-commit-title"> or <xref
-   linkend="sql-rollback" endterm="sql-rollback-title"> is given.
+   linkend="sql-commit"> or <xref
+   linkend="sql-rollback"> is given.
    By default (without <command>BEGIN</command>),
    <productname>PostgreSQL</productname> executes
    transactions in <quote>autocommit</quote> mode, that is, each
@@ -59,7 +59,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   <para>
    If the isolation level or read/write mode is specified, the new
    transaction has those characteristics, as if
-   <xref linkend="sql-set-transaction" endterm="sql-set-transaction-title"> 
+   <xref linkend="sql-set-transaction"> 
    was executed.
   </para>
  </refsect1>
@@ -80,8 +80,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   </variablelist>
 
   <para>
-   Refer to <xref linkend="sql-set-transaction"
-   endterm="sql-set-transaction-title"> for information on the meaning
+   Refer to <xref linkend="sql-set-transaction"> for information on the meaning
    of the other parameters to this statement.
   </para>
  </refsect1>
@@ -90,14 +89,13 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   <title>Notes</title>
 
   <para>
-   <xref linkend="sql-start-transaction"
-   endterm="sql-start-transaction-title"> has the same functionality
+   <xref linkend="sql-start-transaction"> has the same functionality
    as <command>BEGIN</>.
   </para>
    
   <para>
-   Use <xref linkend="SQL-COMMIT" endterm="SQL-COMMIT-TITLE"> or
-   <xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE">
+   Use <xref linkend="SQL-COMMIT"> or
+   <xref linkend="SQL-ROLLBACK">
    to terminate a transaction block.
   </para>
 
@@ -105,7 +103,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
    Issuing <command>BEGIN</> when already inside a transaction block will
    provoke a warning message.  The state of the transaction is not affected.
    To nest transactions within a transaction block, use savepoints 
-   (see <xref linkend="sql-savepoint" endterm="sql-savepoint-title">).
+   (see <xref linkend="sql-savepoint">).
   </para>
 
   <para>
@@ -133,8 +131,7 @@ BEGIN;
   <para>
    <command>BEGIN</command> is a <productname>PostgreSQL</productname>
    language extension.  It is equivalent to the SQL-standard command
-   <xref linkend="sql-start-transaction"
-   endterm="sql-start-transaction-title">, whose reference page
+   <xref linkend="sql-start-transaction">, whose reference page
    contains additional compatibility information.
   </para>
 
@@ -149,10 +146,10 @@ BEGIN;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
-   <member><xref linkend="sql-start-transaction" endterm="sql-start-transaction-title"></member>
-   <member><xref linkend="sql-savepoint" endterm="sql-savepoint-title"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-start-transaction"></member>
+   <member><xref linkend="sql-savepoint"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/checkpoint.sgml b/doc/src/sgml/ref/checkpoint.sgml
index 31f1b0fe192694b41c76856b42bfaf9294673eb6..172521044981e4299b3cc418666aec0f1d91b0b4 100644
--- a/doc/src/sgml/ref/checkpoint.sgml
+++ b/doc/src/sgml/ref/checkpoint.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/checkpoint.sgml,v 1.17 2009/12/19 01:32:31 sriggs Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/checkpoint.sgml,v 1.18 2010/04/03 07:22:57 petere Exp $ -->
 
 <refentry id="sql-checkpoint">
  <refmeta>
-  <refentrytitle id="sql-checkpoint-title">CHECKPOINT</refentrytitle>
+  <refentrytitle>CHECKPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 59b1b1b3184ffdec2ceef91997adc383d408f826..a36bbf8583b858516e33032b1580f4e1d5f75a09 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/close.sgml,v 1.28 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/close.sgml,v 1.29 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CLOSE">
  <refmeta>
-  <refentrytitle id="SQL-CLOSE-TITLE">CLOSE</refentrytitle>
+  <refentrytitle>CLOSE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -84,7 +84,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
    <productname>PostgreSQL</productname> does not have an explicit
    <command>OPEN</command> cursor statement; a cursor is considered
    open when it is declared.  Use the
-   <xref linkend="sql-declare" endterm="sql-declare-title">
+   <xref linkend="sql-declare">
    statement to declare a cursor.
   </para>
 
@@ -125,9 +125,9 @@ CLOSE liahona;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-declare" endterm="sql-declare-title"></member>
-   <member><xref linkend="sql-fetch" endterm="sql-fetch-title"></member>
-   <member><xref linkend="sql-move" endterm="sql-move-title"></member>
+   <member><xref linkend="sql-declare"></member>
+   <member><xref linkend="sql-fetch"></member>
+   <member><xref linkend="sql-move"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index 4c690d9eda62675791ad6b7ee838b10d17873a32..2f06251b292b93e1b6d6cb1da69a5acf271ad5fd 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.48 2010/02/07 20:48:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.49 2010/04/03 07:22:57 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CLUSTER">
  <refmeta>
-  <refentrytitle id="sql-cluster-title">CLUSTER</refentrytitle>
+  <refentrytitle>CLUSTER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -141,8 +141,8 @@ CLUSTER [VERBOSE]
 
    <para>
     Because the planner records statistics about the ordering of
-    tables, it is advisable to run <xref linkend="sql-analyze"
-    endterm="sql-analyze-title"> on the newly clustered table.
+    tables, it is advisable to run <xref linkend="sql-analyze">
+    on the newly clustered table.
     Otherwise, the planner might make poor choices of query plans.
    </para>
 
@@ -226,7 +226,7 @@ CLUSTER <replaceable class="PARAMETER">index_name</replaceable> ON <replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-clusterdb" endterm="app-clusterdb-title"></member>
+   <member><xref linkend="app-clusterdb"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index c805cddae69cb5756de0aecf4ac0157c79287688..f9b4c7a8c08d7a3bdd9034f8fe1b4d6c22d77110 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.27 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.28 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-CLUSTERDB">
  <refmeta>
-  <refentrytitle id="APP-CLUSTERDB-TITLE"><application>clusterdb</application></refentrytitle>
+  <refentrytitle><application>clusterdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -48,7 +48,7 @@ PostgreSQL documentation
 
   <para>
    <application>clusterdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-CLUSTER" endterm="sql-cluster-title">.
+   command <xref linkend="SQL-CLUSTER">.
    There is no effective difference between clustering databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -263,8 +263,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CLUSTER"
-   endterm="sql-cluster-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-CLUSTER">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -300,7 +300,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-cluster" endterm="sql-cluster-title"></member>
+   <member><xref linkend="sql-cluster"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 730ad7cf82ce2cd0054a9cabc3177a429dad072f..53c6b0fcbc9db09692a58d4f81cc675b085ac237 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.39 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.40 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-COMMENT">
  <refmeta>
-  <refentrytitle id="SQL-COMMENT-TITLE">COMMENT</refentrytitle>
+  <refentrytitle>COMMENT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index 1d676ed739b7ed62254cbf30febaf2297d2364d8..6cc7af5e07ee0566c4fd5917eb13cf45956b5e9a 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/commit.sgml,v 1.21 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/commit.sgml,v 1.22 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-COMMIT">
  <refmeta>
-  <refentrytitle id="SQL-COMMIT-TITLE">COMMIT</refentrytitle>
+  <refentrytitle>COMMIT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -55,7 +55,7 @@ COMMIT [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE"> to
+   Use <xref linkend="SQL-ROLLBACK"> to
    abort a transaction.
   </para>
 
@@ -90,8 +90,8 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-rollback"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml
index 1406ed292a4575042e53830f36030eaa84bd3c6c..2c9b558d610aad275d358722fa154142f4a4e99e 100644
--- a/doc/src/sgml/ref/commit_prepared.sgml
+++ b/doc/src/sgml/ref/commit_prepared.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/commit_prepared.sgml,v 1.4 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/commit_prepared.sgml,v 1.5 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-COMMIT-PREPARED">
  <refmeta>
-  <refentrytitle id="sql-commit-prepared-title">COMMIT PREPARED</refentrytitle>
+  <refentrytitle>COMMIT PREPARED</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -88,8 +88,8 @@ COMMIT PREPARED 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-prepare-transaction" endterm="sql-prepare-transaction-title"></member>
-   <member><xref linkend="sql-rollback-prepared" endterm="sql-rollback-prepared-title"></member>
+   <member><xref linkend="sql-prepare-transaction"></member>
+   <member><xref linkend="sql-rollback-prepared"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index d630e6a2fa62d5239f5090a2af911d6524538e8f..f29a2f093bf8e72c1fc3f72328a621eb81e62b73 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,12 +1,12 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.95 2010/02/23 21:38:35 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.96 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 
 <refentry id="SQL-COPY">
  <refmeta>
-  <refentrytitle id="sql-copy-title">COPY</refentrytitle>
+  <refentrytitle>COPY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -103,8 +103,8 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select" endterm="sql-select-title"> or
-      <xref linkend="sql-values" endterm="sql-values-title"> command
+      A <xref linkend="sql-select"> or
+      <xref linkend="sql-values"> command
       whose results are to be copied.
       Note that parentheses are required around the query.
      </para>
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index 1d0599756c35cc3e1036e8a4d3c917ca2ccf5637..2eae2090cc64f5e508003011cb8c17e17ca14771 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.39 2008/11/14 10:22:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.40 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEAGGREGATE">
  <refmeta>
-  <refentrytitle id="sql-createaggregate-title">CREATE AGGREGATE</refentrytitle>
+  <refentrytitle>CREATE AGGREGATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -304,8 +304,8 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteraggregate" endterm="sql-alteraggregate-title"></member>
-   <member><xref linkend="sql-dropaggregate" endterm="sql-dropaggregate-title"></member>
+   <member><xref linkend="sql-alteraggregate"></member>
+   <member><xref linkend="sql-dropaggregate"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index 16a7cef40f9cff05065d669202537e1c311646fa..317cdb64f896ffc118bcf0786fda5b68a00ef4a8 100644
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.32 2009/09/19 10:23:26 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.33 2010/04/03 07:22:58 petere Exp $ -->
 
 <refentry id="SQL-CREATECAST">
  <refmeta>
-  <refentrytitle id="SQL-CREATECAST-TITLE">CREATE CAST</refentrytitle>
+  <refentrytitle>CREATE CAST</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -150,7 +150,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
     ambiguity that cannot be avoided as above.  The parser has a fallback
     heuristic based on <firstterm>type categories</> and <firstterm>preferred
     types</> that can help to provide desired behavior in such cases.  See
-    <xref linkend="sql-createtype" endterm="sql-createtype-title"> for
+    <xref linkend="sql-createtype"> for
     more information.
    </para>
   </note>
@@ -290,8 +290,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="sql-dropcast"
-   endterm="sql-dropcast-title"> to remove user-defined casts.
+   Use <xref linkend="sql-dropcast"> to remove user-defined casts.
   </para>
 
   <para>
@@ -401,9 +400,9 @@ CREATE CAST (bigint AS int4) WITH FUNCTION int4(bigint) AS ASSIGNMENT;
   <title>See Also</title>
 
   <para>
-   <xref linkend="sql-createfunction" endterm="sql-createfunction-title">,
-   <xref linkend="sql-createtype" endterm="sql-createtype-title">,
-   <xref linkend="sql-dropcast" endterm="sql-dropcast-title">
+   <xref linkend="sql-createfunction">,
+   <xref linkend="sql-createtype">,
+   <xref linkend="sql-dropcast">
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml
index 7da88318568eb0f8ce3cd9bcf2c157c5286451cf..779f427c572770cf48b19c2e23e08d34ff65dcec 100644
--- a/doc/src/sgml/ref/create_constraint.sgml
+++ b/doc/src/sgml/ref/create_constraint.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.21 2009/11/20 20:38:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.22 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATECONSTRAINT">
  <refmeta>
-  <refentrytitle id="sql-createconstraint-title">CREATE CONSTRAINT TRIGGER</refentrytitle>
+  <refentrytitle>CREATE CONSTRAINT TRIGGER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -39,7 +39,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
    <command>CREATE CONSTRAINT TRIGGER</command> creates a
    <firstterm>constraint trigger</>.  This is the same as a regular trigger
    except that the timing of the trigger firing can be adjusted using
-   <xref linkend="SQL-SET-CONSTRAINTS" endterm="SQL-SET-CONSTRAINTS-TITLE">.
+   <xref linkend="SQL-SET-CONSTRAINTS">.
    Constraint triggers must be <literal>AFTER ROW</> triggers.  They can
    be fired either at the end of the statement causing the triggering event,
    or at the end of the containing transaction; in the latter case they are
@@ -104,7 +104,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
     <listitem>
      <para>
       The default timing of the trigger.
-      See the <xref linkend="SQL-CREATETABLE" endterm="SQL-CREATETABLE-TITLE">
+      See the <xref linkend="SQL-CREATETABLE">
       documentation for details of these constraint options.
      </para>
     </listitem>
@@ -116,7 +116,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
      <para>
       A Boolean expression that determines whether the trigger function
       will actually be executed.  This acts the same as in <xref
-      linkend="SQL-CREATETRIGGER" endterm="SQL-CREATETRIGGER-TITLE">.
+      linkend="SQL-CREATETRIGGER">.
       Note in particular that evaluation of the <literal>WHEN</>
       condition is not deferred, but occurs immediately after the row
       update operation is performed.  If the condition does not evaluate
@@ -131,7 +131,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
     <listitem>
      <para>
       The function to call when the trigger is fired. See <xref
-      linkend="SQL-CREATETRIGGER" endterm="SQL-CREATETRIGGER-TITLE"> for
+      linkend="SQL-CREATETRIGGER"> for
       details.
      </para>
     </listitem>
@@ -142,7 +142,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
     <listitem>
      <para>
       Optional argument strings to pass to the trigger function. See <xref
-      linkend="SQL-CREATETRIGGER" endterm="SQL-CREATETRIGGER-TITLE"> for
+      linkend="SQL-CREATETRIGGER"> for
       details.
      </para>
     </listitem>
@@ -163,9 +163,9 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtrigger" endterm="sql-createtrigger-title"></member>
-   <member><xref linkend="sql-droptrigger" endterm="sql-droptrigger-title"></member>
-   <member><xref linkend="sql-set-constraints" endterm="sql-set-constraints-title"></member>
+   <member><xref linkend="sql-createtrigger"></member>
+   <member><xref linkend="sql-droptrigger"></member>
+   <member><xref linkend="sql-set-constraints"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index 9a8cee7de19106100e9f692bab1bd8875f410527..108c6fb6aeaab28310dd69b91bc46e83a55dbcd7 100644
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.22 2009/09/19 10:23:26 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.23 2010/04/03 07:22:58 petere Exp $ -->
 
 <refentry id="SQL-CREATECONVERSION">
  <refmeta>
-  <refentrytitle id="SQL-CREATECONVERSION-TITLE">CREATE CONVERSION</refentrytitle>
+  <refentrytitle>CREATE CONVERSION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -162,9 +162,9 @@ CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterconversion" endterm="sql-alterconversion-title"></member>
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-dropconversion" endterm="sql-dropconversion-title"></member>
+   <member><xref linkend="sql-alterconversion"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-dropconversion"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index ff4c74e47328f8a05a0328ca277b2c0a119f368d..c3e691a4ad376af6429f79dfd671e522980c7035 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.53 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.54 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEDATABASE">
  <refmeta>
-  <refentrytitle id="sql-createdatabase-title">CREATE DATABASE</refentrytitle>
+  <refentrytitle>CREATE DATABASE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -43,7 +43,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
   <para>
    To create a database, you must be a superuser or have the special
    <literal>CREATEDB</> privilege.
-   See <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">.
+   See <xref linkend="SQL-CREATEUSER">.
   </para>
 
   <para>
@@ -147,7 +147,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
         template database's tablespace. This
         tablespace will be the default tablespace used for objects
         created in this database. See
-        <xref linkend="sql-createtablespace" endterm="sql-createtablespace-title">
+        <xref linkend="sql-createtablespace">
         for more information.
        </para>
       </listitem>
@@ -185,11 +185,11 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
    </para>
 
    <para>
-    Use <xref linkend="SQL-DROPDATABASE" endterm="SQL-DROPDATABASE-title"> to remove a database.
+    Use <xref linkend="SQL-DROPDATABASE"> to remove a database.
    </para>
 
    <para>
-    The program <xref linkend="APP-CREATEDB" endterm="APP-CREATEDB-title"> is a
+    The program <xref linkend="APP-CREATEDB"> is a
     wrapper program around this command, provided for convenience.
    </para>
 
@@ -287,8 +287,8 @@ CREATE DATABASE music ENCODING 'LATIN1' TEMPLATE template0;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title"></member>
-   <member><xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title"></member>
+   <member><xref linkend="sql-alterdatabase"></member>
+   <member><xref linkend="sql-dropdatabase"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml
index aae7a3539c3f4a01b384092d4a33c8f6df040879..637326b58bbbe74bb45ec110377e7a3bd20f6211 100644
--- a/doc/src/sgml/ref/create_domain.sgml
+++ b/doc/src/sgml/ref/create_domain.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.33 2009/09/18 05:00:41 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.34 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEDOMAIN">
  <refmeta>
-  <refentrytitle id="sql-createdomain-title">CREATE DOMAIN</refentrytitle>
+  <refentrytitle>CREATE DOMAIN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -201,8 +201,8 @@ CREATE TABLE us_snail_addy (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterdomain" endterm="sql-alterdomain-title"></member>
-   <member><xref linkend="sql-dropdomain" endterm="sql-dropdomain-title"></member>
+   <member><xref linkend="sql-alterdomain"></member>
+   <member><xref linkend="sql-dropdomain"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
index b9ceb7ecc179bba682f411845beff2ccae69a226..4880588b15e6e1f06c862480176dfef764bff6c3 100644
--- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_foreign_data_wrapper.sgml,v 1.6 2009/12/23 12:23:58 heikki Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_foreign_data_wrapper.sgml,v 1.7 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEFOREIGNDATAWRAPPER">
  <refmeta>
-  <refentrytitle id="sql-createforeigndatawrapper-title">CREATE FOREIGN DATA WRAPPER</refentrytitle>
+  <refentrytitle>CREATE FOREIGN DATA WRAPPER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -167,10 +167,10 @@ CREATE FOREIGN DATA WRAPPER mywrapper
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterforeigndatawrapper" endterm="sql-alterforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-dropforeigndatawrapper" endterm="sql-dropforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-createserver" endterm="sql-createserver-title"></member>
-   <member><xref linkend="sql-createusermapping" endterm="sql-createusermapping-title"></member>
+   <member><xref linkend="sql-alterforeigndatawrapper"></member>
+   <member><xref linkend="sql-dropforeigndatawrapper"></member>
+   <member><xref linkend="sql-createserver"></member>
+   <member><xref linkend="sql-createusermapping"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 8e3741fa31c257807284136a67e579a90dea9ef6..06df45ab967845f78323f1056865cc6fa0ec9e8e 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,10 +1,10 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.93 2010/03/03 03:23:12 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.94 2010/04/03 07:22:58 petere Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
  <refmeta>
-  <refentrytitle id="SQL-CREATEFUNCTION-TITLE">CREATE FUNCTION</refentrytitle>
+  <refentrytitle>CREATE FUNCTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -423,7 +423,7 @@ CREATE [ OR REPLACE ] FUNCTION
       </para>
    
       <para>
-       See <xref linkend="sql-set" endterm="sql-set-title"> and
+       See <xref linkend="sql-set"> and
        <xref linkend="runtime-config">
        for more information about allowed parameter names and values.
       </para>
@@ -702,7 +702,7 @@ $$  LANGUAGE plpgsql
    <para>
     Another point to keep in mind is that by default, execute privilege
     is granted to <literal>PUBLIC</> for newly created functions
-    (see <xref linkend="sql-grant" endterm="sql-grant-title"> for more
+    (see <xref linkend="sql-grant"> for more
     information).  Frequently you will wish to restrict use of a security
     definer function to only some users.  To do that, you must revoke
     the default <literal>PUBLIC</> privileges and then grant execute
@@ -752,12 +752,12 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterfunction" endterm="sql-alterfunction-title"></member>
-   <member><xref linkend="sql-dropfunction" endterm="sql-dropfunction-title"></member>
-   <member><xref linkend="sql-grant" endterm="sql-grant-title"></member>
-   <member><xref linkend="sql-load" endterm="sql-load-title"></member>
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
-   <member><xref linkend="app-createlang" endterm="app-createlang-title"></member>
+   <member><xref linkend="sql-alterfunction"></member>
+   <member><xref linkend="sql-dropfunction"></member>
+   <member><xref linkend="sql-grant"></member>
+   <member><xref linkend="sql-load"></member>
+   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="app-createlang"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml
index 80ba1f49af36547223efee870b7969a5a1c73d18..996bc15042edb648299e727b2f8185361fc0479e 100644
--- a/doc/src/sgml/ref/create_group.sgml
+++ b/doc/src/sgml/ref/create_group.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_group.sgml,v 1.21 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_group.sgml,v 1.22 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEGROUP">
  <refmeta>
-  <refentrytitle id="sql-creategroup-title">CREATE GROUP</refentrytitle>
+  <refentrytitle>CREATE GROUP</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -47,7 +47,7 @@ CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <repla
 
   <para>
    <command>CREATE GROUP</command> is now an alias for
-   <xref linkend="sql-createrole" endterm="sql-createrole-title">.
+   <xref linkend="sql-createrole">.
   </para>
  </refsect1> 
  
@@ -64,7 +64,7 @@ CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <repla
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole" endterm="sql-createrole-title"></member>
+   <member><xref linkend="sql-createrole"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index ec1807a370b999d2e37dc4708ea95ae60d088ac4..5b68cae10f2a8052e7842858d5f4151b8a75e066 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.73 2010/03/17 15:55:50 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.74 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEINDEX">
  <refmeta>
-  <refentrytitle id="sql-createindex-title">CREATE INDEX</refentrytitle>
+  <refentrytitle>CREATE INDEX</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -488,7 +488,7 @@ Indexes:
   </para>
 
   <para>
-   Use <xref linkend="sql-dropindex" endterm="sql-dropindex-title">
+   Use <xref linkend="sql-dropindex">
    to remove an index.
   </para>
 
@@ -588,8 +588,8 @@ CREATE INDEX CONCURRENTLY sales_quantity_index ON sales_table (quantity);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterindex" endterm="sql-alterindex-title"></member>
-   <member><xref linkend="sql-dropindex" endterm="sql-dropindex-title"></member>
+   <member><xref linkend="sql-alterindex"></member>
+   <member><xref linkend="sql-dropindex"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 3f52578634e0c99d3c7530c0f2660def58dea145..679f8d50b150f5e5fe090c1b4cce5c868718b5cd 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_language.sgml,v 1.49 2010/02/23 22:51:42 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_language.sgml,v 1.50 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATELANGUAGE">
  <refmeta>
-  <refentrytitle id="sql-createlanguage-title">CREATE LANGUAGE</refentrytitle>
+  <refentrytitle>CREATE LANGUAGE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -168,7 +168,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
        <replaceable class="parameter">inline_handler</replaceable> is the
        name of a previously registered function that will be called
        to execute an anonymous code block
-       (<xref linkend="sql-do" endterm="sql-do-title"> command)
+       (<xref linkend="sql-do"> command)
        in this language.
        If no <replaceable class="parameter">inline_handler</replaceable>
        function is specified, the language does not support anonymous code
@@ -227,7 +227,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   </para>
 
   <para>
-   Use <xref linkend="sql-droplanguage" endterm="sql-droplanguage-title">, or better yet the <xref
+   Use <xref linkend="sql-droplanguage">, or better yet the <xref
    linkend="app-droplang"> program, to drop procedural languages.
   </para>
 
@@ -312,13 +312,13 @@ CREATE LANGUAGE plsample
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterlanguage" endterm="sql-alterlanguage-title"></member>
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-droplanguage" endterm="sql-droplanguage-title"></member>
-   <member><xref linkend="sql-grant" endterm="sql-grant-title"></member>
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
-   <member><xref linkend="app-createlang" endterm="app-createlang-title"></member>
-   <member><xref linkend="app-droplang" endterm="app-droplang-title"></member>
+   <member><xref linkend="sql-alterlanguage"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-droplanguage"></member>
+   <member><xref linkend="sql-grant"></member>
+   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="app-createlang"></member>
+   <member><xref linkend="app-droplang"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 44e1f1f21fd22b1f4a57ab98c4fa8cfb24970a7a..500a16b65885c671d44def72e2cc807d4bf2a342 100644
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.24 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.25 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEOPCLASS">
  <refmeta>
-  <refentrytitle id="sql-createopclass-title">CREATE OPERATOR CLASS</refentrytitle>
+  <refentrytitle>CREATE OPERATOR CLASS</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -297,10 +297,10 @@ CREATE OPERATOR CLASS gist__int_ops
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropclass" endterm="sql-alteropclass-title"></member>
-   <member><xref linkend="sql-dropopclass" endterm="sql-dropopclass-title"></member>
-   <member><xref linkend="sql-createopfamily" endterm="sql-createopfamily-title"></member>
-   <member><xref linkend="sql-alteropfamily" endterm="sql-alteropfamily-title"></member>
+   <member><xref linkend="sql-alteropclass"></member>
+   <member><xref linkend="sql-dropopclass"></member>
+   <member><xref linkend="sql-createopfamily"></member>
+   <member><xref linkend="sql-alteropfamily"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 7c0b545e894ca8e9be53674885603211954526cc..a5595e6e69c8343f7faa01de8903d6ca61347bed 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.51 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.52 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEOPERATOR">
  <refmeta>
-  <refentrytitle id="sql-createoperator-title">CREATE OPERATOR</refentrytitle>
+  <refentrytitle>CREATE OPERATOR</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -231,10 +231,8 @@ COMMUTATOR = OPERATOR(myschema.===) ,
   </para>
 
   <para>
-   Use <xref linkend="sql-dropoperator"
-   endterm="sql-dropoperator-title"> to delete user-defined operators
-   from a database.  Use <xref linkend="sql-alteroperator"
-   endterm="sql-alteroperator-title"> to modify operators in a
+   Use <xref linkend="sql-dropoperator"> to delete user-defined operators
+   from a database.  Use <xref linkend="sql-alteroperator"> to modify operators in a
    database.
   </para>
  </refsect1>
@@ -274,9 +272,9 @@ CREATE OPERATOR === (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteroperator" endterm="sql-alteroperator-title"></member>
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-dropoperator" endterm="sql-dropoperator-title"></member>
+   <member><xref linkend="sql-alteroperator"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-dropoperator"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_opfamily.sgml b/doc/src/sgml/ref/create_opfamily.sgml
index 958de632bb305d562a0cdccb6632767d8147a9a7..4b1a3ee2a72241f6d17f8c4325ee7c937f402aae 100644
--- a/doc/src/sgml/ref/create_opfamily.sgml
+++ b/doc/src/sgml/ref/create_opfamily.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_opfamily.sgml,v 1.4 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_opfamily.sgml,v 1.5 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEOPFAMILY">
  <refmeta>
-  <refentrytitle id="sql-createopfamily-title">CREATE OPERATOR FAMILY</refentrytitle>
+  <refentrytitle>CREATE OPERATOR FAMILY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -108,11 +108,11 @@ CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropfamily" endterm="sql-alteropfamily-title"></member>
-   <member><xref linkend="sql-dropopfamily" endterm="sql-dropopfamily-title"></member>
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-alteropclass" endterm="sql-alteropclass-title"></member>
-   <member><xref linkend="sql-dropopclass" endterm="sql-dropopclass-title"></member>
+   <member><xref linkend="sql-alteropfamily"></member>
+   <member><xref linkend="sql-dropopfamily"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-alteropclass"></member>
+   <member><xref linkend="sql-dropopclass"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 60e7d7c862d0c704ccf077df6cfadd9ac651ac7c..a1c7ad61c21a9e1d2a80f317e0d51a0b3f3b3236 100644
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.13 2009/09/19 10:23:26 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.14 2010/04/03 07:22:58 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEROLE">
  <refmeta>
-  <refentrytitle id="sql-createrole-title">CREATE ROLE</refentrytitle>
+  <refentrytitle>CREATE ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -307,9 +307,9 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ALTERROLE" endterm="SQL-ALTERROLE-title"> to
-   change the attributes of a role, and <xref linkend="SQL-DROPROLE"
-   endterm="SQL-DROPROLE-title"> to remove a role.  All the attributes
+   Use <xref linkend="SQL-ALTERROLE"> to
+   change the attributes of a role, and <xref linkend="SQL-DROPROLE">
+   to remove a role.  All the attributes
    specified by <command>CREATE ROLE</> can be modified by later
    <command>ALTER ROLE</> commands.
   </para>
@@ -317,8 +317,8 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
   <para>
    The preferred way to add and remove members of roles that are being
    used as groups is to use
-   <xref linkend="SQL-GRANT" endterm="SQL-GRANT-title"> and
-   <xref linkend="SQL-REVOKE" endterm="SQL-REVOKE-title">.
+   <xref linkend="SQL-GRANT"> and
+   <xref linkend="SQL-REVOKE">.
   </para>
 
   <para>
@@ -336,7 +336,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
    a member of a role with <literal>CREATEDB</> privilege does not immediately
    grant the ability to create databases, even if <literal>INHERIT</> is set;
    it would be necessary to become that role via
-   <xref linkend="SQL-SET-ROLE" endterm="SQL-SET-ROLE-title"> before
+   <xref linkend="SQL-SET-ROLE"> before
    creating a database.
   </para>
 
@@ -363,7 +363,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
 
   <para>
    <productname>PostgreSQL</productname> includes a program <xref
-   linkend="APP-CREATEUSER" endterm="APP-CREATEUSER-title"> that has
+   linkend="APP-CREATEUSER"> that has
    the same functionality as <command>CREATE ROLE</command> (in fact,
    it calls this command) but can be run from the command shell.
   </para>
@@ -380,9 +380,9 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
    with this command.  The password will be transmitted to the server
    in cleartext, and it might also be logged in the client's command
    history or the server log.  The command <xref
-   linkend="APP-CREATEUSER" endterm="APP-CREATEUSER-title">, however, transmits
-   the password encrypted.  Also, <xref linkend="app-psql"
-   endterm="app-psql-title"> contains a command
+   linkend="APP-CREATEUSER">, however, transmits
+   the password encrypted.  Also, <xref linkend="app-psql">
+   contains a command
    <command>\password</command> that can be used to safely change the
    password later.
   </para>
@@ -459,11 +459,11 @@ CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable cla
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-role" endterm="sql-set-role-title"></member>
-   <member><xref linkend="sql-alterrole" endterm="sql-alterrole-title"></member>
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
-   <member><xref linkend="sql-grant" endterm="sql-grant-title"></member>
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
+   <member><xref linkend="sql-set-role"></member>
+   <member><xref linkend="sql-alterrole"></member>
+   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="sql-grant"></member>
+   <member><xref linkend="sql-revoke"></member>
    <member><xref linkend="app-createuser"></member>
   </simplelist>
  </refsect1>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 15eee45e4e5c13c55d7cd0fc5ed6ee453a2339dc..afe5f82e1c621f177b1c2859f1fa43a931575148 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.53 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.54 2010/04/03 07:22:59 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATERULE">
  <refmeta>
-  <refentrytitle id="sql-createrule-title">CREATE RULE</refentrytitle>
+  <refentrytitle>CREATE RULE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index b92fa0f93f42b61cb5ffa3cfa74d40553aa7f85f..0df736877f72a98014adfbb767b3d4d6acabc2b2 100644
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.21 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.22 2010/04/03 07:22:59 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATESCHEMA">
  <refmeta>
-  <refentrytitle id="sql-createschema-title">CREATE SCHEMA</refentrytitle>
+  <refentrytitle>CREATE SCHEMA</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -184,8 +184,8 @@ CREATE VIEW hollywood.winners AS
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterschema" endterm="sql-alterschema-title"></member>
-   <member><xref linkend="sql-dropschema" endterm="sql-dropschema-title"></member>
+   <member><xref linkend="sql-alterschema"></member>
+   <member><xref linkend="sql-dropschema"></member>
  </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 20b0c00872114f8051b625f7d7d9c6edf77dd0be..318718e1a89916f7eb4c72bedf67763df71f3320 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.49 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.50 2010/04/03 07:22:59 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATESEQUENCE">
  <refmeta>
-  <refentrytitle id="sql-createsequence-title">CREATE SEQUENCE</refentrytitle>
+  <refentrytitle>CREATE SEQUENCE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -356,8 +356,8 @@ END;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altersequence" endterm="sql-altersequence-title"></member>
-   <member><xref linkend="sql-dropsequence" endterm="sql-dropsequence-title"></member>
+   <member><xref linkend="sql-altersequence"></member>
+   <member><xref linkend="sql-dropsequence"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml
index 06c20ea87fcae924c102fe30579b63333d7162f5..319f1f6fe267aaffc49f32c639d702120e13b9a1 100644
--- a/doc/src/sgml/ref/create_server.sgml
+++ b/doc/src/sgml/ref/create_server.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_server.sgml,v 1.6 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_server.sgml,v 1.7 2010/04/03 07:22:59 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATESERVER">
  <refmeta>
-  <refentrytitle id="sql-createserver-title">CREATE SERVER</refentrytitle>
+  <refentrytitle>CREATE SERVER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -152,10 +152,10 @@ CREATE SERVER myserver FOREIGN DATA WRAPPER pgsql OPTIONS (host 'foo', dbname 'f
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterserver" endterm="sql-alterserver-title"></member>
-   <member><xref linkend="sql-dropserver" endterm="sql-dropserver-title"></member>
-   <member><xref linkend="sql-createforeigndatawrapper" endterm="sql-createforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-createusermapping" endterm="sql-createusermapping-title"></member>
+   <member><xref linkend="sql-alterserver"></member>
+   <member><xref linkend="sql-dropserver"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"></member>
+   <member><xref linkend="sql-createusermapping"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index d905f081afdc37a347d066b849bac11f9b18a9de..a730e3b9306e6cb94256c1d377500645c58cb8fe 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.124 2010/04/01 00:18:21 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.125 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETABLE">
  <refmeta>
-  <refentrytitle id="sql-createtable-title">CREATE TABLE</refentrytitle>
+  <refentrytitle>CREATE TABLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -484,7 +484,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
       Each <replaceable class="parameter">exclude_element</replaceable>
       can optionally specify an operator class and/or ordering options;
       these are described fully under
-      <xref linkend="sql-createindex" endterm="sql-createindex-title">.
+      <xref linkend="sql-createindex">.
      </para>
 
      <para>
@@ -630,7 +630,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
       constraint that is not deferrable will be checked immediately
       after every command.  Checking of constraints that are
       deferrable can be postponed until the end of the transaction
-      (using the <xref linkend="sql-set-constraints" endterm="sql-set-constraints-title"> command).
+      (using the <xref linkend="sql-set-constraints"> command).
       <literal>NOT DEFERRABLE</literal> is the default.
       Currently, only <literal>UNIQUE</>, <literal>PRIMARY KEY</>,
       <literal>EXCLUDE</>, and
@@ -652,7 +652,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
       statement. This is the default.  If the constraint is
       <literal>INITIALLY DEFERRED</literal>, it is checked only at the
       end of the transaction.  The constraint check time can be
-      altered with the <xref linkend="sql-set-constraints" endterm="sql-set-constraints-title"> command.
+      altered with the <xref linkend="sql-set-constraints"> command.
      </para>
     </listitem>
    </varlistentry>
@@ -690,7 +690,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
 
      <para>
       To remove OIDs from a table after it has been created, use <xref
-      linkend="sql-altertable" endterm="sql-altertable-title">.
+      linkend="sql-altertable">.
      </para>
     </listitem>
    </varlistentry>
@@ -733,7 +733,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
          <para>
           All rows in the temporary table will be deleted at the end
           of each transaction block.  Essentially, an automatic <xref
-          linkend="sql-truncate" endterm="sql-truncate-title"> is done
+          linkend="sql-truncate"> is done
           at each commit.
          </para>
         </listitem>
@@ -794,8 +794,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
     for tables, and for indexes associated with a <literal>UNIQUE</literal>,
     <literal>PRIMARY KEY</literal>, or <literal>EXCLUDE</> constraint.
     Storage parameters for
-    indexes are documented in <xref linkend="SQL-CREATEINDEX"
-    endterm="sql-createindex-title">.  The storage parameters currently
+    indexes are documented in <xref linkend="SQL-CREATEINDEX">.  The storage parameters currently
     available for tables are listed below.  For each parameter, unless noted,
     there is an additional, identically named parameter, prefixed with
     <literal>toast.</literal> which can be used to control the behavior of the
@@ -978,7 +977,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
      index for each unique constraint and primary key constraint to
      enforce uniqueness.  Thus, it is not necessary to create an
      index explicitly for primary key columns.  (See <xref
-     linkend="sql-createindex" endterm="sql-createindex-title"> for more information.)
+     linkend="sql-createindex"> for more information.)
     </para>
 
     <para>
@@ -1380,10 +1379,10 @@ CREATE TABLE employees OF employee_type (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable" endterm="sql-altertable-title"></member>
-   <member><xref linkend="sql-droptable" endterm="sql-droptable-title"></member>
-   <member><xref linkend="sql-createtablespace" endterm="sql-createtablespace-title"></member>
-   <member><xref linkend="sql-createtype" endterm="sql-createtype-title"></member>
+   <member><xref linkend="sql-altertable"></member>
+   <member><xref linkend="sql-droptable"></member>
+   <member><xref linkend="sql-createtablespace"></member>
+   <member><xref linkend="sql-createtype"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index b31a25704f8d11092b24353b4a6f5cc486c429c2..1b597225865c129f1bf15d10120ecc8b1b929041 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.40 2008/11/20 14:04:45 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.41 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETABLEAS">
  <refmeta>
-  <refentrytitle id="sql-createtableas-title">CREATE TABLE AS</refentrytitle>
+  <refentrytitle>CREATE TABLE AS</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -63,7 +63,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
     <listitem>
      <para>
       Ignored for compatibility. Refer to <xref
-      linkend="sql-createtable" endterm="sql-createtable-title"> for
+      linkend="sql-createtable"> for
       details.
      </para>
     </listitem>
@@ -76,7 +76,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
     <listitem>
      <para>
       If specified, the table is created as a temporary table.
-      Refer to <xref linkend="sql-createtable" endterm="sql-createtable-title"> for details.
+      Refer to <xref linkend="sql-createtable"> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -115,8 +115,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
       to specify that rows of the new table
       should have OIDs (object identifiers) assigned to them, or
       <literal>OIDS=FALSE</> to specify that the rows should not have OIDs.
-      See <xref linkend="sql-createtable"
-      endterm="sql-createtable-title"> for more information.
+      See <xref linkend="sql-createtable"> for more information.
      </para>
     </listitem>
    </varlistentry>
@@ -159,7 +158,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
          <para>
           All rows in the temporary table will be deleted at the end
           of each transaction block.  Essentially, an automatic <xref
-          linkend="sql-truncate" endterm="sql-truncate-title"> is done
+          linkend="sql-truncate"> is done
           at each commit.
          </para>
         </listitem>
@@ -197,10 +196,10 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
     <listitem>
      <para>
       A <xref linkend="sql-select"
-      endterm="sql-select-title">, <link linkend="sql-table">TABLE</link>,
+     >, <link linkend="sql-table">TABLE</link>,
       or
-      <xref linkend="sql-values" endterm="sql-values-title"> command,
-      or an <xref linkend="sql-execute" endterm="sql-execute-title"> command
+      <xref linkend="sql-values"> command,
+      or an <xref linkend="sql-execute"> command
       that runs a prepared <command>SELECT</>, <command>TABLE</>, or <command>VALUES</> query.
      </para>
     </listitem>
@@ -225,7 +224,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
 
   <para>
    This command is functionally similar to <xref
-   linkend="sql-selectinto" endterm="sql-selectinto-title">, but it is
+   linkend="sql-selectinto">, but it is
    preferred since it is less likely to be confused with other uses of
    the <command>SELECT INTO</> syntax. Furthermore, <command>CREATE
    TABLE AS</command> offers a superset of the functionality offered
@@ -313,7 +312,7 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
      <para>
       <productname>PostgreSQL</> handles temporary tables in a way
       rather different from the standard; see
-      <xref linkend="sql-createtable" endterm="sql-createtable-title">
+      <xref linkend="sql-createtable">
       for details.
      </para>
     </listitem>
@@ -340,11 +339,11 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtable" endterm="sql-createtable-title"></member>
-   <member><xref linkend="sql-execute" endterm="sql-execute-title"></member>
-   <member><xref linkend="sql-select" endterm="sql-select-title"></member>
-   <member><xref linkend="sql-selectinto" endterm="sql-selectinto-title"></member>
-   <member><xref linkend="sql-values" endterm="sql-values-title"></member>
+   <member><xref linkend="sql-createtable"></member>
+   <member><xref linkend="sql-execute"></member>
+   <member><xref linkend="sql-select"></member>
+   <member><xref linkend="sql-selectinto"></member>
+   <member><xref linkend="sql-values"></member>
   </simplelist>
  </refsect1>
  
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml
index 4e1ae9571c3b1235e1c9ce2f58740408898a13bf..8b212361fb85f3aebb7b4b79b9fa0fd1488f4b97 100644
--- a/doc/src/sgml/ref/create_tablespace.sgml
+++ b/doc/src/sgml/ref/create_tablespace.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tablespace.sgml,v 1.10 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tablespace.sgml,v 1.11 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETABLESPACE">
  <refmeta>
-  <refentrytitle id="sql-createtablespace-title">CREATE TABLESPACE</refentrytitle>
+  <refentrytitle>CREATE TABLESPACE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -135,11 +135,11 @@ CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase" endterm="sql-createdatabase-title"></member>
-   <member><xref linkend="sql-createtable" endterm="sql-createtable-title"></member>
-   <member><xref linkend="sql-createindex" endterm="sql-createindex-title"></member>
-   <member><xref linkend="sql-droptablespace" endterm="sql-droptablespace-title"></member>
-   <member><xref linkend="sql-altertablespace" endterm="sql-altertablespace-title"></member>
+   <member><xref linkend="sql-createdatabase"></member>
+   <member><xref linkend="sql-createtable"></member>
+   <member><xref linkend="sql-createindex"></member>
+   <member><xref linkend="sql-droptablespace"></member>
+   <member><xref linkend="sql-altertablespace"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 78f5977999b54686fe0fb3afe77c3bf97d96f6bd..6ec2766fa496fff9a69be95c7224207839c9b5f8 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.52 2009/11/20 20:38:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.53 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETRIGGER">
  <refmeta>
-  <refentrytitle id="SQL-CREATETRIGGER-TITLE">CREATE TRIGGER</refentrytitle>
+  <refentrytitle>CREATE TRIGGER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -233,8 +233,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
   </para>
 
   <para>
-   Use <xref linkend="sql-droptrigger"
-   endterm="sql-droptrigger-title"> to remove a trigger.
+   Use <xref linkend="sql-droptrigger"> to remove a trigger.
   </para>
 
   <para>
@@ -406,9 +405,9 @@ CREATE TRIGGER log_update
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-altertrigger" endterm="sql-altertrigger-title"></member>
-   <member><xref linkend="sql-droptrigger" endterm="sql-droptrigger-title"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-altertrigger"></member>
+   <member><xref linkend="sql-droptrigger"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml
index b8c2b723be985e4ac3c0a547e992f5f0079cea4a..64d6eedc990cbbb7c4546a2afe48130628522b94 100644
--- a/doc/src/sgml/ref/create_tsconfig.sgml
+++ b/doc/src/sgml/ref/create_tsconfig.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsconfig.sgml,v 1.3 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsconfig.sgml,v 1.4 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETSCONFIG">
  <refmeta>
-  <refentrytitle id="sql-createtsconfig-title">CREATE TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refentrytitle>CREATE TEXT SEARCH CONFIGURATION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -119,8 +119,8 @@ CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceabl
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsconfig" endterm="sql-altertsconfig-title"></member>
-   <member><xref linkend="sql-droptsconfig" endterm="sql-droptsconfig-title"></member>
+   <member><xref linkend="sql-altertsconfig"></member>
+   <member><xref linkend="sql-droptsconfig"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsdictionary.sgml b/doc/src/sgml/ref/create_tsdictionary.sgml
index a75904debf62023436425b3b76d2433382173496..5da02490ddb5fd41d6dc8991f3c4e0723be40fdb 100644
--- a/doc/src/sgml/ref/create_tsdictionary.sgml
+++ b/doc/src/sgml/ref/create_tsdictionary.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsdictionary.sgml,v 1.3 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsdictionary.sgml,v 1.4 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETSDICTIONARY">
  <refmeta>
-  <refentrytitle id="sql-createtsdictionary-title">CREATE TEXT SEARCH DICTIONARY</refentrytitle>
+  <refentrytitle>CREATE TEXT SEARCH DICTIONARY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -134,8 +134,8 @@ CREATE TEXT SEARCH DICTIONARY my_russian (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsdictionary" endterm="sql-altertsdictionary-title"></member>
-   <member><xref linkend="sql-droptsdictionary" endterm="sql-droptsdictionary-title"></member>
+   <member><xref linkend="sql-altertsdictionary"></member>
+   <member><xref linkend="sql-droptsdictionary"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsparser.sgml b/doc/src/sgml/ref/create_tsparser.sgml
index 46a1919e7d07bcd1b9014ea9d0caf067f981251e..c04b636993fde0ff7cbeadac95f1e3efe8af3318 100644
--- a/doc/src/sgml/ref/create_tsparser.sgml
+++ b/doc/src/sgml/ref/create_tsparser.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsparser.sgml,v 1.2 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsparser.sgml,v 1.3 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETSPARSER">
  <refmeta>
-  <refentrytitle id="sql-createtsparser-title">CREATE TEXT SEARCH PARSER</refentrytitle>
+  <refentrytitle>CREATE TEXT SEARCH PARSER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -146,8 +146,8 @@ CREATE TEXT SEARCH PARSER <replaceable class="parameter">name</replaceable> (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsparser" endterm="sql-altertsparser-title"></member>
-   <member><xref linkend="sql-droptsparser" endterm="sql-droptsparser-title"></member>
+   <member><xref linkend="sql-altertsparser"></member>
+   <member><xref linkend="sql-droptsparser"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tstemplate.sgml b/doc/src/sgml/ref/create_tstemplate.sgml
index 281e25468e439df7c4b00fa4f12d0f77161f6484..84b61c8a8744d76d6270f61c0d1778fd32e13a8a 100644
--- a/doc/src/sgml/ref/create_tstemplate.sgml
+++ b/doc/src/sgml/ref/create_tstemplate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_tstemplate.sgml,v 1.2 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tstemplate.sgml,v 1.3 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETSTEMPLATE">
  <refmeta>
-  <refentrytitle id="sql-createtstemplate-title">CREATE TEXT SEARCH TEMPLATE</refentrytitle>
+  <refentrytitle>CREATE TEXT SEARCH TEMPLATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -119,8 +119,8 @@ CREATE TEXT SEARCH TEMPLATE <replaceable class="parameter">name</replaceable> (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertstemplate" endterm="sql-altertstemplate-title"></member>
-   <member><xref linkend="sql-droptstemplate" endterm="sql-droptstemplate-title"></member>
+   <member><xref linkend="sql-altertstemplate"></member>
+   <member><xref linkend="sql-droptstemplate"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index c2a77ac88d37928ce07de0febebad25f81555f51..319410e31cbb5a49719089f80fe9c38215d53734 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.81 2010/03/21 02:24:29 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.82 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATETYPE">
  <refmeta>
-  <refentrytitle id="sql-createtype-title">CREATE TYPE</refentrytitle>
+  <refentrytitle>CREATE TYPE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -779,10 +779,10 @@ CREATE TABLE big_objs (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-droptype" endterm="sql-droptype-title"></member>
-   <member><xref linkend="sql-altertype" endterm="sql-altertype-title"></member>
-   <member><xref linkend="sql-createdomain" endterm="sql-createdomain-title"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-droptype"></member>
+   <member><xref linkend="sql-altertype"></member>
+   <member><xref linkend="sql-createdomain"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 5b155823ff886224626649adaa734ca7a94231a3..a54ece612b0bbd0c7c4e442f4838a03ef000c89c 100644
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.43 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.44 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEUSER">
  <refmeta>
-  <refentrytitle id="sql-createuser-title">CREATE USER</refentrytitle>
+  <refentrytitle>CREATE USER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -48,7 +48,7 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
 
   <para>
    <command>CREATE USER</command> is now an alias for
-   <xref linkend="sql-createrole" endterm="sql-createrole-title">.
+   <xref linkend="sql-createrole">.
    The only difference is that when the command is spelled
    <command>CREATE USER</command>, <literal>LOGIN</> is assumed
    by default, whereas <literal>NOLOGIN</> is assumed when
@@ -71,7 +71,7 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole" endterm="sql-createrole-title"></member>
+   <member><xref linkend="sql-createrole"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml
index f1113907f4d03f57b5779327a77379c2c0d98b86..471a19f1c581b92015046eeec3cf9a0b357b5751 100644
--- a/doc/src/sgml/ref/create_user_mapping.sgml
+++ b/doc/src/sgml/ref/create_user_mapping.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_user_mapping.sgml,v 1.7 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_user_mapping.sgml,v 1.8 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEUSERMAPPING">
  <refmeta>
-  <refentrytitle id="sql-createusermapping-title">CREATE USER MAPPING</refentrytitle>
+  <refentrytitle>CREATE USER MAPPING</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -111,10 +111,10 @@ CREATE USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'secret');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterusermapping" endterm="sql-alterusermapping-title"></member>
-   <member><xref linkend="sql-dropusermapping" endterm="sql-dropusermapping-title"></member>
-   <member><xref linkend="sql-createforeigndatawrapper" endterm="sql-createforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-createserver" endterm="sql-createserver-title"></member>
+   <member><xref linkend="sql-alterusermapping"></member>
+   <member><xref linkend="sql-dropusermapping"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"></member>
+   <member><xref linkend="sql-createserver"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index f65e06c84c989e4d00ac86b1344854415c60316d..d80daa9807b2d92abddb0df894a82af0eab6641c 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.42 2009/10/02 18:13:04 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.43 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-CREATEVIEW">
  <refmeta>
-  <refentrytitle id="SQL-CREATEVIEW-TITLE">CREATE VIEW</refentrytitle>
+  <refentrytitle>CREATE VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -102,8 +102,8 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW <replaceable class="PARAMETER">n
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select" endterm="sql-select-title"> or
-      <xref linkend="sql-values" endterm="sql-values-title"> command
+      A <xref linkend="sql-select"> or
+      <xref linkend="sql-values"> command
       which will provide the columns and rows of the view.
      </para>
     </listitem>
@@ -119,11 +119,11 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW <replaceable class="PARAMETER">n
     update, or delete on a view.  You can get the effect of an updatable
     view by creating rules that rewrite inserts, etc. on the view into
     appropriate actions on other tables.  For more information see
-    <xref linkend="sql-createrule" endterm="sql-createrule-title">.
+    <xref linkend="sql-createrule">.
    </para>
 
    <para>
-    Use the <xref linkend="sql-dropview" endterm="sql-dropview-title">
+    Use the <xref linkend="sql-dropview">
     statement to drop views.
    </para>
 
@@ -237,8 +237,8 @@ CREATE VIEW <replaceable class="parameter">name</replaceable> [ ( <replaceable c
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member>
-   <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member>
+   <member><xref linkend="sql-alterview"></member>
+   <member><xref linkend="sql-dropview"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 1e7ecf4de85c6170ef31ee666c06896a0c1022f9..3f4ee6487ad4c22f8365ce065f07b8306b017f7f 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.51 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.52 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-CREATEDB">
  <refmeta>
-  <refentrytitle id="APP-CREATEDB-TITLE"><application>createdb</application></refentrytitle>
+  <refentrytitle><application>createdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -48,8 +48,7 @@ PostgreSQL documentation
 
   <para>
    <application>createdb</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEDATABASE"
-   endterm="SQL-CREATEDATABASE-title">.
+   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEDATABASE">.
    There is no effective difference between creating databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -197,8 +196,7 @@ PostgreSQL documentation
     The options <option>-D</option>, <option>-l</option>, <option>-E</option>, 
     <option>-O</option>, and
     <option>-T</option> correspond to options of the underlying
-    SQL command <xref linkend="SQL-CREATEDATABASE"
-    endterm="SQL-CREATEDATABASE-title">; see there for more information
+    SQL command <xref linkend="SQL-CREATEDATABASE">; see there for more information
     about them.
    </para>
 
@@ -323,8 +321,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CREATEDATABASE"
-   endterm="sql-createdatabase-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-CREATEDATABASE">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -364,7 +362,7 @@ PostgreSQL documentation
 
   <simplelist type="inline">
    <member><xref linkend="app-dropdb"></member>
-   <member><xref linkend="sql-createdatabase" endterm="sql-createdatabase-title"></member>
+   <member><xref linkend="sql-createdatabase"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 30bd52868096213ba7c2ef5b356d68c3a6cc0a49..eef50e2e465d4cd298d5c5e47177c9108028d08b 100644
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.45 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.46 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-CREATELANG">
  <refmeta>
-  <refentrytitle id="APP-CREATELANG-TITLE"><application>createlang</application></refentrytitle>
+  <refentrytitle><application>createlang</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -41,7 +41,7 @@ PostgreSQL documentation
    <application>createlang</application> is a utility for adding a new 
    programming language to a <productname>PostgreSQL</productname> database.
    <application>createlang</application> is just a wrapper around the
-   <xref linkend="sql-createlanguage" endterm="sql-createlanguage-title">
+   <xref linkend="sql-createlanguage">
    command.
   </para>
  </refsect1>
@@ -271,7 +271,7 @@ PostgreSQL documentation
 
   <simplelist type="inline">
    <member><xref linkend="app-droplang"></member>
-   <member><xref linkend="sql-createlanguage" endterm="sql-createlanguage-title"></member>
+   <member><xref linkend="sql-createlanguage"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 41e0bafd88bb7a51dd6d6de8a4adf8efea8d0bb2..043b490f5d39e0c9e153c046cae440699259c3c1 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.55 2010/03/22 14:56:09 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.56 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-CREATEUSER">
  <refmeta>
-  <refentrytitle id="APP-CREATEUSER-TITLE"><application>createuser</application></refentrytitle>
+  <refentrytitle><application>createuser</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -49,8 +49,7 @@ PostgreSQL documentation
 
   <para>
    <application>createuser</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEROLE"
-   endterm="SQL-CREATEROLE-title">.
+   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEROLE">.
    There is no effective difference between creating users via
    this utility and via other methods for accessing the server.
   </para>
@@ -384,8 +383,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CREATEROLE"
-   endterm="sql-createrole-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-CREATEROLE">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -445,7 +444,7 @@ PostgreSQL documentation
 
   <simplelist type="inline">
    <member><xref linkend="app-dropuser"></member>
-   <member><xref linkend="sql-createrole" endterm="sql-createrole-title"></member>
+   <member><xref linkend="sql-createrole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/deallocate.sgml b/doc/src/sgml/ref/deallocate.sgml
index e981eb0efcaf51570a1d03f47cb2be34bdf3515c..f6b46d936f8da829d80f77db97ed7bb138f1e07c 100644
--- a/doc/src/sgml/ref/deallocate.sgml
+++ b/doc/src/sgml/ref/deallocate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/deallocate.sgml,v 1.11 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/deallocate.sgml,v 1.12 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DEALLOCATE">
  <refmeta>
-  <refentrytitle id="sql-deallocate-title">DEALLOCATE</refentrytitle>
+  <refentrytitle>DEALLOCATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -41,7 +41,7 @@ DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL
 
   <para>
    For more information on prepared statements, see <xref
-   linkend="sql-prepare" endterm="sql-prepare-title">.
+   linkend="sql-prepare">.
   </para>
  </refsect1>
 
@@ -91,8 +91,8 @@ DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-execute" endterm="sql-execute-title"></member>
-   <member><xref linkend="sql-prepare" endterm="sql-prepare-title"></member>
+   <member><xref linkend="sql-execute"></member>
+   <member><xref linkend="sql-prepare"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index e93b4cf594df485a9ebaf6650919088705cf5f4f..8ad39280eeda3ef8fee101bccc8062f35cf7bc73 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/declare.sgml,v 1.47 2009/06/10 19:21:37 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/declare.sgml,v 1.48 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DECLARE">
  <refmeta>
-  <refentrytitle id="SQL-DECLARE-TITLE">DECLARE</refentrytitle>
+  <refentrytitle>DECLARE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -39,7 +39,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
    can be used to retrieve
    a small number of rows at a time out of a larger query.
    After the cursor is created, rows are fetched from it using
-   <xref linkend="sql-fetch" endterm="sql-fetch-title">.
+   <xref linkend="sql-fetch">.
   </para>
 
   <note>
@@ -126,8 +126,8 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select" endterm="sql-select-title"> or
-      <xref linkend="sql-values" endterm="sql-values-title"> command
+      A <xref linkend="sql-select"> or
+      <xref linkend="sql-values"> command
       which will provide the rows to be returned by the cursor.
      </para>
     </listitem>
@@ -185,9 +185,9 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <productname>PostgreSQL</productname> reports an error if such a
     command is used outside a transaction block.
     Use
-    <xref linkend="sql-begin" endterm="sql-begin-title"> and
-    <xref linkend="sql-commit" endterm="sql-commit-title">
-    (or <xref linkend="sql-rollback" endterm="sql-rollback-title">)
+    <xref linkend="sql-begin"> and
+    <xref linkend="sql-commit">
+    (or <xref linkend="sql-rollback">)
     to define a transaction block.
    </para>
 
@@ -246,7 +246,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     If the cursor's query includes <literal>FOR UPDATE</> or <literal>FOR
     SHARE</>, then returned rows are locked at the time they are first
     fetched, in the same way as for a regular
-    <xref linkend="sql-select" endterm="sql-select-title"> command with
+    <xref linkend="sql-select"> command with
     these options.
     In addition, the returned rows will be the most up-to-date versions;
     therefore these options provide the equivalent of what the SQL standard
@@ -311,7 +311,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
 <programlisting>
 DECLARE liahona CURSOR FOR SELECT * FROM films;
 </programlisting>
-   See <xref linkend="sql-fetch" endterm="sql-fetch-title"> for more
+   See <xref linkend="sql-fetch"> for more
    examples of cursor usage.
   </para>
  </refsect1>
@@ -343,9 +343,9 @@ DECLARE liahona CURSOR FOR SELECT * FROM films;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close" endterm="sql-close-title"></member>
-   <member><xref linkend="sql-fetch" endterm="sql-fetch-title"></member>
-   <member><xref linkend="sql-move" endterm="sql-move-title"></member>
+   <member><xref linkend="sql-close"></member>
+   <member><xref linkend="sql-fetch"></member>
+   <member><xref linkend="sql-move"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 6b175b943bbf15226d0c612f8eec202277955607..84bf6bd23f94cdb0614936963625e326d65cf7f5 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.36 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.37 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DELETE">
  <refmeta>
-  <refentrytitle id="SQL-DELETE-TITLE">DELETE</refentrytitle>
+  <refentrytitle>DELETE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -40,7 +40,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ]
 
    <tip>
     <para>
-     <xref linkend="sql-truncate" endterm="sql-truncate-title"> is a
+     <xref linkend="sql-truncate"> is a
      <productname>PostgreSQL</productname> extension that provides a
      faster mechanism to remove all rows from a table.
     </para>
@@ -152,7 +152,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ]
       query on the <command>DELETE</>'s target table.
       Note that <literal>WHERE CURRENT OF</> cannot be
       specified together with a Boolean condition.  See
-      <xref linkend="sql-declare" endterm="sql-declare-title">
+      <xref linkend="sql-declare">
       for more information about using cursors with
       <literal>WHERE CURRENT OF</>.
      </para>
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
index 695cc78902b84639e03bd936ee791d40bbc05096..d3436a303b3b424f40c5f388d602c4c1169edfd7 100644
--- a/doc/src/sgml/ref/discard.sgml
+++ b/doc/src/sgml/ref/discard.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/discard.sgml,v 1.5 2008/11/27 00:28:06 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/discard.sgml,v 1.6 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DISCARD">
  <refmeta>
-  <refentrytitle id="SQL-DISCARD-TITLE">DISCARD</refentrytitle>
+  <refentrytitle>DISCARD</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml
index 05678c4e8e73ff17d144d51366b748a1838db7b8..8b77d13a81c466e121a117d0aac4a9839a01c98a 100644
--- a/doc/src/sgml/ref/do.sgml
+++ b/doc/src/sgml/ref/do.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/do.sgml,v 1.5 2010/02/16 00:49:42 itagaki Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/do.sgml,v 1.6 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DO">
  <refmeta>
-  <refentrytitle id="sql-do-title">DO</refentrytitle>
+  <refentrytitle>DO</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -122,7 +122,7 @@ END$$;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createlanguage" endterm="sql-createlanguage-title"></member>
+   <member><xref linkend="sql-createlanguage"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index cefa3cec8b281b1e7adb5e52d7147537d73dfb22..406050e142da57a5358f61ce4d18653f6e000296 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.32 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.33 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPAGGREGATE">
  <refmeta>
-  <refentrytitle id="SQL-DROPAGGREGATE-TITLE">DROP AGGREGATE</refentrytitle>
+  <refentrytitle>DROP AGGREGATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -116,8 +116,8 @@ DROP AGGREGATE myavg(integer);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteraggregate" endterm="sql-alteraggregate-title"></member>
-   <member><xref linkend="sql-createaggregate" endterm="sql-createaggregate-title"></member>
+   <member><xref linkend="sql-alteraggregate"></member>
+   <member><xref linkend="sql-createaggregate"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml
index cc99fe850c7d8a7a127f9905142a46b75b7b875c..fde6dc3b03415e6ba550399ac9a87f3a3bc6b692 100644
--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.10 2009/09/19 10:23:27 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.11 2010/04/03 07:23:00 petere Exp $ -->
 
 <refentry id="SQL-DROPCAST">
  <refmeta>
-  <refentrytitle id="SQL-DROPCAST-TITLE">DROP CAST</refentrytitle>
+  <refentrytitle>DROP CAST</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -108,7 +108,7 @@ DROP CAST (text AS int);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createcast" endterm="sql-createcast-title"></member>
+   <member><xref linkend="sql-createcast"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml
index aa8adfeeed1cd6f01cf382a60d0ee01938cafc89..b80de52f0ac055f26c7470a26b8ec2405e8dad5f 100644
--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.12 2008/11/14 10:22:46 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.13 2010/04/03 07:23:00 petere Exp $ -->
 
 <refentry id="SQL-DROPCONVERSION">
  <refmeta>
-  <refentrytitle id="SQL-DROPCONVERSION-TITLE">DROP CONVERSION</refentrytitle>
+  <refentrytitle>DROP CONVERSION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -94,8 +94,8 @@ DROP CONVERSION myname;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterconversion" endterm="sql-alterconversion-title"></member>
-   <member><xref linkend="sql-createconversion" endterm="sql-createconversion-title"></member>
+   <member><xref linkend="sql-alterconversion"></member>
+   <member><xref linkend="sql-createconversion"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml
index 350f5c026ce99affd68fb50b9959a6749d6c513e..2deb6996cc3a0963ef8bc1f24ac67f2680853881 100644
--- a/doc/src/sgml/ref/drop_database.sgml
+++ b/doc/src/sgml/ref/drop_database.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.24 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.25 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPDATABASE">
  <refmeta>
-  <refentrytitle id="SQL-DROPDATABASE-TITLE">DROP DATABASE</refentrytitle>
+  <refentrytitle>DROP DATABASE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -78,7 +78,7 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   <para>
    This command cannot be executed while connected to the target
    database. Thus, it might be more convenient to use the program
-   <xref linkend="app-dropdb" endterm="app-dropdb-title"> instead,
+   <xref linkend="app-dropdb"> instead,
    which is a wrapper around this command.
   </para>
  </refsect1>
@@ -95,7 +95,7 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase" endterm="sql-createdatabase-title"></member>
+   <member><xref linkend="sql-createdatabase"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index a03dc151120b21c5017bff82f4d44b34fc74c45d..b8e5189bbab3876c3be4118c2e94da1ceb31f1eb 100644
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.19 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.20 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPDOMAIN">
  <refmeta>
-  <refentrytitle id="SQL-DROPDOMAIN-TITLE">DROP DOMAIN</refentrytitle>
+  <refentrytitle>DROP DOMAIN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -105,8 +105,8 @@ DROP DOMAIN box;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdomain" endterm="sql-createdomain-title"></member>
-   <member><xref linkend="sql-alterdomain" endterm="sql-alterdomain-title"></member>
+   <member><xref linkend="sql-createdomain"></member>
+   <member><xref linkend="sql-alterdomain"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
index 77da6d396251c0d6b1e1e3b320a6d60b132af469..f3e8334316b13f248fad375944990f8b3f7e58cc 100644
--- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml,v 1.2 2009/06/19 15:28:25 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml,v 1.3 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPFOREIGNDATAWRAPPER">
  <refmeta>
-  <refentrytitle id="sql-dropforeigndatawrapper-title">DROP FOREIGN DATA WRAPPER</refentrytitle>
+  <refentrytitle>DROP FOREIGN DATA WRAPPER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -105,8 +105,8 @@ DROP FOREIGN DATA WRAPPER dbi;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigndatawrapper" endterm="sql-createforeigndatawrapper-title"></member>
-   <member><xref linkend="sql-alterforeigndatawrapper" endterm="sql-alterforeigndatawrapper-title"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"></member>
+   <member><xref linkend="sql-alterforeigndatawrapper"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index b68858a2a1bd362d96ef62b3184b1099c9a1658a..78fe3f7d782e1ce273fa91aa4c41a39ea4d2ed7c 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.35 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.36 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPFUNCTION">
  <refmeta>
-  <refentrytitle id="SQL-DROPFUNCTION-TITLE">DROP FUNCTION</refentrytitle>
+  <refentrytitle>DROP FUNCTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -149,8 +149,8 @@ DROP FUNCTION sqrt(integer);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
-   <member><xref linkend="sql-alterfunction" endterm="sql-alterfunction-title"></member>
+   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-alterfunction"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml
index e660eea98179419fa1a882b5abcd8cc45de7f3fa..8899a942970080e06f2d630fc3b3c4bba13e1f80 100644
--- a/doc/src/sgml/ref/drop_group.sgml
+++ b/doc/src/sgml/ref/drop_group.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.15 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.16 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPGROUP">
  <refmeta>
-  <refentrytitle id="SQL-DROPGROUP-TITLE">DROP GROUP</refentrytitle>
+  <refentrytitle>DROP GROUP</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -30,7 +30,7 @@ DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
 
   <para>
    <command>DROP GROUP</command> is now an alias for
-   <xref linkend="sql-droprole" endterm="sql-droprole-title">.
+   <xref linkend="sql-droprole">.
   </para>
  </refsect1>
 
@@ -46,7 +46,7 @@ DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
+   <member><xref linkend="sql-droprole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index e7b9787793faf544f92671a3efa00bd17edc82ff..3e831d3c9bab2ee95224562be69d8cadb20fc18e 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.24 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.25 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPINDEX">
  <refmeta>
-  <refentrytitle id="SQL-DROPINDEX-TITLE">DROP INDEX</refentrytitle>
+  <refentrytitle>DROP INDEX</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -105,7 +105,7 @@ DROP INDEX title_idx;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createindex" endterm="sql-createindex-title"></member>
+   <member><xref linkend="sql-createindex"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 8b5cd4a4772a366c6154862e6fcdb56936464ecf..5564e00972a3bd525acd47851bc64656d9b0b001 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.27 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.28 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPLANGUAGE">
  <refmeta>
-  <refentrytitle id="SQL-DROPLANGUAGE-TITLE">DROP LANGUAGE</refentrytitle>
+  <refentrytitle>DROP LANGUAGE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -108,8 +108,8 @@ DROP LANGUAGE plsample;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterlanguage" endterm="sql-alterlanguage-title"></member>
-   <member><xref linkend="sql-createlanguage" endterm="sql-createlanguage-title"></member>
+   <member><xref linkend="sql-alterlanguage"></member>
+   <member><xref linkend="sql-createlanguage"></member>
    <member><xref linkend="app-droplang"></member>
   </simplelist>
  </refsect1>
diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml
index efceb7c5cc1d328a365a08284212a715d205dbd5..f1c89cd698a9dd433b40cf235f068a7354be5907 100644
--- a/doc/src/sgml/ref/drop_opclass.sgml
+++ b/doc/src/sgml/ref/drop_opclass.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.13 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.14 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPCLASS">
  <refmeta>
-  <refentrytitle id="SQL-DROPOPCLASS-TITLE">DROP OPERATOR CLASS</refentrytitle>
+  <refentrytitle>DROP OPERATOR CLASS</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -138,9 +138,9 @@ DROP OPERATOR CLASS widget_ops USING btree;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropclass" endterm="sql-alteropclass-title"></member>
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-dropopfamily" endterm="sql-dropopfamily-title"></member>
+   <member><xref linkend="sql-alteropclass"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-dropopfamily"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index 8007d8820d838bae58fcac7dfc50edc3df030ae7..0b82cf442b34fcdffebd98a57ae91ed1b9a2bd80 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.29 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.30 2010/04/03 07:23:00 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPERATOR">
  <refmeta>
-  <refentrytitle id="SQL-DROPOPERATOR-TITLE">DROP OPERATOR</refentrytitle>
+  <refentrytitle>DROP OPERATOR</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -139,8 +139,8 @@ DROP OPERATOR ! (bigint, none);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createoperator" endterm="sql-createoperator-title"></member>
-   <member><xref linkend="sql-alteroperator" endterm="sql-alteroperator-title"></member>
+   <member><xref linkend="sql-createoperator"></member>
+   <member><xref linkend="sql-alteroperator"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_opfamily.sgml b/doc/src/sgml/ref/drop_opfamily.sgml
index 4ba7a9773c92fdd0ec3d8d9bd1a82291953a5857..5f377b2af2c09b627176315e6db2f8615aca1e1b 100644
--- a/doc/src/sgml/ref/drop_opfamily.sgml
+++ b/doc/src/sgml/ref/drop_opfamily.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_opfamily.sgml,v 1.2 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_opfamily.sgml,v 1.3 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPOPFAMILY">
  <refmeta>
-  <refentrytitle id="SQL-DROPOPFAMILY-TITLE">DROP OPERATOR FAMILY</refentrytitle>
+  <refentrytitle>DROP OPERATOR FAMILY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -125,11 +125,11 @@ DROP OPERATOR FAMILY float_ops USING btree;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropfamily" endterm="sql-alteropfamily-title"></member>
-   <member><xref linkend="sql-createopfamily" endterm="sql-createopfamily-title"></member>
-   <member><xref linkend="sql-alteropclass" endterm="sql-alteropclass-title"></member>
-   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
-   <member><xref linkend="sql-dropopclass" endterm="sql-dropopclass-title"></member>
+   <member><xref linkend="sql-alteropfamily"></member>
+   <member><xref linkend="sql-createopfamily"></member>
+   <member><xref linkend="sql-alteropclass"></member>
+   <member><xref linkend="sql-createopclass"></member>
+   <member><xref linkend="sql-dropopclass"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index ced8876b0fc5db18456b5f8b97545632ae405f69..4d7355925a86aac19fdd52f8a58af14adf201217 100644
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_owned.sgml,v 1.7 2010/04/02 17:29:22 sriggs Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_owned.sgml,v 1.8 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROP-OWNED">
  <refmeta>
-  <refentrytitle id="SQL-DROP-OWNED-TITLE">DROP OWNED</refentrytitle>
+  <refentrytitle>DROP OWNED</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -87,8 +87,7 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
   </para>
 
   <para>
-   The <xref linkend="sql-reassign-owned"
-   endterm="sql-reassign-owned-title"> command is an alternative that
+   The <xref linkend="sql-reassign-owned"> command is an alternative that
    reassigns the ownership of all the database objects owned by one or
    more roles.
   </para>
@@ -111,8 +110,8 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-reassign-owned" endterm="sql-reassign-owned-title"></member>
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
+   <member><xref linkend="sql-reassign-owned"></member>
+   <member><xref linkend="sql-droprole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml
index d7a5692a732be9ce9018c91d9d7755da919bba27..ffe37b317efba8bbb00e2b011163e626554ec7e5 100644
--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_role.sgml,v 1.6 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_role.sgml,v 1.7 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPROLE">
  <refmeta>
-  <refentrytitle id="SQL-DROPROLE-TITLE">DROP ROLE</refentrytitle>
+  <refentrytitle>DROP ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -40,8 +40,8 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    of the cluster; an error will be raised if so.  Before dropping the role,
    you must drop all the objects it owns (or reassign their ownership)
    and revoke any privileges the role has been granted. The <xref
-   linkend="sql-reassign-owned" endterm="sql-reassign-owned-title">
-   and <xref linkend="sql-drop-owned" endterm="sql-drop-owned-title">
+   linkend="sql-reassign-owned">
+   and <xref linkend="sql-drop-owned">
    commands can be useful for this purpose.
   </para>
 
@@ -83,7 +83,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
 
   <para>
    <productname>PostgreSQL</productname> includes a program <xref
-   linkend="APP-DROPUSER" endterm="APP-DROPUSER-title"> that has the
+   linkend="APP-DROPUSER"> that has the
    same functionality as this command (in fact, it calls this command)
    but can be run from the command shell.
   </para>
@@ -114,9 +114,9 @@ DROP ROLE jonathan;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole" endterm="sql-createrole-title"></member>
-   <member><xref linkend="sql-alterrole" endterm="sql-alterrole-title"></member>
-   <member><xref linkend="sql-set-role" endterm="sql-set-role-title"></member>
+   <member><xref linkend="sql-createrole"></member>
+   <member><xref linkend="sql-alterrole"></member>
+   <member><xref linkend="sql-set-role"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index a902e86636104c6584c23f8c41491c1d348d8387..7a2bb346647ad187acdd2dfc18586fc177576753 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.24 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.25 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPRULE">
  <refmeta>
-  <refentrytitle id="SQL-DROPRULE-TITLE">DROP RULE</refentrytitle>
+  <refentrytitle>DROP RULE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -112,7 +112,7 @@ DROP RULE newrule ON mytable;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrule" endterm="sql-createrule-title"></member>
+   <member><xref linkend="sql-createrule"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml
index e5edf5565227ab9f6a6c51c85b7d8fcb7fd71a2d..ac108014777748cfd8189f203ba65d6a90279386 100644
--- a/doc/src/sgml/ref/drop_schema.sgml
+++ b/doc/src/sgml/ref/drop_schema.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_schema.sgml,v 1.9 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_schema.sgml,v 1.10 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSCHEMA">
  <refmeta>
-  <refentrytitle id="SQL-DROPSCHEMA-TITLE">DROP SCHEMA</refentrytitle>
+  <refentrytitle>DROP SCHEMA</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -113,8 +113,8 @@ DROP SCHEMA mystuff CASCADE;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterschema" endterm="sql-alterschema-title"></member>
-   <member><xref linkend="sql-createschema" endterm="sql-createschema-title"></member>
+   <member><xref linkend="sql-alterschema"></member>
+   <member><xref linkend="sql-createschema"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index aca302e293158ed56bd7a4f5d0a92375301ec81e..d6011bd4e7650af957b28c940b643ac9c3a9b482 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.28 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.29 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSEQUENCE">
  <refmeta>
-  <refentrytitle id="SQL-DROPSEQUENCE-TITLE">DROP SEQUENCE</refentrytitle>
+  <refentrytitle>DROP SEQUENCE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -106,8 +106,8 @@ DROP SEQUENCE serial;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsequence" endterm="sql-createsequence-title"></member>
-   <member><xref linkend="sql-altersequence" endterm="sql-altersequence-title"></member>
+   <member><xref linkend="sql-createsequence"></member>
+   <member><xref linkend="sql-altersequence"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml
index 2e79391b11b69f66a985ca74d168df83f112c1d5..d6a939dccf5532aae211c06082286075aab000b2 100644
--- a/doc/src/sgml/ref/drop_server.sgml
+++ b/doc/src/sgml/ref/drop_server.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_server.sgml,v 1.3 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_server.sgml,v 1.4 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPSERVER">
  <refmeta>
-  <refentrytitle id="sql-dropserver-title">DROP SERVER</refentrytitle>
+  <refentrytitle>DROP SERVER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -105,8 +105,8 @@ DROP SERVER IF EXISTS foo;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createserver" endterm="sql-createserver-title"></member>
-   <member><xref linkend="sql-alterserver" endterm="sql-alterserver-title"></member>
+   <member><xref linkend="sql-createserver"></member>
+   <member><xref linkend="sql-alterserver"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index aead8cd78a711d7b56514b998c305b84e990cdb8..d75868bdcf156269953532d02ac3a87b818c5d1a 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.28 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.29 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTABLE">
  <refmeta>
-  <refentrytitle id="SQL-DROPTABLE-TITLE">DROP TABLE</refentrytitle>
+  <refentrytitle>DROP TABLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -31,9 +31,8 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
   <para>
    <command>DROP TABLE</command> removes tables from the database.
    Only its owner can drop a table.  To empty a table of rows
-   without destroying the table, use <xref linkend="sql-delete"
-   endterm="sql-delete-title"> or <xref linkend="sql-truncate"
-   endterm="sql-truncate-title">.
+   without destroying the table, use <xref linkend="sql-delete">
+   or <xref linkend="sql-truncate">.
   </para>
 
   <para>
@@ -120,8 +119,8 @@ DROP TABLE films, distributors;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable" endterm="sql-altertable-title"></member>
-   <member><xref linkend="sql-createtable" endterm="sql-createtable-title"></member>
+   <member><xref linkend="sql-altertable"></member>
+   <member><xref linkend="sql-createtable"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index 0d0f2ea981fca4893451798ab025956dd543226a..505894506d882542582e77e7fcedc72f5a00193e 100644
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.9 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.10 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTABLESPACE">
  <refmeta>
-  <refentrytitle id="SQL-DROPTABLESPACE-TITLE">DROP TABLESPACE</refentrytitle>
+  <refentrytitle>DROP TABLESPACE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -103,8 +103,8 @@ DROP TABLESPACE mystuff;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtablespace" endterm="sql-createtablespace-title"></member>
-   <member><xref linkend="sql-altertablespace" endterm="sql-altertablespace-title"></member>
+   <member><xref linkend="sql-createtablespace"></member>
+   <member><xref linkend="sql-altertablespace"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 081e74bf2fd64c6a5caba6cdaafa6c95d13b52da..692c49ace499d371e596c82f6a53595d7567b843 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.23 2008/11/14 10:22:46 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.24 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTRIGGER">
  <refmeta>
-  <refentrytitle id="SQL-DROPTRIGGER-TITLE">DROP TRIGGER</refentrytitle>
+  <refentrytitle>DROP TRIGGER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -119,7 +119,7 @@ DROP TRIGGER if_dist_exists ON films;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtrigger" endterm="sql-createtrigger-title"></member>
+   <member><xref linkend="sql-createtrigger"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml
index e96cecf2f4a746752da43cdf6417889a457e7e72..087698c7603aea45da67adaf3208a54373ed8090 100644
--- a/doc/src/sgml/ref/drop_tsconfig.sgml
+++ b/doc/src/sgml/ref/drop_tsconfig.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsconfig.sgml,v 1.2 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsconfig.sgml,v 1.3 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSCONFIG">
  <refmeta>
-  <refentrytitle id="SQL-DROPTSCONFIG-TITLE">DROP TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refentrytitle>DROP TEXT SEARCH CONFIGURATION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -111,8 +111,8 @@ DROP TEXT SEARCH CONFIGURATION my_english;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsconfig" endterm="sql-altertsconfig-title"></member>
-   <member><xref linkend="sql-createtsconfig" endterm="sql-createtsconfig-title"></member>
+   <member><xref linkend="sql-altertsconfig"></member>
+   <member><xref linkend="sql-createtsconfig"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml
index c3c8bf40e82d2807dcbfa0300b83d5513d764b19..9f8a54e3e3c639bee3cd2f461ebec3c2e2088717 100644
--- a/doc/src/sgml/ref/drop_tsdictionary.sgml
+++ b/doc/src/sgml/ref/drop_tsdictionary.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsdictionary.sgml,v 1.2 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsdictionary.sgml,v 1.3 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSDICTIONARY">
  <refmeta>
-  <refentrytitle id="SQL-DROPTSDICTIONARY-TITLE">DROP TEXT SEARCH DICTIONARY</refentrytitle>
+  <refentrytitle>DROP TEXT SEARCH DICTIONARY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -110,8 +110,8 @@ DROP TEXT SEARCH DICTIONARY english;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsdictionary" endterm="sql-altertsdictionary-title"></member>
-   <member><xref linkend="sql-createtsdictionary" endterm="sql-createtsdictionary-title"></member>
+   <member><xref linkend="sql-altertsdictionary"></member>
+   <member><xref linkend="sql-createtsdictionary"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml
index 2936d678dd1f286df993bffa5aef4d4a6ccab964..5384a103d56698ee7d255e43e2dca5c9ac0a4605 100644
--- a/doc/src/sgml/ref/drop_tsparser.sgml
+++ b/doc/src/sgml/ref/drop_tsparser.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsparser.sgml,v 1.2 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsparser.sgml,v 1.3 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSPARSER">
  <refmeta>
-  <refentrytitle id="SQL-DROPTSPARSER-TITLE">DROP TEXT SEARCH PARSER</refentrytitle>
+  <refentrytitle>DROP TEXT SEARCH PARSER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -108,8 +108,8 @@ DROP TEXT SEARCH PARSER my_parser;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsparser" endterm="sql-altertsparser-title"></member>
-   <member><xref linkend="sql-createtsparser" endterm="sql-createtsparser-title"></member>
+   <member><xref linkend="sql-altertsparser"></member>
+   <member><xref linkend="sql-createtsparser"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml
index 48b19a6849b3e72dcef68db4b0a7ae61de52047c..f0876a72c925c945ab69600fcf75ca149709df61 100644
--- a/doc/src/sgml/ref/drop_tstemplate.sgml
+++ b/doc/src/sgml/ref/drop_tstemplate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tstemplate.sgml,v 1.2 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tstemplate.sgml,v 1.3 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTSTEMPLATE">
  <refmeta>
-  <refentrytitle id="SQL-DROPTSTEMPLATE-TITLE">DROP TEXT SEARCH TEMPLATE</refentrytitle>
+  <refentrytitle>DROP TEXT SEARCH TEMPLATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -109,8 +109,8 @@ DROP TEXT SEARCH TEMPLATE thesaurus;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertstemplate" endterm="sql-altertstemplate-title"></member>
-   <member><xref linkend="sql-createtstemplate" endterm="sql-createtstemplate-title"></member>
+   <member><xref linkend="sql-altertstemplate"></member>
+   <member><xref linkend="sql-createtstemplate"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index ea26507423bdcc16bedec81b4d34952c89b12a0b..5b320360c1440c63c95cfbbb231d8a9412294939 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.31 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.32 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPTYPE">
  <refmeta>
-  <refentrytitle id="SQL-DROPTYPE-TITLE">DROP TYPE</refentrytitle>
+  <refentrytitle>DROP TYPE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -107,8 +107,8 @@ DROP TYPE box;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtype" endterm="sql-createtype-title"></member>
-   <member><xref linkend="sql-altertype" endterm="sql-altertype-title"></member>
+   <member><xref linkend="sql-createtype"></member>
+   <member><xref linkend="sql-altertype"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml
index e523a48a208dc6b7164ef937a09010fa3fb4d0e2..bcd410a4b07d4e5d320d33041693bbc94b953599 100644
--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.25 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.26 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPUSER">
  <refmeta>
-  <refentrytitle id="SQL-DROPUSER-TITLE">DROP USER</refentrytitle>
+  <refentrytitle>DROP USER</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -30,7 +30,7 @@ DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
 
   <para>
    <command>DROP USER</command> is now an alias for
-   <xref linkend="sql-droprole" endterm="sql-droprole-title">.
+   <xref linkend="sql-droprole">.
   </para>
  </refsect1>
 
@@ -48,7 +48,7 @@ DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
+   <member><xref linkend="sql-droprole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml
index 8e8ed1d10353d737e279b3395b14f5b5e5d329f4..41dbd7b49d5a13f532d9b9ef72cd35e24e0f9ba4 100644
--- a/doc/src/sgml/ref/drop_user_mapping.sgml
+++ b/doc/src/sgml/ref/drop_user_mapping.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user_mapping.sgml,v 1.4 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user_mapping.sgml,v 1.5 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPUSERMAPPING">
  <refmeta>
-  <refentrytitle id="sql-dropusermapping-title">DROP USER MAPPING</refentrytitle>
+  <refentrytitle>DROP USER MAPPING</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -103,8 +103,8 @@ DROP USER MAPPING IF EXISTS FOR bob SERVER foo;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createusermapping" endterm="sql-createusermapping-title"></member>
-   <member><xref linkend="sql-alterusermapping" endterm="sql-alterusermapping-title"></member>
+   <member><xref linkend="sql-createusermapping"></member>
+   <member><xref linkend="sql-alterusermapping"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index ac03f059b52766f41791a511fd3f997001c2f0bb..9718ee5d9cfcf60f41199715c7408525e5087a12 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.25 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.26 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-DROPVIEW">
  <refmeta>
-  <refentrytitle id="SQL-DROPVIEW-TITLE">DROP VIEW</refentrytitle>
+  <refentrytitle>DROP VIEW</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -105,8 +105,8 @@ DROP VIEW kinds;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member>
-   <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
+   <member><xref linkend="sql-alterview"></member>
+   <member><xref linkend="sql-createview"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 76e0190238f60190a8531ccc3c2ba797e8dd86e8..40b0864338b81e5e315acb532f1aff8d3ac6150b 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.37 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.38 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPDB">
  <refmeta>
-  <refentrytitle id="APP-DROPDB-TITLE"><application>dropdb</application></refentrytitle>
+  <refentrytitle><application>dropdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -41,8 +41,7 @@ PostgreSQL documentation
 
   <para>
    <application>dropdb</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-DROPDATABASE"
-   endterm="SQL-DROPDATABASE-title">.
+   <acronym>SQL</acronym> command <xref linkend="SQL-DROPDATABASE">.
    There is no effective difference between dropping databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -222,8 +221,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-DROPDATABASE"
-   endterm="sql-dropdatabase-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-DROPDATABASE">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -264,7 +263,7 @@ Are you sure? (y/n) </computeroutput><userinput>y</userinput>
 
   <simplelist type="inline">
    <member><xref linkend="app-createdb"></member>
-   <member><xref linkend="sql-dropdatabase" endterm="sql-dropdatabase-title"></member>
+   <member><xref linkend="sql-dropdatabase"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 6dd5847b86ee3106ce6c80603b3d93ce57aa2950..f455b5643198c2310e5e4b9477c9ee219f69cc17 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.33 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.34 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPLANG">
  <refmeta>
-  <refentrytitle id="APP-DROPLANG-TITLE"><application>droplang</application></refentrytitle>
+  <refentrytitle><application>droplang</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -50,7 +50,7 @@ PostgreSQL documentation
    several <acronym>SQL</acronym> commands, it is recommended to use
    <application>droplang</application> because it performs a number
    of checks and is much easier to use. See
-   <xref linkend="sql-droplanguage" endterm="sql-droplanguage-title">
+   <xref linkend="sql-droplanguage">
    for more.
   </para>
  </refsect1>
@@ -275,7 +275,7 @@ PostgreSQL documentation
 
   <simplelist type="inline">
    <member><xref linkend="app-createlang"></member>
-   <member><xref linkend="sql-droplanguage" endterm="sql-droplanguage-title"></member>
+   <member><xref linkend="sql-droplanguage"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 31a6f0009c148d834bedeb7f733c11cd38415765..4dc5e43b7d685b89e90185163bf19d7c3bf5a260 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.42 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.43 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-DROPUSER">
  <refmeta>
-  <refentrytitle id="APP-DROPUSER-TITLE"><application>dropuser</application></refentrytitle>
+  <refentrytitle><application>dropuser</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -42,8 +42,7 @@ PostgreSQL documentation
 
   <para>
    <application>dropuser</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-DROPROLE"
-   endterm="SQL-DROPROLE-title">.
+   <acronym>SQL</acronym> command <xref linkend="SQL-DROPROLE">.
    There is no effective difference between dropping users via
    this utility and via other methods for accessing the server.
   </para>
@@ -223,8 +222,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-DROPROLE"
-   endterm="sql-droprole-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-DROPROLE">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -265,7 +264,7 @@ Are you sure? (y/n) </computeroutput><userinput>y</userinput>
 
   <simplelist type="inline">
    <member><xref linkend="app-createuser"></member>
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
+   <member><xref linkend="sql-droprole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml
index a436fb47c550f6d844e541402b55f6681c0a20e6..267f9b9f0cecfb04ddd42da5ec5dd582e69e27ab 100644
--- a/doc/src/sgml/ref/end.sgml
+++ b/doc/src/sgml/ref/end.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/end.sgml,v 1.15 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/end.sgml,v 1.16 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-END">
  <refmeta>
-  <refentrytitle id="SQL-END-TITLE">END</refentrytitle>
+  <refentrytitle>END</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -33,8 +33,7 @@ END [ WORK | TRANSACTION ]
    made by the transaction become visible to others and are guaranteed
    to be durable if a crash occurs.  This command is a
    <productname>PostgreSQL</productname> extension
-   that is equivalent to <xref linkend="sql-commit"
-   endterm="sql-commit-title">.
+   that is equivalent to <xref linkend="sql-commit">.
   </para>
  </refsect1>
   
@@ -58,7 +57,7 @@ END [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE"> to
+   Use <xref linkend="SQL-ROLLBACK"> to
    abort a transaction.
   </para>
 
@@ -85,7 +84,7 @@ END;
   <para>
    <command>END</command> is a <productname>PostgreSQL</productname>
    extension that provides functionality equivalent to <xref
-   linkend="sql-commit" endterm="sql-commit-title">, which is
+   linkend="sql-commit">, which is
    specified in the SQL standard.
   </para>
  </refsect1>
@@ -94,9 +93,9 @@ END;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml
index 640763a7435d865168beb8a1d577c84032afc843..8d8989c9ca9cd443932b1daa8bc324eca3634c36 100644
--- a/doc/src/sgml/ref/execute.sgml
+++ b/doc/src/sgml/ref/execute.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/execute.sgml,v 1.16 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/execute.sgml,v 1.17 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-EXECUTE">
  <refmeta>
-  <refentrytitle id="sql-execute-title">EXECUTE</refentrytitle>
+  <refentrytitle>EXECUTE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -52,7 +52,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
 
   <para>
    For more information on the creation and usage of prepared statements,
-   see <xref linkend="sql-prepare" endterm="sql-prepare-title">.
+   see <xref linkend="sql-prepare">.
   </para>
  </refsect1>
 
@@ -96,7 +96,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
   <para>
     Examples are given in the <xref linkend="sql-prepare-examples"
     endterm="sql-prepare-examples-title"> section of the <xref
-    linkend="sql-prepare" endterm="sql-prepare-title"> documentation.
+    linkend="sql-prepare"> documentation.
    </para>
  </refsect1>
 
@@ -115,8 +115,8 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-deallocate" endterm="sql-deallocate-title"></member>
-   <member><xref linkend="sql-prepare" endterm="sql-prepare-title"></member>
+   <member><xref linkend="sql-deallocate"></member>
+   <member><xref linkend="sql-prepare"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index c28c5174000a4b8162d4f26e6e39679088db27a8..cf4aa8f7622de066537496857fae5e14aeba908f 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.49 2010/02/17 04:19:39 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.50 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-EXPLAIN">
  <refmeta>
-  <refentrytitle id="SQL-EXPLAIN-TITLE">EXPLAIN</refentrytitle>
+  <refentrytitle>EXPLAIN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -209,7 +209,7 @@ ROLLBACK;
   <para>
    In order to allow the <productname>PostgreSQL</productname> query
    planner to make reasonably informed decisions when optimizing
-   queries, the <xref linkend="sql-analyze" endterm="sql-analyze-title">
+   queries, the <xref linkend="sql-analyze">
    statement should be run to record statistics about the distribution
    of data within the table. If you have not done this (or if the
    statistical distribution of the data in the table has changed
@@ -339,7 +339,7 @@ EXPLAIN ANALYZE EXECUTE query(100, 200);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-analyze" endterm="sql-analyze-title"></member>
+   <member><xref linkend="sql-analyze"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index 13cdcff37f23d38eef720cd82b8da9a069310fd8..46a9d4de8ecd1ee078c663afa919b32555af70cc 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.46 2009/11/11 20:07:57 alvherre Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.47 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-FETCH">
  <refmeta>
-  <refentrytitle id="SQL-FETCH-TITLE">FETCH</refentrytitle>
+  <refentrytitle>FETCH</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -337,9 +337,9 @@ FETCH <replaceable class="parameter">count</replaceable>
   </para>
 
   <para>
-   <xref linkend="sql-declare" endterm="sql-declare-title">
+   <xref linkend="sql-declare">
    is used to define a cursor.  Use
-   <xref linkend="sql-move" endterm="sql-move-title">
+   <xref linkend="sql-move">
    to change cursor position without retrieving data.
   </para>
  </refsect1>
@@ -413,9 +413,9 @@ COMMIT WORK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close" endterm="sql-close-title"></member>
-   <member><xref linkend="sql-declare" endterm="sql-declare-title"></member>
-   <member><xref linkend="sql-move" endterm="sql-move-title"></member>
+   <member><xref linkend="sql-close"></member>
+   <member><xref linkend="sql-declare"></member>
+   <member><xref linkend="sql-move"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index 856005b02577b15e9e69ce1ccbcb57baa843515a..b0ac447700b9c022fae11147fe2ddd8b79ae2320 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.82 2010/03/17 20:53:19 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.83 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-GRANT">
  <refmeta>
-  <refentrytitle id="sql-grant-title">GRANT</refentrytitle>
+  <refentrytitle>GRANT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -152,7 +152,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
    creates the object; then there is no window in which another user
    can use the object.)
    Also, these initial default privilege settings can be changed using the
-   <xref linkend="sql-alterdefaultprivileges" endterm="sql-alterdefaultprivileges-title">
+   <xref linkend="sql-alterdefaultprivileges">
    command.
   </para>
 
@@ -164,14 +164,14 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term>SELECT</term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-select" endterm="sql-select-title"> from
+       Allows <xref linkend="sql-select"> from
        any column, or the specific columns listed, of the specified table,
        view, or sequence.
        Also allows the use of
-       <xref linkend="sql-copy" endterm="sql-copy-title"> TO.
+       <xref linkend="sql-copy"> TO.
        This privilege is also needed to reference existing column values in
-       <xref linkend="sql-update" endterm="sql-update-title"> or
-       <xref linkend="sql-delete" endterm="sql-delete-title">.
+       <xref linkend="sql-update"> or
+       <xref linkend="sql-delete">.
        For sequences, this privilege also allows the use of the
        <function>currval</function> function.
        For large objects, this privilege allows the object to be read.
@@ -183,11 +183,11 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term>INSERT</term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-insert" endterm="sql-insert-title"> of a new
+       Allows <xref linkend="sql-insert"> of a new
        row into the specified table.  If specific columns are listed,
        only those columns may be assigned to in the <command>INSERT</>
        command (other columns will therefore receive default values).
-       Also allows <xref linkend="sql-copy" endterm="sql-copy-title"> FROM.
+       Also allows <xref linkend="sql-copy"> FROM.
       </para>
      </listitem>
     </varlistentry>
@@ -196,7 +196,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term>UPDATE</term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-update" endterm="sql-update-title"> of any
+       Allows <xref linkend="sql-update"> of any
        column, or the specific columns listed, of the specified table.
        (In practice, any nontrivial <command>UPDATE</> command will require
        <literal>SELECT</> privilege as well, since it must reference table
@@ -218,7 +218,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term>DELETE</term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-delete" endterm="sql-delete-title"> of a row
+       Allows <xref linkend="sql-delete"> of a row
        from the specified table.
        (In practice, any nontrivial <command>DELETE</> command will require
        <literal>SELECT</> privilege as well, since it must reference table
@@ -231,7 +231,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term>TRUNCATE</term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-truncate" endterm="sql-truncate-title"> on
+       Allows <xref linkend="sql-truncate"> on
        the specified table.
       </para>
      </listitem>
@@ -254,7 +254,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <listitem>
       <para>
        Allows the creation of a trigger on the specified table.  (See the
-       <xref linkend="sql-createtrigger" endterm="sql-createtrigger-title"> statement.)
+       <xref linkend="sql-createtrigger"> statement.)
       </para>
      </listitem>
     </varlistentry>
@@ -396,7 +396,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
   <title>Notes</title>
 
    <para>
-    The <xref linkend="sql-revoke" endterm="sql-revoke-title"> command is used
+    The <xref linkend="sql-revoke"> command is used
     to revoke access privileges.
    </para>
 
@@ -628,8 +628,8 @@ GRANT admins TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-revoke" endterm="sql-revoke-title"></member>
-   <member><xref linkend="sql-alterdefaultprivileges" endterm="sql-alterdefaultprivileges-title"></member>
+   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="sql-alterdefaultprivileges"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index e9353da777ef396907ce510d8d12e0355080e56a..153eceb2939333b6f7a968c179fdc9a0936b6642 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.46 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.47 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-INITDB">
  <refmeta>
-  <refentrytitle id="APP-INITDB-TITLE">initdb</refentrytitle>
+  <refentrytitle>initdb</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index a2a52d8ba429c3d82f5d943cf5f76faa91c4c46d..a17577b0e553b485fa961b36105065cc2da49873 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/insert.sgml,v 1.38 2009/01/22 20:15:59 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/insert.sgml,v 1.39 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-INSERT">
  <refmeta>
-  <refentrytitle id="SQL-INSERT-TITLE">INSERT</refentrytitle>
+  <refentrytitle>INSERT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -140,7 +140,7 @@ INSERT INTO <replaceable class="PARAMETER">table</replaceable> [ ( <replaceable
      <para>
       A query (<command>SELECT</command> statement) that supplies the
       rows to be inserted.  Refer to the
-      <xref linkend="sql-select" endterm="sql-select-title">
+      <xref linkend="sql-select">
       statement for a description of the syntax.
      </para>
     </listitem>
@@ -296,7 +296,7 @@ INSERT INTO distributors (did, dname) VALUES (DEFAULT, 'XYZ Widgets')
   <para>
    Possible limitations of the <replaceable
    class="PARAMETER">query</replaceable> clause are documented under
-   <xref linkend="sql-select" endterm="sql-select-title">.
+   <xref linkend="sql-select">.
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index 57577c1f6aca31f2575e8a13a2fb536facd7203b..4f8b603bd29ae6493a1a3ce0bd1b3dff598deb46 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/listen.sgml,v 1.24 2010/02/16 22:34:43 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/listen.sgml,v 1.25 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-LISTEN">
  <refmeta>
-  <refentrytitle id="SQL-LISTEN-TITLE">LISTEN</refentrytitle>
+  <refentrytitle>LISTEN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -65,7 +65,7 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable>
   </para>
 
   <para>
-   <xref linkend="sql-notify" endterm="sql-notify-title">
+   <xref linkend="sql-notify">
    contains a more extensive
    discussion of the use of <command>LISTEN</command> and
    <command>NOTIFY</command>.
@@ -130,8 +130,8 @@ Asynchronous notification "virtual" received from server process with PID 8448.
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-notify" endterm="sql-notify-title"></member>
-   <member><xref linkend="sql-unlisten" endterm="sql-unlisten-title"></member>
+   <member><xref linkend="sql-notify"></member>
+   <member><xref linkend="sql-unlisten"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml
index 64237b09f5ac0f224d72741ae80fc57d992448a3..ef74a0fbd4d57941471cb76f56f61fbcf9505f3e 100644
--- a/doc/src/sgml/ref/load.sgml
+++ b/doc/src/sgml/ref/load.sgml
@@ -1,10 +1,10 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/load.sgml,v 1.26 2009/09/03 22:11:07 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/load.sgml,v 1.27 2010/04/03 07:23:01 petere Exp $
 -->
 
 <refentry id="SQL-LOAD">
  <refmeta>
-  <refentrytitle id="SQL-LOAD-TITLE">LOAD</refentrytitle>
+  <refentrytitle>LOAD</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -39,7 +39,7 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>'
 
   <para>
    The file name is specified in the same way as for shared library
-   names in <xref linkend="sql-createfunction" endterm="sql-createfunction-title">; in particular, one
+   names in <xref linkend="sql-createfunction">; in particular, one
    can rely on a search path and automatic addition of the system's standard
    shared library file name extension.  See <xref linkend="xfunc-c"> for
    more information on this topic.
@@ -73,7 +73,7 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>'
   <title>See Also</title>
 
   <para>
-   <xref linkend="sql-createfunction" endterm="sql-createfunction-title">
+   <xref linkend="sql-createfunction">
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 4df32bff4504943399a105cfa6b18e187b8dc72a..a61cb98c7a339990263a018c7d29aee031a30ef0 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.53 2009/09/18 05:00:42 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.54 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-LOCK">
  <refmeta>
-  <refentrytitle id="sql-lock-title">LOCK</refentrytitle>
+  <refentrytitle>LOCK</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -168,9 +168,9 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [, ...
     <productname>PostgreSQL</productname> reports an error if <command>LOCK</>
     is used outside a transaction block.
     Use
-    <xref linkend="sql-begin" endterm="sql-begin-title"> and
-    <xref linkend="sql-commit" endterm="sql-commit-title">
-    (or <xref linkend="sql-rollback" endterm="sql-rollback-title">)
+    <xref linkend="sql-begin"> and
+    <xref linkend="sql-commit">
+    (or <xref linkend="sql-rollback">)
     to define a transaction block.
    </para>
 
@@ -231,8 +231,7 @@ COMMIT WORK;
    There is no <command>LOCK TABLE</command> in the SQL standard,
    which instead uses <command>SET TRANSACTION</command> to specify
    concurrency levels on transactions.  <productname>PostgreSQL</productname> supports that too;
-   see <xref linkend="SQL-SET-TRANSACTION"
-   endterm="SQL-SET-TRANSACTION-TITLE"> for details.
+   see <xref linkend="SQL-SET-TRANSACTION"> for details.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml
index beeb1349a19fe57a5df6aa24e856568eeb649d0d..09083d834bea2463578eecd42bc954b6b34b18ee 100644
--- a/doc/src/sgml/ref/move.sgml
+++ b/doc/src/sgml/ref/move.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/move.sgml,v 1.34 2009/11/11 20:07:57 alvherre Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/move.sgml,v 1.35 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-MOVE">
  <refmeta>
-  <refentrytitle id="SQL-MOVE-TITLE">MOVE</refentrytitle>
+  <refentrytitle>MOVE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -42,7 +42,7 @@ MOVE [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <r
   <para>
    The parameters for the <command>MOVE</command> command are identical to 
    those of the <command>FETCH</command> command; refer to
-   <xref linkend="sql-fetch" endterm="sql-fetch-title">
+   <xref linkend="sql-fetch">
    for details on syntax and usage.
   </para>
  </refsect1>
@@ -98,9 +98,9 @@ COMMIT WORK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close" endterm="sql-close-title"></member>
-   <member><xref linkend="sql-declare" endterm="sql-declare-title"></member>
-   <member><xref linkend="sql-fetch" endterm="sql-fetch-title"></member>
+   <member><xref linkend="sql-close"></member>
+   <member><xref linkend="sql-declare"></member>
+   <member><xref linkend="sql-fetch"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml
index dca5a1d1cbfe6af8e0dfe1077cb17158a9440073..33b491e1e7c1cb76eef324c294649444444cb7ec 100644
--- a/doc/src/sgml/ref/notify.sgml
+++ b/doc/src/sgml/ref/notify.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.33 2010/02/17 00:57:06 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.34 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-NOTIFY">
  <refmeta>
-  <refentrytitle id="sql-notify-title">NOTIFY</refentrytitle>
+  <refentrytitle>NOTIFY</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -216,8 +216,8 @@ Asynchronous notification "foo" with payload "payload" received from server proc
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-listen" endterm="sql-listen-title"></member>
-   <member><xref linkend="sql-unlisten" endterm="sql-unlisten-title"></member>
+   <member><xref linkend="sql-listen"></member>
+   <member><xref linkend="sql-unlisten"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pg_config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml
index 884ccea7afb11b8a10896179a05a55ff80999309..5c63942542e5d3c2b65ff4442dd40e6f36dceb1a 100644
--- a/doc/src/sgml/ref/pg_config-ref.sgml
+++ b/doc/src/sgml/ref/pg_config-ref.sgml
@@ -1,8 +1,8 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.28 2008/02/18 14:51:48 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.29 2010/04/03 07:23:01 petere Exp $ -->
 
 <refentry id="app-pgconfig">
  <refmeta>
-  <refentrytitle id="app-pgconfig-title">pg_config</refentrytitle>
+  <refentrytitle>pg_config</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index fcf01873b38581f5f0229f45b6401d99c27853f8..79f74d70507baba86b2395e58b95ae177f3bcb6b 100644
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.12 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.13 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-PGCONTROLDATA">
  <refmeta>
-  <refentrytitle id="APP-PGCONTROLDATA-TITLE"><application>pg_controldata</application></refentrytitle>
+  <refentrytitle><application>pg_controldata</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index a85d0ef02cb62e363c4909e1528c5c802b725076..e11e59a3fa1ebec3110d923eef2d0999a082979f 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.48 2010/02/22 22:30:10 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.49 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="app-pg-ctl">
  <refmeta>
-  <refentrytitle id="app-pg-ctl-title"><application>pg_ctl</application></refentrytitle>
+  <refentrytitle><application>pg_ctl</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index ce4b9f49bf18ca46a1165f99ad7cad9705a9cfd5..95a37512ee1d4df28b39a798b464876926de176e 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.81 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.82 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-PG-DUMPALL">
  <refmeta>
-  <refentrytitle id="APP-PG-DUMPALL-TITLE"><application>pg_dumpall</application></refentrytitle>
+  <refentrytitle><application>pg_dumpall</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml
index ab8c664a2b4676cdee260524c193e092cdcb47d2..ba7de65ff41a1b503f0f0922b0184922b6657e05 100644
--- a/doc/src/sgml/ref/pg_resetxlog.sgml
+++ b/doc/src/sgml/ref/pg_resetxlog.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.22 2010/02/19 14:36:45 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.23 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-PGRESETXLOG">
  <refmeta>
-  <refentrytitle id="APP-PGRESETXLOG-TITLE"><application>pg_resetxlog</application></refentrytitle>
+  <refentrytitle><application>pg_resetxlog</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index 49a5278fb330d08573583982d48abd697597a2bb..43de7a09944a109f0535dc7be9af2ed3c571e096 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.57 2006/06/18 15:38:36 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.58 2010/04/03 07:23:01 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="app-postmaster">
  <refmeta>
-  <refentrytitle id="APP-POSTMASTER-TITLE"><application>postmaster</application></refentrytitle>
+  <refentrytitle><application>postmaster</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index 3061da5e6d2be9d128480c0d936f81f9442a7a3c..4f961cde659c9bf943f5f1e0f37e6b7e60ed1f92 100644
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.25 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.26 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-PREPARE">
  <refmeta>
-  <refentrytitle id="sql-prepare-title">PREPARE</refentrytitle>
+  <refentrytitle>PREPARE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -55,7 +55,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    in which the parameter is used (if possible). When executing the
    statement, specify the actual values for these parameters in the
    <command>EXECUTE</command> statement.  Refer to <xref
-   linkend="sql-execute" endterm="sql-execute-title"> for more
+   linkend="sql-execute"> for more
    information about that.
   </para>
 
@@ -66,8 +66,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    also means that a single  prepared statement cannot be used by
    multiple simultaneous database clients; however, each client can create
    their own prepared statement to use.  The prepared statement can be
-   manually cleaned up using the <xref linkend="sql-deallocate"
-   endterm="sql-deallocate-title"> command.
+   manually cleaned up using the <xref linkend="sql-deallocate"> command.
   </para>
 
   <para>
@@ -141,14 +140,13 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    when planning prepared statements with parameters, the chosen plan
    might be suboptimal. To examine the query plan
    <productname>PostgreSQL</productname> has chosen for a prepared
-   statement, use <xref linkend="sql-explain"
-   endterm="sql-explain-title">.
+   statement, use <xref linkend="sql-explain">.
   </para>
 
   <para>
    For more information on query planning and the statistics collected
    by <productname>PostgreSQL</productname> for that purpose, see
-   the <xref linkend="sql-analyze" endterm="sql-analyze-title">
+   the <xref linkend="sql-analyze">
    documentation.
   </para>
 
@@ -200,8 +198,8 @@ EXECUTE usrrptplan(1, current_date);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-deallocate" endterm="sql-deallocate-title"></member>
-   <member><xref linkend="sql-execute" endterm="sql-execute-title"></member>
+   <member><xref linkend="sql-deallocate"></member>
+   <member><xref linkend="sql-execute"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml
index da304c72550adbaeb0deabd0767cf12e873d2b16..9792bedcb5ddb406b83c2e7a15f078f8cfc36438 100644
--- a/doc/src/sgml/ref/prepare_transaction.sgml
+++ b/doc/src/sgml/ref/prepare_transaction.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.10 2010/01/25 18:23:10 heikki Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.11 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-PREPARE-TRANSACTION">
  <refmeta>
-  <refentrytitle id="sql-prepare-transaction-title">PREPARE TRANSACTION</refentrytitle>
+  <refentrytitle>PREPARE TRANSACTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -39,8 +39,8 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <para>
    Once prepared, a transaction can later be committed or rolled back
-   with <xref linkend="sql-commit-prepared" endterm="sql-commit-prepared-title">
-   or <xref linkend="sql-rollback-prepared" endterm="sql-rollback-prepared-title">,
+   with <xref linkend="sql-commit-prepared">
+   or <xref linkend="sql-rollback-prepared">,
    respectively.  Those commands can be issued from any session, not
    only the one that executed the original transaction.
   </para>
@@ -93,7 +93,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <para>
    This command must be used inside a transaction block. Use <xref
-   linkend="sql-begin" endterm="sql-begin-title"> to start one.
+   linkend="sql-begin"> to start one.
   </para>
 
   <para>
@@ -161,8 +161,8 @@ PREPARE TRANSACTION 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-commit-prepared" endterm="sql-commit-prepared-title"></member>
-   <member><xref linkend="sql-rollback-prepared" endterm="sql-rollback-prepared-title"></member>
+   <member><xref linkend="sql-commit-prepared"></member>
+   <member><xref linkend="sql-rollback-prepared"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 33c7488d64f44ffbfaa48b1b8a2371c870b9fefc..782d91411e002467979bfb33ccfa0619ab9cf9f0 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.243 2010/03/21 00:43:40 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.244 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-PSQL">
   <refmeta>
-    <refentrytitle id="app-psql-title"><application>psql</application></refentrytitle>
+    <refentrytitle><application>psql</application></refentrytitle>
     <manvolnum>1</manvolnum>
     <refmiscinfo>Application</refmiscinfo>
   </refmeta>
@@ -622,8 +622,8 @@ testdb=&gt;
     <para>
     Whenever a command is executed, <application>psql</application> also polls
     for asynchronous notification events generated by
-    <xref linkend="SQL-LISTEN" endterm="SQL-LISTEN-title"> and
-    <xref linkend="SQL-NOTIFY" endterm="SQL-NOTIFY-title">.
+    <xref linkend="SQL-LISTEN"> and
+    <xref linkend="SQL-NOTIFY">.
     </para>
   </refsect2>
 
@@ -798,8 +798,8 @@ testdb=&gt;
         <listitem>
         <para>
         Performs a frontend (client) copy. This is an operation that
-        runs an <acronym>SQL</acronym> <xref linkend="SQL-COPY"
-        endterm="SQL-COPY-title"> command, but instead of the server
+        runs an <acronym>SQL</acronym> <xref linkend="SQL-COPY">
+        command, but instead of the server
         reading or writing the specified file,
         <application>psql</application> reads or writes the file and
         routes the data between the server and the local file system.
@@ -810,8 +810,8 @@ testdb=&gt;
 
         <para>
         The syntax of the command is similar to that of the
-        <acronym>SQL</acronym> <xref linkend="sql-copy"
-        endterm="sql-copy-title"> command.  Note that, because of this,
+        <acronym>SQL</acronym> <xref linkend="sql-copy">
+        command.  Note that, because of this,
         special parsing rules apply to the <command>\copy</command>
         command. In particular, the variable substitution rules and
         backslash escapes do not apply.
@@ -979,7 +979,7 @@ testdb=&gt;
 
         <para>
         Descriptions for objects can be created with the <xref
-        linkend="sql-comment" endterm="sql-comment-title">
+        linkend="sql-comment">
         <acronym>SQL</acronym> command.
        </para>
         </listitem>
@@ -999,11 +999,10 @@ testdb=&gt;
         </para>
 
         <para>
-        The <xref linkend="sql-alterdefaultprivileges"
-        endterm="sql-alterdefaultprivileges-title"> command is used to set
+        The <xref linkend="sql-alterdefaultprivileges"> command is used to set
         default access privileges.  The meaning of the
         privilege display is explained under
-        <xref linkend="sql-grant" endterm="sql-grant-title">.
+        <xref linkend="sql-grant">.
         </para>
         </listitem>
       </varlistentry>
@@ -1264,11 +1263,11 @@ testdb=&gt;
         </para>
 
         <para>
-        The <xref linkend="sql-grant" endterm="sql-grant-title"> and
-        <xref linkend="sql-revoke" endterm="sql-revoke-title">
+        The <xref linkend="sql-grant"> and
+        <xref linkend="sql-revoke">
         commands are used to set access privileges.  The meaning of the
         privilege display is explained under
-        <xref linkend="sql-grant" endterm="sql-grant-title">.
+        <xref linkend="sql-grant">.
         </para>
         </listitem>
       </varlistentry>
@@ -1287,8 +1286,8 @@ testdb=&gt;
         </para>
 
         <para>
-        The <xref linkend="sql-alterrole" endterm="sql-alterrole-title"> and
-        <xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title">
+        The <xref linkend="sql-alterrole"> and
+        <xref linkend="sql-alterdatabase">
         commands are used to define per-role and per-database configuration
         settings.
         </para>
@@ -2097,7 +2096,7 @@ lo_import 152801
         <note>
         <para>
         This command is totally separate from the <acronym>SQL</acronym>
-        command <xref linkend="SQL-SET" endterm="SQL-SET-title">.
+        command <xref linkend="SQL-SET">.
         </para>
         </note>
         </listitem>
diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml
index f9636479cb5ee3f0433b49384c77697aa55f2a6f..069b99491f211f1b82caf375cd4e825d28b5c907 100644
--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reassign_owned.sgml,v 1.5 2010/04/02 17:29:22 sriggs Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reassign_owned.sgml,v 1.6 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-REASSIGN-OWNED">
  <refmeta>
-  <refentrytitle id="SQL-REASSIGN-OWNED-TITLE">REASSIGN OWNED</refentrytitle>
+  <refentrytitle>REASSIGN OWNED</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -79,8 +79,7 @@ REASSIGN OWNED BY <replaceable class="PARAMETER">old_role</replaceable> [, ...]
   </para>
 
   <para>
-   The <xref linkend="sql-drop-owned"
-    endterm="sql-drop-owned-title"> command is an alternative that
+   The <xref linkend="sql-drop-owned"> command is an alternative that
    drops all the database objects owned by one or more roles. Note
    also that <command>DROP OWNED</command> requires privileges only
    on the source role(s).
@@ -108,8 +107,8 @@ REASSIGN OWNED BY <replaceable class="PARAMETER">old_role</replaceable> [, ...]
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-drop-owned" endterm="sql-drop-owned-title"></member>
-   <member><xref linkend="sql-droprole" endterm="sql-droprole-title"></member>
+   <member><xref linkend="sql-drop-owned"></member>
+   <member><xref linkend="sql-droprole"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index dc75d6e6b2a2a3a24cee8cd14a8ea8f20deb2b5c..e54253106a7733d421fab82d3fc49aad8ff4b294 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.39 2010/02/07 20:48:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.40 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-REINDEX">
  <refmeta>
-  <refentrytitle id="SQL-REINDEX-TITLE">REINDEX</refentrytitle>
+  <refentrytitle>REINDEX</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 1e98e07842c8c36ca3879847c94af09a3a0c18d5..dcc34fb61a95f9293f17f647b17e7facbe26b6f6 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -5,7 +5,7 @@ PostgreSQL documentation
 
 <refentry id="APP-REINDEXDB">
  <refmeta>
-  <refentrytitle id="APP-REINDEXDB-TITLE"><application>reindexdb</application></refentrytitle>
+  <refentrytitle><application>reindexdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -49,7 +49,7 @@ PostgreSQL documentation
 
   <para>
    <application>reindexdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-REINDEX" endterm="sql-reindex-title">.
+   command <xref linkend="SQL-REINDEX">.
    There is no effective difference between reindexing databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -275,8 +275,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-REINDEX"
-   endterm="sql-reindex-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-REINDEX">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -324,7 +324,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-reindex" endterm="sql-reindex-title"></member>
+   <member><xref linkend="sql-reindex"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/release_savepoint.sgml b/doc/src/sgml/ref/release_savepoint.sgml
index 509862801346ea06ee727ae09eeb071b177347fe..c0f9d51885f56cc7fe799233f77086b864a0bce0 100644
--- a/doc/src/sgml/ref/release_savepoint.sgml
+++ b/doc/src/sgml/ref/release_savepoint.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/release_savepoint.sgml,v 1.8 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/release_savepoint.sgml,v 1.9 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-RELEASE-SAVEPOINT">
  <refmeta>
-  <refentrytitle id="SQL-RELEASE-SAVEPOINT-TITLE">RELEASE SAVEPOINT</refentrytitle>
+  <refentrytitle>RELEASE SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -42,8 +42,8 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
    Destroying a savepoint makes it unavailable as a rollback point,
    but it has no other user visible behavior.  It does not undo the
    effects of commands executed after the savepoint was established.
-   (To do that, see <xref linkend="sql-rollback-to"
-   endterm="sql-rollback-to-title">.)  Destroying a savepoint when
+   (To do that, see <xref linkend="sql-rollback-to">.)
+   Destroying a savepoint when
    it is no longer needed allows the system to reclaim some resources
    earlier than transaction end.
   </para>
@@ -120,11 +120,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
-   <member><xref linkend="sql-rollback-to" endterm="sql-rollback-to-title"></member>
-   <member><xref linkend="sql-savepoint" endterm="sql-savepoint-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-rollback-to"></member>
+   <member><xref linkend="sql-savepoint"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index c864fde180cf0d35422b7bec3a7292b1cdfc81b8..c7900f7113422e370360992e0ec5f4a2c9bb307c 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.37 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.38 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-RESET">
  <refmeta>
-  <refentrytitle id="SQL-RESET-TITLE">RESET</refentrytitle>
+  <refentrytitle>RESET</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -36,7 +36,7 @@ RESET ALL
 <synopsis>
 SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFAULT
 </synopsis>
-   Refer to <xref linkend="sql-set" endterm="sql-set-title"> for
+   Refer to <xref linkend="sql-set"> for
    details.
   </para>
 
@@ -68,7 +68,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
      <para>
       Name of a settable run-time parameter.  Available parameters are
       documented in <xref linkend="runtime-config"> and on the
-      <xref linkend="sql-set" endterm="sql-set-title"> reference page.
+      <xref linkend="sql-set"> reference page.
      </para>
     </listitem>
    </varlistentry>
@@ -107,8 +107,8 @@ RESET timezone;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-SET" endterm="SQL-SET-title"></member>
-   <member><xref linkend="SQL-SHOW" endterm="SQL-SHOW-title"></member>
+   <member><xref linkend="SQL-SET"></member>
+   <member><xref linkend="SQL-SHOW"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index b81cd72d3fc9420608d280d0c15191d9787a214b..af93b90bb2226eaca4c18aee370cd888d9390e0b 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.55 2010/03/17 20:53:19 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.56 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-REVOKE">
  <refmeta>
-  <refentrytitle id="sql-revoke-title">REVOKE</refentrytitle>
+  <refentrytitle>REVOKE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -110,7 +110,7 @@ REVOKE [ ADMIN OPTION FOR ]
   </para>
 
   <para>
-   See the description of the <xref linkend="sql-grant" endterm="sql-grant-title"> command for
+   See the description of the <xref linkend="sql-grant"> command for
    the meaning of the privilege types.
   </para>
 
@@ -166,7 +166,7 @@ REVOKE [ ADMIN OPTION FOR ]
   <para>
    Use <xref linkend="app-psql">'s <command>\dp</command> command to
    display the privileges granted on existing tables and columns.  See <xref
-   linkend="sql-grant" endterm="sql-grant-title"> for information about the
+   linkend="sql-grant"> for information about the
    format.  For non-table objects there are other <command>\d</> commands
    that can display their privileges.
   </para>
@@ -269,7 +269,7 @@ REVOKE admins FROM joe;
   <title>Compatibility</title>
 
    <para>
-    The compatibility notes of the <xref linkend="sql-grant" endterm="sql-grant-title"> command
+    The compatibility notes of the <xref linkend="sql-grant"> command
     apply analogously to <command>REVOKE</command>.
     The keyword <literal>RESTRICT</literal> or <literal>CASCADE</literal>
     is required according to the standard, but <productname>PostgreSQL</>
@@ -281,7 +281,7 @@ REVOKE admins FROM joe;
   <title>See Also</title>
 
   <simpara>
-   <xref linkend="sql-grant" endterm="sql-grant-title">
+   <xref linkend="sql-grant">
   </simpara>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 01dddbf8d02aa9bf305d92af9fde20d21aee0436..721ee6903300c5cc276745825672ef965c804e2b 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/rollback.sgml,v 1.20 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/rollback.sgml,v 1.21 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK">
  <refmeta>
-  <refentrytitle id="SQL-ROLLBACK-TITLE">ROLLBACK</refentrytitle>
+  <refentrytitle>ROLLBACK</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -54,7 +54,7 @@ ROLLBACK [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-COMMIT" endterm="SQL-COMMIT-TITLE"> to
+   Use <xref linkend="SQL-COMMIT"> to
    successfully terminate a transaction.
   </para>
 
@@ -89,9 +89,9 @@ ROLLBACK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback-to" endterm="sql-rollback-to-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback-to"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml
index 4a4a1f4e0ce4774d61dffeef8537ccd39ff6ad72..d6d01d2f0657004a0e5beaa0e08bcfccf4a1b9f6 100644
--- a/doc/src/sgml/ref/rollback_prepared.sgml
+++ b/doc/src/sgml/ref/rollback_prepared.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_prepared.sgml,v 1.4 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_prepared.sgml,v 1.5 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK-PREPARED">
  <refmeta>
-  <refentrytitle id="sql-rollback-prepared-title">ROLLBACK PREPARED</refentrytitle>
+  <refentrytitle>ROLLBACK PREPARED</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -88,8 +88,8 @@ ROLLBACK PREPARED 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-prepare-transaction" endterm="sql-prepare-transaction-title"></member>
-   <member><xref linkend="sql-commit-prepared" endterm="sql-commit-prepared-title"></member>
+   <member><xref linkend="sql-prepare-transaction"></member>
+   <member><xref linkend="sql-commit-prepared"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml
index 414f450a41d8972ec929f85aed4dc533b3444ee9..488378b0c33869cd4612d8f3a70b31e4a3c77bac 100644
--- a/doc/src/sgml/ref/rollback_to.sgml
+++ b/doc/src/sgml/ref/rollback_to.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.11 2009/12/02 21:11:12 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.12 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-ROLLBACK-TO">
  <refmeta>
-  <refentrytitle id="SQL-ROLLBACK-TO-TITLE">ROLLBACK TO SAVEPOINT</refentrytitle>
+  <refentrytitle>ROLLBACK TO SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -65,7 +65,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
 
   <para>
    Use <xref linkend="SQL-RELEASE-SAVEPOINT"
-   endterm="SQL-RELEASE-SAVEPOINT-TITLE"> to destroy a savepoint without
+  > to destroy a savepoint without
    discarding the effects of commands executed after it was established.
   </para>
 
@@ -149,11 +149,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-release-savepoint" endterm="sql-release-savepoint-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
-   <member><xref linkend="sql-savepoint" endterm="sql-savepoint-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-release-savepoint"></member>
+   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-savepoint"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/savepoint.sgml b/doc/src/sgml/ref/savepoint.sgml
index d465463f7c98ea3e83aec14c4598a3a3438a566a..72b718fcf65cc816b4d1fd810e2f49d2e8da9b20 100644
--- a/doc/src/sgml/ref/savepoint.sgml
+++ b/doc/src/sgml/ref/savepoint.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/savepoint.sgml,v 1.6 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/savepoint.sgml,v 1.7 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SAVEPOINT">
  <refmeta>
-  <refentrytitle id="SQL-SAVEPOINT-TITLE">SAVEPOINT</refentrytitle>
+  <refentrytitle>SAVEPOINT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -64,9 +64,9 @@ SAVEPOINT <replaceable>savepoint_name</replaceable>
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK-TO" endterm="SQL-ROLLBACK-TO-TITLE"> to
-   rollback to a savepoint.  Use <xref linkend="SQL-RELEASE-SAVEPOINT"
-   endterm="SQL-RELEASE-SAVEPOINT-TITLE"> to destroy a savepoint, keeping
+   Use <xref linkend="SQL-ROLLBACK-TO"> to
+   rollback to a savepoint.  Use <xref linkend="SQL-RELEASE-SAVEPOINT">
+   to destroy a savepoint, keeping
    the effects of commands executed after it was established.
   </para>
 
@@ -126,11 +126,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-release-savepoint" endterm="sql-release-savepoint-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
-   <member><xref linkend="sql-rollback-to" endterm="sql-rollback-to-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-release-savepoint"></member>
+   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-rollback-to"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 395ca79604cef30abd63feb89cbeb517c0f938c2..372116be3fc822c43d388ee3a7cde706c27caf5e 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.129 2010/02/12 17:33:19 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.130 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SELECT">
  <refmeta>
-  <refentrytitle id="sql-select-title">SELECT</refentrytitle>
+  <refentrytitle>SELECT</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -305,7 +305,7 @@ TABLE { [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] |
         sub-<command>SELECT</command> must be surrounded by
         parentheses, and an alias <emphasis>must</emphasis> be
         provided for it.  A
-        <xref linkend="sql-values" endterm="sql-values-title"> command
+        <xref linkend="sql-values"> command
         can also be used here.
        </para>
       </listitem>
@@ -1154,7 +1154,7 @@ FOR SHARE [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ]
     to the row-level lock(s) &mdash; the required <literal>ROW SHARE</literal>
     table-level lock is still taken in the ordinary way (see
     <xref linkend="mvcc">).  You can use
-    <xref linkend="sql-lock" endterm="sql-lock-title">
+    <xref linkend="sql-lock">
     with the <literal>NOWAIT</> option first,
     if you need to acquire the table-level lock without waiting.
    </para>
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index 057bfb2a9d75abdf08812f988fed9bbef41d8104..fc726c66843658774a4ac6f2d736f61a7ac87c9a 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select_into.sgml,v 1.44 2008/12/28 18:53:54 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select_into.sgml,v 1.45 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SELECTINTO">
  <refmeta>
-  <refentrytitle id="SQL-SELECTINTO-TITLE">SELECT INTO</refentrytitle>
+  <refentrytitle>SELECT INTO</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -60,8 +60,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
    <listitem>
     <para>
      If specified, the table is created as a temporary table.  Refer
-     to <xref linkend="sql-createtable"
-     endterm="sql-createtable-title"> for details.
+     to <xref linkend="sql-createtable"> for details.
     </para>
    </listitem>
   </varlistentry>
@@ -78,7 +77,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
 
   <para>
    All other parameters are described in detail under <xref
-   linkend="sql-select" endterm="sql-select-title">.
+   linkend="sql-select">.
   </para>
  </refsect1>
 
@@ -86,8 +85,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
   <title>Notes</title>
 
   <para>
-   <xref linkend="sql-createtableas"
-   endterm="sql-createtableas-title"> is functionally similar to
+   <xref linkend="sql-createtableas"> is functionally similar to
    <command>SELECT INTO</command>.  <command>CREATE TABLE AS</command>
    is the recommended syntax, since this form of <command>SELECT
    INTO</command> is not available in <application>ECPG</application>
@@ -141,7 +139,7 @@ SELECT * INTO films_recent FROM films WHERE date_prod &gt;= '2002-01-01';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtableas" endterm="sql-createtableas-title"></member>
+   <member><xref linkend="sql-createtableas"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 621bd641396ebe069e3d629c7287c8687ea7abcf..7c60d7ae5d284f9eb2975bd99c479358fa3b14f1 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/set.sgml,v 1.94 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/set.sgml,v 1.95 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SET">
  <refmeta>
-  <refentrytitle id="SQL-SET-TITLE">SET</refentrytitle>
+  <refentrytitle>SET</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -67,7 +67,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
   <para>
    If <command>SET LOCAL</command> is used within a function that has a
    <literal>SET</> option for the same variable (see
-   <xref linkend="sql-createfunction" endterm="sql-createfunction-title">),
+   <xref linkend="sql-createfunction">),
    the effects of the <command>SET LOCAL</command> command disappear at
    function exit; that is, the value in effect when the function was called is
    restored anyway.  This allows <command>SET LOCAL</command> to be used for
@@ -322,8 +322,8 @@ SET TIME ZONE 'Europe/Rome';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-RESET" endterm="SQL-RESET-title"></member>
-   <member><xref linkend="SQL-SHOW" endterm="SQL-SHOW-title"></member>
+   <member><xref linkend="SQL-RESET"></member>
+   <member><xref linkend="SQL-SHOW"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml
index 94c2ecabc72e9a6c59c6b43bba84ae64bf9d8d3d..ffadfd74757cb207279b241bcfb3a8ac7397a731 100644
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_constraints.sgml,v 1.18 2010/01/18 00:32:21 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_constraints.sgml,v 1.19 2010/04/03 07:23:02 petere Exp $ -->
 <refentry id="SQL-SET-CONSTRAINTS">
  <refmeta>
-  <refentrytitle id="SQL-SET-CONSTRAINTS-title">SET CONSTRAINTS</refentrytitle>
+  <refentrytitle>SET CONSTRAINTS</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml
index 1079de91130b711f436af86837ce0c55c3fa63a6..c7a4b0d68e96625f3ae011a43928de15158bc863 100644
--- a/doc/src/sgml/ref/set_role.sgml
+++ b/doc/src/sgml/ref/set_role.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.8 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.9 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SET-ROLE">
  <refmeta>
-  <refentrytitle id="sql-set-role-title">SET ROLE</refentrytitle>
+  <refentrytitle>SET ROLE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -48,7 +48,7 @@ RESET ROLE
 
   <para>
    The <literal>SESSION</> and <literal>LOCAL</> modifiers act the same
-   as for the regular <xref linkend="SQL-SET" endterm="SQL-SET-title">
+   as for the regular <xref linkend="SQL-SET">
    command.
   </para>
 
@@ -82,8 +82,7 @@ RESET ROLE
 
   <para>
    <command>SET ROLE</> has effects comparable to
-   <xref linkend="sql-set-session-authorization"
-   endterm="sql-set-session-authorization-title">, but the privilege
+   <xref linkend="sql-set-session-authorization">, but the privilege
    checks involved are quite different.  Also,
    <command>SET SESSION AUTHORIZATION</> determines which roles are
    allowable for later <command>SET ROLE</> commands, whereas changing
@@ -93,8 +92,7 @@ RESET ROLE
 
   <para>
    <command>SET ROLE</> does not process session variables as specified by
-   the role's <xref linkend="sql-alterrole"
-   endterm="sql-alterrole-title"> settings;  this only happens during
+   the role's <xref linkend="sql-alterrole"> settings;  this only happens during
    login.
   </para>
 
@@ -144,7 +142,7 @@ SELECT SESSION_USER, CURRENT_USER;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-session-authorization" endterm="sql-set-session-authorization-title"></member>
+   <member><xref linkend="sql-set-session-authorization"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml
index 736baf90117f22108ec248d339424ceaade1360f..35d93c23e6ec595d56f1973785d1ae492513a394 100644
--- a/doc/src/sgml/ref/set_session_auth.sgml
+++ b/doc/src/sgml/ref/set_session_auth.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.19 2009/09/19 10:23:27 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.20 2010/04/03 07:23:02 petere Exp $ -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
  <refmeta>
-  <refentrytitle id="sql-set-session-authorization-title">SET SESSION AUTHORIZATION</refentrytitle>
+  <refentrytitle>SET SESSION AUTHORIZATION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -41,7 +41,7 @@ RESET SESSION AUTHORIZATION
    identifier is normally equal to the session user identifier, but
    might change temporarily in the context of <literal>SECURITY DEFINER</>
    functions and similar mechanisms; it can also be changed by
-   <xref linkend="sql-set-role" endterm="sql-set-role-title">.
+   <xref linkend="sql-set-role">.
    The current user identifier is relevant for permission checking.
   </para>
 
@@ -54,7 +54,7 @@ RESET SESSION AUTHORIZATION
 
   <para>
    The <literal>SESSION</> and <literal>LOCAL</> modifiers act the same
-   as for the regular <xref linkend="SQL-SET" endterm="SQL-SET-title">
+   as for the regular <xref linkend="SQL-SET">
    command.
   </para>
 
@@ -120,7 +120,7 @@ SELECT SESSION_USER, CURRENT_USER;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-role" endterm="sql-set-role-title"></member>
+   <member><xref linkend="sql-set-role"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index 80cf691182ff652a60f37910a140a758747070ad..ecf24eac63d5c52fc2353566f3078c2fae095931 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.27 2009/09/18 05:00:42 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.28 2010/04/03 07:23:02 petere Exp $ -->
 <refentry id="SQL-SET-TRANSACTION">
  <refmeta>
-  <refentrytitle id="SQL-SET-TRANSACTION-TITLE">SET TRANSACTION</refentrytitle>
+  <refentrytitle>SET TRANSACTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index a949c43b7e4ce3c3cd5c8d22886e0cf9773d28c0..5684916d490d16b834e28b44da06a1a82d420ac7 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.48 2009/10/21 20:22:38 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.49 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-SHOW">
  <refmeta>
-  <refentrytitle id="SQL-SHOW-TITLE">SHOW</refentrytitle>
+  <refentrytitle>SHOW</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -52,7 +52,7 @@ SHOW ALL
      <para>
       The name of a run-time parameter.  Available parameters are
       documented in <xref linkend="runtime-config"> and on the <xref
-      linkend="SQL-SET" endterm="SQL-SET-title"> reference page.  In
+      linkend="SQL-SET"> reference page.  In
       addition, there are a few parameters that can be shown but not
       set:
 
@@ -194,8 +194,8 @@ SHOW ALL;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-SET" endterm="SQL-SET-title"></member>
-   <member><xref linkend="SQL-RESET" endterm="SQL-RESET-title"></member>
+   <member><xref linkend="SQL-SET"></member>
+   <member><xref linkend="SQL-RESET"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml
index 15ba39af919c16232f3ceeff4d6142f8f6fc9f41..c87a1c0b6a892297a3861e8399d7e929bbb0199f 100644
--- a/doc/src/sgml/ref/start_transaction.sgml
+++ b/doc/src/sgml/ref/start_transaction.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/start_transaction.sgml,v 1.18 2009/09/18 05:00:42 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/start_transaction.sgml,v 1.19 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-START-TRANSACTION">
  <refmeta>
-  <refentrytitle id="SQL-START-TRANSACTION-TITLE">START TRANSACTION</refentrytitle>
+  <refentrytitle>START TRANSACTION</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -36,9 +36,8 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <para>
    This command begins a new transaction block. If the isolation level or
    read/write mode is specified, the new transaction has those
-   characteristics, as if <xref linkend="sql-set-transaction"
-   endterm="sql-set-transaction-title"> was executed. This is the same
-   as the <xref linkend="sql-begin" endterm="sql-begin-title"> command.
+   characteristics, as if <xref linkend="sql-set-transaction"> was executed. This is the same
+   as the <xref linkend="sql-begin"> command.
   </para>
  </refsect1>
 
@@ -46,8 +45,7 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <title>Parameters</title>
 
   <para>
-   Refer to <xref linkend="sql-set-transaction"
-   endterm="sql-set-transaction-title"> for information on the meaning
+   Refer to <xref linkend="sql-set-transaction"> for information on the meaning
    of the parameters to this statement.
   </para>
  </refsect1>
@@ -74,8 +72,7 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   </para>
 
   <para>
-   See also the compatibility section of <xref linkend="sql-set-transaction"
-   endterm="sql-set-transaction-title">.
+   See also the compatibility section of <xref linkend="sql-set-transaction">.
   </para>
  </refsect1>
 
@@ -83,11 +80,11 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
-   <member><xref linkend="sql-commit" endterm="sql-commit-title"></member>
-   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
-   <member><xref linkend="sql-savepoint" endterm="sql-savepoint-title"></member>
-   <member><xref linkend="sql-set-transaction" endterm="sql-set-transaction-title"></member>
+   <member><xref linkend="sql-begin"></member>
+   <member><xref linkend="sql-commit"></member>
+   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-savepoint"></member>
+   <member><xref linkend="sql-set-transaction"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index bec47fdbab06cf8fe1eac53d9342b42fed6b3591..08dc670843aaaf21688fabc6baf7801af0cced21 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/truncate.sgml,v 1.33 2009/04/26 02:56:52 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/truncate.sgml,v 1.34 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-TRUNCATE">
  <refmeta>
-  <refentrytitle id="SQL-TRUNCATE-TITLE">TRUNCATE</refentrytitle>
+  <refentrytitle>TRUNCATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml
index 9e22ea4edc4050c9f083bbe69bd23fe204fba5f8..774858063a1cd3091cb64f2068154ee26b6b5a31 100644
--- a/doc/src/sgml/ref/unlisten.sgml
+++ b/doc/src/sgml/ref/unlisten.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.31 2010/02/16 22:34:43 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.32 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-UNLISTEN">
  <refmeta>
-  <refentrytitle id="SQL-UNLISTEN-TITLE">UNLISTEN</refentrytitle>
+  <refentrytitle>UNLISTEN</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -40,7 +40,7 @@ UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * }
   </para>
 
   <para>
-   <xref endterm="sql-notify-title" linkend="sql-notify">
+   <xref linkend="sql-notify">
    contains a more extensive
    discussion of the use of <command>LISTEN</command> and
    <command>NOTIFY</command>.
@@ -127,8 +127,8 @@ NOTIFY virtual;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-listen" endterm="sql-listen-title"></member>
-   <member><xref linkend="sql-notify" endterm="sql-notify-title"></member>
+   <member><xref linkend="sql-listen"></member>
+   <member><xref linkend="sql-notify"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 4ed6458f654f018f69fe01a2139354e697aefa1f..8673df18ff4d3cb10d3945b817f3ef63165366e5 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.50 2009/09/19 10:23:27 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.51 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-UPDATE">
  <refmeta>
-  <refentrytitle id="SQL-UPDATE-TITLE">UPDATE</refentrytitle>
+  <refentrytitle>UPDATE</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -172,7 +172,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep
       query on the <command>UPDATE</>'s target table.
       Note that <literal>WHERE CURRENT OF</> cannot be
       specified together with a Boolean condition.  See
-      <xref linkend="sql-declare" endterm="sql-declare-title">
+      <xref linkend="sql-declare">
       for more information about using cursors with
       <literal>WHERE CURRENT OF</>.
      </para>
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index bd2b6726c445e73da8590eaa4f748be66651dc99..aece3e02d1c913f5a1379658c16ed28d79733fdd 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.59 2010/02/17 04:19:39 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.60 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-VACUUM">
  <refmeta>
-  <refentrytitle id="sql-vacuum-title">VACUUM</refentrytitle>
+  <refentrytitle>VACUUM</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -49,7 +49,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
    <command>VACUUM ANALYZE</command> performs a <command>VACUUM</command>
    and then an <command>ANALYZE</command> for each selected table.  This
    is a handy combination form for routine maintenance scripts.  See
-   <xref linkend="sql-analyze" endterm="sql-analyze-title">
+   <xref linkend="sql-analyze">
    for more details about its processing.
   </para>
 
@@ -271,9 +271,9 @@ VACUUM
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-vacuumdb" endterm="app-vacuumdb-title"></member>
-   <member><xref linkend="runtime-config-resource-vacuum-cost" endterm="runtime-config-resource-vacuum-cost-title"></member>
-   <member><xref linkend="autovacuum" endterm="autovacuum-title"></member>
+   <member><xref linkend="app-vacuumdb"></member>
+   <member><xref linkend="runtime-config-resource-vacuum-cost"></member>
+   <member><xref linkend="autovacuum"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 3644eb97fa9608ad309dc4e5b08b473cdb3063d3..c6f576772e51ac9ecb05728f82ad9e988ef1e033 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.53 2010/03/22 14:56:09 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.54 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="APP-VACUUMDB">
  <refmeta>
-  <refentrytitle id="APP-VACUUMDB-TITLE"><application>vacuumdb</application></refentrytitle>
+  <refentrytitle><application>vacuumdb</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -56,7 +56,7 @@ PostgreSQL documentation
 
   <para>
    <application>vacuumdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-VACUUM" endterm="SQL-VACUUM-title">.
+   command <xref linkend="SQL-VACUUM">.
    There is no effective difference between vacuuming and analyzing
    databases via this utility and via other methods for accessing the
    server.
@@ -318,8 +318,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-VACUUM"
-   endterm="sql-vacuum-title"> and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="SQL-VACUUM">
+   and <xref linkend="APP-PSQL"> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -376,7 +376,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-vacuum" endterm="sql-vacuum-title"></member>
+   <member><xref linkend="sql-vacuum"></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml
index 3a70f1bfe4b1fd593dd442c03b55bad7823bf3fc..d6d2c0cf607c6f6e7537619fb36aa075116e95bd 100644
--- a/doc/src/sgml/ref/values.sgml
+++ b/doc/src/sgml/ref/values.sgml
@@ -1,11 +1,11 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/values.sgml,v 1.6 2008/11/14 10:22:47 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/values.sgml,v 1.7 2010/04/03 07:23:02 petere Exp $
 PostgreSQL documentation
 -->
 
 <refentry id="SQL-VALUES">
  <refmeta>
-  <refentrytitle id="SQL-VALUES-TITLE">VALUES</refentrytitle>
+  <refentrytitle>VALUES</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
@@ -234,7 +234,7 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
    <command>VALUES</command> conforms to the SQL standard.
    <literal>LIMIT</literal> and <literal>OFFSET</literal> are
    <productname>PostgreSQL</productname> extensions; see also
-   under <xref linkend="sql-select" endterm="sql-select-title">.
+   under <xref linkend="sql-select">.
   </para>
  </refsect1>
 
@@ -242,8 +242,8 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-insert" endterm="sql-insert-title"></member>
-   <member><xref linkend="sql-select" endterm="sql-select-title"></member>
+   <member><xref linkend="sql-insert"></member>
+   <member><xref linkend="sql-select"></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index 1668a0615eb610295e03898ad9e5aaf1735df52f..c5c1e14f1e37d972d85eb6efc195dc720de22de5 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.65 2010/02/03 17:25:06 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.66 2010/04/03 07:22:55 petere Exp $ -->
 
  <chapter id="regress">
-  <title id="regress-title">Regression Tests</title>
+  <title>Regression Tests</title>
 
   <indexterm zone="regress">
    <primary>regression tests</primary>
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index ebc592e96229eff10617752ecc83d9ffc1a72f5d..70d9822450fdaf01268231fad3119380a52611c9 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release-9.0.sgml,v 2.13 2010/04/01 00:32:53 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release-9.0.sgml,v 2.14 2010/04/03 07:22:55 petere Exp $ -->
 
 
  <sect1 id="release-9-0">
@@ -539,7 +539,7 @@
           <listitem>
             <para>
               Allow setting of configuration variables based on <link
-              linkend="sql-alterrole-title">database/role</link>
+              linkend="sql-alterrole">database/role</link>
               combinations (Alvaro Herrera)
             </para>
 
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 8d40c60c8e7526473cff6e3f6fa5636a25e08fad..dd50665e10bbd52bc8f9b75ffee7e4a59b714d89 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.66 2009/11/04 22:26:04 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.67 2010/04/03 07:22:55 petere Exp $ -->
 
 <chapter id="spi">
  <title>Server Programming Interface</title>
@@ -2341,7 +2341,7 @@ void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirectio
   <title>Notes</title>
 
   <para>
-   See the SQL <xref linkend="sql-fetch" endterm="sql-fetch-title"> command
+   See the SQL <xref linkend="sql-fetch"> command
    for details of the interpretation of the
    <parameter>direction</parameter> and
    <parameter>count</parameter> parameters.
@@ -2442,7 +2442,7 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
   <title>Notes</title>
 
   <para>
-   See the SQL <xref linkend="sql-fetch" endterm="sql-fetch-title"> command
+   See the SQL <xref linkend="sql-fetch"> command
    for details of the interpretation of the
    <parameter>direction</parameter> and
    <parameter>count</parameter> parameters.
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 83ecb8653c6bd12dadb26756caa6da0d4e70f7f7..7259a47bbf5abc76453bd2e2450b9de12686619c 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.142 2010/02/12 17:33:19 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.143 2010/04/03 07:22:56 petere Exp $ -->
 
 <chapter id="sql-syntax">
  <title>SQL Syntax</title>
@@ -1698,7 +1698,7 @@ UNBOUNDED FOLLOWING
     window must lack these clauses, if they are supplied here).
     This latter syntax follows the same rules as modifying an existing
     window name within the <literal>WINDOW</literal> clause; see the
-    <xref linkend="sql-select" endterm="sql-select-title"> reference
+    <xref linkend="sql-select"> reference
     page for details.
    </para>
 
@@ -1840,7 +1840,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
      syntax</> is nothing more than a direct invocation of the underlying
      conversion function.  Obviously, this is not something that a portable
      application should rely on.  For further details see
-     <xref linkend="sql-createcast" endterm="sql-createcast-title">.
+     <xref linkend="sql-createcast">.
     </para>
    </note>
   </sect2>
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index ab601e3ce36f2c4656b0065c21dc1e7ad918b2dd..fd4dd1d14527b8e1700c8932afee6cca2f580c1e 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/textsearch.sgml,v 1.55 2010/03/17 17:12:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/textsearch.sgml,v 1.56 2010/04/03 07:22:56 petere Exp $ -->
 
 <chapter id="textsearch">
- <title id="textsearch-title">Full Text Search</title>
+ <title>Full Text Search</title>
 
   <indexterm zone="textsearch">
    <primary>full text search</primary>
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index 5418f314a31ca26e47d3854b5ac10af1df2f3884..a40963fd5b26f64a320a639898162e671a1b2f88 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.62 2010/01/17 22:56:21 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.63 2010/04/03 07:22:56 petere Exp $ -->
 
  <chapter id="triggers">
   <title>Triggers</title>
@@ -57,7 +57,7 @@
    <para>
     Once a suitable trigger function has been created, the trigger is
     established with
-    <xref linkend="sql-createtrigger" endterm="sql-createtrigger-title">.
+    <xref linkend="sql-createtrigger">.
     The same trigger function can be used for multiple triggers.
    </para>
 
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index a1b04ce417f03008fe6dedbf6bc0e5b2d99506c4..fffd2aa9858946c8ba0cfece9607bad22c0090e9 100644
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.60 2009/06/17 21:58:49 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.61 2010/04/03 07:22:56 petere Exp $ -->
 
 <chapter Id="typeconv">
 <title>Type Conversion</title>
@@ -139,7 +139,7 @@ and for the <function>GREATEST</> and <function>LEAST</> functions.
 The system catalogs store information about which conversions, or
 <firstterm>casts</firstterm>, exist between which data types, and how to
 perform those conversions.  Additional casts can be added by the user
-with the <xref linkend="sql-createcast" endterm="sql-createcast-title">
+with the <xref linkend="sql-createcast">
 command.  (This is usually
 done in conjunction with defining new data types.  The set of casts
 between built-in types has been carefully crafted and is best not
@@ -543,7 +543,7 @@ the function call is treated as a form of <literal>CAST</> specification.
     in cases where there is not an actual cast function.  If there is a cast
     function, it is conventionally named after its output type, and so there
     is no need to have a special case.  See
-    <xref linkend="sql-createcast" endterm="sql-createcast-title">
+    <xref linkend="sql-createcast">
     for additional commentary.
    </para>
   </footnote>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 01c1ba94808ff0c78353d29f282161dbd1aee804..16130b6191c59d51a5a2016fedb850712b871471 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.42 2010/02/03 17:25:06 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.43 2010/04/03 07:22:56 petere Exp $ -->
 
 <chapter id="user-manag">
  <title>Database Roles and Privileges</title>
@@ -53,7 +53,7 @@
    maintain a correspondence, but this is not required. Database roles
    are global across a database cluster installation (and not
    per individual database). To create a role use the <xref
-   linkend="sql-createrole" endterm="sql-createrole-title"> SQL command:
+   linkend="sql-createrole"> SQL command:
 <synopsis>
 CREATE ROLE <replaceable>name</replaceable>;
 </synopsis>
@@ -62,7 +62,7 @@ CREATE ROLE <replaceable>name</replaceable>;
    double-quoted.  (In practice, you will usually want to add additional
    options, such as <literal>LOGIN</>, to the command.  More details appear
    below.)  To remove an existing role, use the analogous
-   <xref linkend="sql-droprole" endterm="sql-droprole-title"> command:
+   <xref linkend="sql-droprole"> command:
 <synopsis>
 DROP ROLE <replaceable>name</replaceable>;
 </synopsis>
@@ -228,8 +228,8 @@ CREATE USER <replaceable>name</replaceable>;
     A role's attributes can be modified after creation with
     <command>ALTER ROLE</command>.<indexterm><primary>ALTER ROLE</></>
     See the reference pages for the <xref linkend="sql-createrole"
-    endterm="sql-createrole-title"> and <xref linkend="sql-alterrole"
-    endterm="sql-alterrole-title"> commands for details.
+   > and <xref linkend="sql-alterrole"
+   > commands for details.
    </para>
 
   <tip>
@@ -297,7 +297,7 @@ ALTER ROLE myname SET statement_timeout = '5min';
    <literal>EXECUTE</>, and <literal>USAGE</>.
    For more information on the different types of privileges supported by
    <productname>PostgreSQL</productname>, see the
-   <xref linkend="sql-grant" endterm="sql-grant-title"> reference page.
+   <xref linkend="sql-grant"> reference page.
   </para>
 
   <para>
@@ -316,7 +316,7 @@ GRANT UPDATE ON accounts TO joe;
 
   <para>
    To revoke a privilege, use the fittingly named
-   <xref linkend="sql-revoke" endterm="sql-revoke-title"> command:
+   <xref linkend="sql-revoke"> command:
 <programlisting>
 REVOKE ALL ON accounts FROM PUBLIC;
 </programlisting>
@@ -366,8 +366,8 @@ CREATE ROLE <replaceable>name</replaceable>;
 
   <para>
    Once the group role exists, you can add and remove members using the
-   <xref linkend="sql-grant" endterm="sql-grant-title"> and
-   <xref linkend="sql-revoke" endterm="sql-revoke-title"> commands:
+   <xref linkend="sql-grant"> and
+   <xref linkend="sql-revoke"> commands:
 <synopsis>
 GRANT <replaceable>group_role</replaceable> TO <replaceable>role1</replaceable>, ... ;
 REVOKE <replaceable>group_role</replaceable> FROM <replaceable>role1</replaceable>, ... ;
@@ -382,7 +382,7 @@ REVOKE <replaceable>group_role</replaceable> FROM <replaceable>role1</replaceabl
   <para>
    The members of a group role can use the privileges of the role in two
    ways.  First, every member of a group can explicitly do
-   <xref linkend="sql-set-role" endterm="sql-set-role-title"> to
+   <xref linkend="sql-set-role"> to
    temporarily <quote>become</> the group role.  In this state, the
    database session has access to the privileges of the group role rather
    than the original login role, and any database objects created are
@@ -466,7 +466,7 @@ RESET ROLE;
 
   <para>
    To destroy a group role, use <xref
-   linkend="sql-droprole" endterm="sql-droprole-title">:
+   linkend="sql-droprole">:
 <synopsis>
 DROP ROLE <replaceable>name</replaceable>;
 </synopsis>
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 1c34957a166f659bcb2e875585c6a96941a5fc37..b78a336c19cce9b5b76e89bb6adb4425281ee31a 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xaggr.sgml,v 1.39 2010/02/08 20:39:51 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xaggr.sgml,v 1.40 2010/04/03 07:22:56 petere Exp $ -->
 
  <sect1 id="xaggr">
   <title>User-Defined Aggregates</title>
@@ -184,7 +184,7 @@ SELECT attrelid::regclass, array_accum(atttypid::regtype)
 
   <para>
    For further details see the
-   <xref linkend="sql-createaggregate" endterm="sql-createaggregate-title">
+   <xref linkend="sql-createaggregate">
    command.
   </para>
  </sect1>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 93f880cc63ee7cfd538cb1f48126802658884626..fcf9e3b1d4976f1bc821c5018f327145db3c6c29 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.144 2010/01/04 16:34:11 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.145 2010/04/03 07:22:56 petere Exp $ -->
 
  <sect1 id="xfunc">
   <title>User-Defined Functions</title>
@@ -63,8 +63,7 @@
 
   <para>
    Throughout this chapter, it can be useful to look at the reference
-   page of the <xref linkend="sql-createfunction"
-   endterm="sql-createfunction-title"> command to
+   page of the <xref linkend="sql-createfunction"> command to
    understand the examples better.  Some examples from this chapter
    can be found in <filename>funcs.sql</filename> and
    <filename>funcs.c</filename> in the <filename>src/tutorial</>
@@ -1179,7 +1178,7 @@ CREATE FUNCTION test(int, int) RETURNS int
     Every function has a <firstterm>volatility</> classification, with
     the possibilities being <literal>VOLATILE</>, <literal>STABLE</>, or
     <literal>IMMUTABLE</>.  <literal>VOLATILE</> is the default if the
-    <xref linkend="sql-createfunction" endterm="sql-createfunction-title">
+    <xref linkend="sql-createfunction">
     command does not specify a category.  The volatility category is a
     promise to the optimizer about the behavior of the function:
 
diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml
index 59d3050ee6a2e493bc0295cd5497ca77f3389fbf..87de1971bc48076319748648f91cbe06966ba801 100644
--- a/doc/src/sgml/xplang.sgml
+++ b/doc/src/sgml/xplang.sgml
@@ -1,7 +1,7 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xplang.sgml,v 1.36 2009/12/19 01:49:02 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xplang.sgml,v 1.37 2010/04/03 07:22:56 petere Exp $ -->
 
  <chapter id="xplang">
-  <title id="xplang-title">Procedural Languages</title>
+  <title>Procedural Languages</title>
 
   <indexterm zone="xplang">
    <primary>procedural language</primary>
@@ -113,7 +113,7 @@ CREATE FUNCTION <replaceable>handler_function_name</replaceable>()
      <para>
       Optionally, the language handler can provide an <quote>inline</>
       handler function that executes anonymous code blocks
-      (<xref linkend="sql-do" endterm="sql-do-title"> commands)
+      (<xref linkend="sql-do"> commands)
       written in this language.  If an inline handler function
       is provided by the language, declare it with a command like
 <synopsis>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index 14eb83a8e13abea91d7e19b2e8fe66e7b8989e5c..af4c57e6affb6dedffc1f45487482113f2e41b2c 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xtypes.sgml,v 1.31 2008/12/07 23:46:39 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xtypes.sgml,v 1.32 2010/04/03 07:22:56 petere Exp $ -->
 
  <sect1 id="xtypes">
   <title>User-Defined Types</title>
@@ -290,6 +290,6 @@ CREATE TYPE complex (
 
  <para>
   For further details see the description of the
-  <xref linkend="sql-createtype" endterm="sql-createtype-title"> command.
+  <xref linkend="sql-createtype"> command.
  </para>
 </sect1>