diff --git a/doc/src/sgml/release-10.sgml b/doc/src/sgml/release-10.sgml
index 64c141256aebf6003a571de8e5dd948e5ae73e36..6c07157d2948ec30fb6ee2968252d83eabdde482 100644
--- a/doc/src/sgml/release-10.sgml
+++ b/doc/src/sgml/release-10.sgml
@@ -1,6 +1,642 @@
 <!-- doc/src/sgml/release-10.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-10-1">
+  <title>Release 10.1</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 10.0.
+   For information about new features in major release 10, see
+   <xref linkend="release-10">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 10.1</title>
+
+   <para>
+    A dump/restore is not required for those running 10.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the first changelog entry below.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [ec42a1dcb] 2017-11-03 17:23:13 +0100
+Branch: REL_10_STABLE [37a856567] 2017-11-03 17:23:13 +0100
+Branch: REL9_6_STABLE [bd8e2b3cf] 2017-11-03 17:23:13 +0100
+Branch: REL9_5_STABLE [cf0612aa2] 2017-11-03 17:23:13 +0100
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [1b890562b] 2017-11-03 20:45:36 +0100
+Branch: REL_10_STABLE [b17870d75] 2017-11-03 20:47:44 +0100
+-->
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [62a16572d] 2017-11-02 12:54:55 -0400
+Branch: REL_10_STABLE [97ba7b8c8] 2017-11-02 12:54:22 -0400
+Branch: REL9_6_STABLE [a43cd427e] 2017-11-02 12:54:23 -0400
+Branch: REL9_5_STABLE [43276abc6] 2017-11-02 12:54:23 -0400
+-->
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [a9fce6672] 2017-11-03 12:27:59 -0400
+Branch: REL_10_STABLE [a14b52c61] 2017-11-03 12:28:08 -0400
+-->
+     <para>
+      Prevent logical replication from setting non-replicated columns to
+      nulls when replicating an <command>UPDATE</command> (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [360fd1a7b] 2017-10-12 10:26:55 -0400
+Branch: REL_10_STABLE [7cde649ab] 2017-10-12 10:26:54 -0400
+-->
+     <para>
+      Fix logical replication to fire <literal>BEFORE ROW DELETE</literal>
+      triggers when expected (Masahiko Sawada)
+     </para>
+
+     <para>
+      Previously, that failed to happen unless the table also had
+      a <literal>BEFORE ROW UPDATE</literal> trigger.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1518d0784] 2017-10-06 19:18:58 -0400
+Branch: REL_10_STABLE [485d49dbc] 2017-10-06 19:18:58 -0400
+Branch: REL9_6_STABLE [185279da3] 2017-10-06 19:18:58 -0400
+Branch: REL9_5_STABLE [13d2ed921] 2017-10-06 19:18:59 -0400
+Branch: REL9_4_STABLE [bfb69b1e5] 2017-10-06 19:18:59 -0400
+-->
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7421f4b89] 2017-10-16 17:56:54 -0400
+Branch: REL_10_STABLE [799037099] 2017-10-16 17:56:43 -0400
+-->
+     <para>
+      Ignore CTEs when looking up the target table for
+      <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>,
+      and prevent matching schema-qualified target table names to trigger
+      transition table names (Thomas Munro)
+     </para>
+
+     <para>
+      This restores the pre-v10 behavior for CTEs attached to DML commands.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c3dfe0fec] 2017-10-16 15:24:36 -0400
+Branch: REL_10_STABLE [72e9cc971] 2017-10-16 15:24:36 -0400
+-->
+     <para>
+      Avoid evaluating an aggregate function's argument expression(s) at rows
+      where its <literal>FILTER</literal> test fails (Tom Lane)
+     </para>
+
+     <para>
+      This restores the pre-v10 (and SQL-standard) behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [08f1e1f0a] 2017-10-26 12:17:40 -0400
+Branch: REL_10_STABLE [6a81ba1d4] 2017-10-26 12:17:40 -0400
+Branch: REL9_6_STABLE [37b4e0fe9] 2017-10-26 12:17:40 -0400
+-->
+     <para>
+      Fix incorrect query results when multiple <literal>GROUPING
+      SETS</literal> columns contain the same simple variable (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a1c2c430d] 2017-10-06 14:28:42 -0400
+Branch: REL_10_STABLE [0c25e9652] 2017-10-06 14:28:42 -0400
+-->
+     <para>
+      Fix query-lifespan memory leakage while evaluating a set-returning
+      function in a <command>SELECT</command>'s target list (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [682ce911f] 2017-10-27 22:22:39 +0200
+Branch: REL_10_STABLE [a87c0c763] 2017-10-29 20:48:51 +0530
+-->
+     <para>
+      Allow parallel execution of prepared statements with generic plans
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [639c1a6bb] 2017-10-27 16:04:01 +0200
+Branch: REL_10_STABLE [965a16fa9] 2017-10-27 16:04:10 +0200
+Branch: REL9_6_STABLE [036b6bd50] 2017-10-27 16:12:16 +0200
+-->
+     <para>
+      Fix incorrect parallelization decisions for nested queries
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [846fcc851] 2017-10-29 12:58:40 +0530
+Branch: REL_10_STABLE [69125c883] 2017-10-29 13:04:37 +0530
+Branch: REL9_6_STABLE [f74f871b8] 2017-10-29 13:14:37 +0530
+-->
+     <para>
+      Fix parallel query handling to not fail when a recently-used role is
+      dropped (Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [6393613b6] 2017-10-13 15:02:45 -0400
+Branch: REL_10_STABLE [a3b1c2218] 2017-10-13 15:05:14 -0400
+-->
+     <para>
+      Fix crash in parallel execution of a bitmap scan having a BitmapAnd
+      plan node below a BitmapOr node (Dilip Kumar)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [f3c6e8a27] 2017-10-25 07:13:11 -0400
+Branch: REL_10_STABLE [fb17082d7] 2017-10-25 07:14:21 -0400
+Branch: REL9_6_STABLE [5c3a1bbb4] 2017-10-25 07:19:59 -0400
+Branch: REL9_5_STABLE [5c8dcd322] 2017-10-25 07:20:37 -0400
+Branch: REL9_4_STABLE [7f89fc418] 2017-10-25 07:20:48 -0400
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [18fc4ecf4] 2017-10-25 07:34:00 -0400
+Branch: REL_10_STABLE [06d5ba0d4] 2017-10-25 07:40:33 -0400
+Branch: REL9_6_STABLE [98efa5ebf] 2017-10-25 07:48:36 -0400
+Branch: REL9_5_STABLE [3cc5f0550] 2017-10-25 07:49:13 -0400
+Branch: REL9_4_STABLE [9cb28e98b] 2017-10-25 07:52:45 -0400
+-->
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [be72b9c37] 2017-10-30 15:52:02 +0100
+Branch: REL_10_STABLE [52ca7572c] 2017-10-30 15:52:13 +0100
+-->
+     <para>
+      Fix autovacuum's <quote>work item</quote> logic to prevent possible
+      crashes and silent loss of work items (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d5b760ecb] 2017-10-27 17:28:54 -0400
+Branch: REL_10_STABLE [ddde3b4f3] 2017-10-27 17:10:21 -0400
+Branch: REL9_6_STABLE [7e5e8b36d] 2017-10-27 17:10:21 -0400
+Branch: REL9_5_STABLE [acd3287e4] 2017-10-27 17:10:21 -0400
+Branch: REL9_4_STABLE [66104119e] 2017-10-27 17:10:21 -0400
+Branch: REL9_3_STABLE [9d15b8b36] 2017-10-27 17:10:21 -0400
+Branch: REL9_2_STABLE [80e79718d] 2017-10-27 17:10:21 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d76886c2d] 2017-10-27 18:16:24 -0400
+Branch: REL_10_STABLE [291a31c42] 2017-10-27 18:16:25 -0400
+Branch: REL9_6_STABLE [21daada10] 2017-10-27 18:16:25 -0400
+Branch: REL9_5_STABLE [1f81c2cd5] 2017-10-27 18:16:25 -0400
+Branch: REL9_4_STABLE [d01d97c25] 2017-10-27 18:16:25 -0400
+Branch: REL9_3_STABLE [e06b9e9dc] 2017-10-27 18:16:25 -0400
+Branch: REL9_2_STABLE [a4c11c103] 2017-10-27 18:16:25 -0400
+-->
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f3ea3e3e8] 2017-10-23 13:57:45 -0400
+Branch: REL_10_STABLE [df4aa6e4e] 2017-10-23 13:57:45 -0400
+Branch: REL9_6_STABLE [285b850d5] 2017-10-23 13:57:45 -0400
+Branch: REL9_5_STABLE [aa0518301] 2017-10-23 13:57:45 -0400
+Branch: REL9_4_STABLE [d8a3be52f] 2017-10-23 13:57:45 -0400
+Branch: REL9_3_STABLE [dde99de11] 2017-10-23 13:57:46 -0400
+Branch: REL9_2_STABLE [900a9fd64] 2017-10-23 13:57:46 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6784d7a1d] 2017-10-27 12:19:09 -0400
+Branch: REL_10_STABLE [8be102242] 2017-10-27 12:19:11 -0400
+Branch: REL9_6_STABLE [cf0331a54] 2017-10-27 12:18:57 -0400
+Branch: REL9_5_STABLE [37fb01cb0] 2017-10-27 12:18:57 -0400
+Branch: REL9_4_STABLE [376ac922d] 2017-10-27 12:18:57 -0400
+Branch: REL9_3_STABLE [be203c36a] 2017-10-27 12:18:57 -0400
+Branch: REL9_2_STABLE [adcfa7bd1] 2017-10-27 12:18:57 -0400
+-->
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [36ea99c84] 2017-10-20 17:12:27 -0400
+Branch: REL_10_STABLE [7a5f8de55] 2017-10-20 17:12:27 -0400
+Branch: REL9_6_STABLE [b1752c3a7] 2017-10-20 17:12:27 -0400
+Branch: REL9_5_STABLE [63fbc51e3] 2017-10-20 17:12:27 -0400
+Branch: REL9_4_STABLE [d1ced6114] 2017-10-20 17:12:27 -0400
+Branch: REL9_3_STABLE [7c70a129e] 2017-10-20 17:12:27 -0400
+Branch: REL9_2_STABLE [0270ad1f7] 2017-10-20 17:12:28 -0400
+-->
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [e9ef11ac8] 2017-10-12 17:23:47 +0200
+Branch: REL_10_STABLE [a01a3d931] 2017-10-12 17:32:48 +0200
+-->
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when examining functional-dependency statistics (David Rowley)
+     </para>
+
+     <para>
+      This allows, e.g., extended statistics on <type>varchar</type> columns
+      to be used properly.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [52328727b] 2017-10-11 22:18:10 -0400
+Branch: REL_10_STABLE [604723d29] 2017-10-11 22:18:01 -0400
+Branch: REL9_6_STABLE [96cfc7e19] 2017-10-11 22:18:01 -0400
+-->
+     <para>
+      Prevent sharing transition states between ordered-set aggregates
+      (David Rowley)
+     </para>
+
+     <para>
+      This causes a crash with the built-in ordered-set aggregates, and
+      probably with user-written ones as well.  v11 and later will include
+      provisions for dealing with such cases safely, but in released
+      branches, just disable the optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [f67661665] 2017-10-11 14:02:41 -0700
+Branch: REL_10_STABLE [61ace8fe7] 2017-10-11 14:02:41 -0700
+Branch: REL9_6_STABLE [0da46d75e] 2017-10-11 14:02:41 -0700
+-->
+     <para>
+      Prevent <varname>idle_in_transaction_session_timeout</varname> from
+      being ignored when a <varname>statement_timeout</varname> occurred
+      earlier (Lukas Fittl)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [118e99c3d] 2017-10-11 14:28:33 -0400
+Branch: REL_10_STABLE [f4cdf781a] 2017-10-11 14:28:33 -0400
+Branch: REL9_6_STABLE [36c687a22] 2017-10-11 14:28:33 -0400
+Branch: REL9_5_STABLE [69bc245d9] 2017-10-11 14:28:33 -0400
+Branch: REL9_4_STABLE [0e84f7075] 2017-10-11 14:28:33 -0400
+Branch: REL9_3_STABLE [7573d122f] 2017-10-11 14:28:33 -0400
+Branch: REL9_2_STABLE [525b09ada] 2017-10-11 14:28:34 -0400
+-->
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [643c27e36] 2017-10-08 15:25:26 -0400
+Branch: REL_10_STABLE [c3723317d] 2017-10-08 15:25:26 -0400
+Branch: REL9_6_STABLE [13a8924ec] 2017-10-08 15:25:26 -0400
+-->
+     <para>
+      Reduce the frequency of data flush requests during bulk file copies to
+      avoid performance problems on macOS, particularly with its new APFS
+      file system (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [bab3a714b] 2017-11-05 09:25:52 -0800
+Branch: REL_10_STABLE [2168f37c4] 2017-11-05 09:25:59 -0800
+Branch: REL9_6_STABLE [1cac62dac] 2017-11-05 09:26:28 -0800
+Branch: REL9_5_STABLE [7932891ab] 2017-11-05 09:26:43 -0800
+Branch: REL9_4_STABLE [2a2e2e85e] 2017-11-05 09:26:47 -0800
+-->
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [305cf1fd7] 2017-10-12 15:20:16 -0400
+Branch: REL_10_STABLE [d48bf6a94] 2017-10-12 15:20:04 -0400
+Branch: REL9_6_STABLE [aa1e9b3a4] 2017-10-12 15:20:04 -0400
+-->
+     <para>
+      Fix <function>AggGetAggref()</function> to return the
+      correct <structname>Aggref</structname> nodes to aggregate final
+      functions whose transition calculations have been merged (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [080351466] 2017-10-31 13:40:23 -0400
+Branch: REL_10_STABLE [9cf2b854a] 2017-10-31 13:40:23 -0400
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [51f4d3ed7] 2017-11-01 19:16:14 -0700
+Branch: REL_10_STABLE [f4e13963c] 2017-11-01 19:16:17 -0700
+-->
+     <para>
+      Fix insufficient schema-qualification in some new queries
+      in <application>pg_dump</application>
+      and <application>psql</application>
+      (Vitaly Burovoy, Tom Lane, Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [471d55859] 2017-10-22 16:45:16 -0400
+Branch: REL_10_STABLE [852e3224e] 2017-10-22 16:45:26 -0400
+-->
+     <para>
+      Avoid use of <literal>@&gt;</literal> operator
+      in <application>psql</application>'s queries for <command>\d</command>
+      (Tom Lane)
+     </para>
+
+     <para>
+      This prevents problems when the <application>parray_gin</application>
+      extension is installed, since that defines a conflicting operator.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [067a2259f] 2017-11-01 10:20:05 -0400
+Branch: REL_10_STABLE [dd12b5307] 2017-11-01 21:41:45 -0400
+Branch: REL9_6_STABLE [4ba0ffaae] 2017-11-01 21:44:55 -0400
+Branch: REL9_5_STABLE [3064f0e25] 2017-11-01 21:45:11 -0400
+-->
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [db6986f47] 2017-10-25 19:32:24 -0400
+Branch: REL_10_STABLE [51e9fffba] 2017-10-25 19:32:24 -0400
+Branch: REL9_6_STABLE [7dc66a2f6] 2017-10-25 19:32:24 -0400
+Branch: REL9_5_STABLE [ee02c1c89] 2017-10-25 19:32:24 -0400
+Branch: REL9_4_STABLE [9f7afb25b] 2017-10-25 19:32:24 -0400
+Branch: REL9_3_STABLE [6dd7a1207] 2017-10-25 19:32:24 -0400
+Branch: REL9_2_STABLE [caeae886e] 2017-10-25 19:32:25 -0400
+-->
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [0af98a95c] 2017-10-26 10:16:04 +0200
+Branch: REL_10_STABLE [65ba1b5c2] 2017-10-26 10:39:37 +0200
+Branch: REL9_6_STABLE [41753604b] 2017-10-26 10:39:46 +0200
+Branch: REL9_5_STABLE [9b01a21fc] 2017-10-26 10:39:54 +0200
+Branch: REL9_4_STABLE [c6a396888] 2017-10-26 10:40:03 +0200
+-->
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [63d6b97fd] 2017-11-01 13:32:18 +0100
+Branch: REL_10_STABLE [e4381c039] 2017-11-01 13:40:27 +0100
+Branch: REL9_6_STABLE [e0ec1cbff] 2017-11-01 13:40:50 +0100
+Branch: REL9_5_STABLE [d2e6bd13a] 2017-11-01 13:41:00 +0100
+Branch: REL9_4_STABLE [18647e21d] 2017-11-01 13:41:12 +0100
+Branch: REL9_3_STABLE [d64a4d368] 2017-11-01 13:41:21 +0100
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [6976a4f05] 2017-11-02 20:49:47 +0100
+Branch: REL_10_STABLE [ee46980a7] 2017-11-02 20:51:00 +0100
+Branch: REL9_6_STABLE [049dab009] 2017-11-02 20:51:13 +0100
+Branch: REL9_5_STABLE [b6d95939e] 2017-11-02 20:51:23 +0100
+Branch: REL9_4_STABLE [ad24e7bc2] 2017-11-02 20:51:34 +0100
+Branch: REL9_3_STABLE [7a35507ac] 2017-11-02 20:51:44 +0100
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [7164991ca] 2017-11-03 11:15:14 +0100
+Branch: REL_10_STABLE [c63568b06] 2017-11-03 12:41:39 +0100
+Branch: REL9_6_STABLE [6cf68e223] 2017-11-03 12:41:23 +0100
+Branch: REL9_5_STABLE [90d61bd1d] 2017-11-03 12:41:11 +0100
+Branch: REL9_4_STABLE [946f16518] 2017-11-03 12:40:54 +0100
+Branch: REL9_3_STABLE [deb429b51] 2017-11-03 12:40:42 +0100
+-->
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8df4ce1ea] 2017-10-23 18:15:36 -0400
+Branch: REL_10_STABLE [0cde56247] 2017-10-23 18:15:42 -0400
+Branch: REL9_6_STABLE [fae550e52] 2017-10-23 18:15:47 -0400
+Branch: REL9_5_STABLE [1e57d85cd] 2017-10-23 18:15:51 -0400
+Branch: REL9_4_STABLE [ba67fac85] 2017-10-23 18:15:56 -0400
+Branch: REL9_3_STABLE [da82bb1d8] 2017-10-23 18:16:00 -0400
+Branch: REL9_2_STABLE [7e8d84c36] 2017-10-23 18:16:04 -0400
+-->
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [49df45acd] 2017-11-03 14:14:02 -0400
+Branch: REL_10_STABLE [5159626af] 2017-11-03 14:14:16 -0400
+-->
+     <para>
+      In the documentation, restore HTML anchors to being upper-case strings
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Due to a toolchain change, the 10.0 user manual had lower-case strings
+      for intrapage anchors, thus breaking some external links into our
+      website documentation.  Return to our previous convention of using
+      upper-case strings.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-10">
   <title>Release 10</title>
 
@@ -727,7 +1363,7 @@
        </para>
 
        <para>
-        A new <link linkend="SQL-CREATEINDEX"><command>CREATE
+        A new <link linkend="sql-createindex"><command>CREATE
         INDEX</command></link> option enables auto-summarization of the
         previous <acronym>BRIN</acronym> page range when a new page
         range is created.
@@ -851,9 +1487,9 @@
 
       <para>
        New commands are <link
-       linkend="SQL-CREATESTATISTICS"><command>CREATE STATISTICS</command></link>,
-       <link linkend="SQL-ALTERSTATISTICS"><command>ALTER STATISTICS</command></link>, and
-       <link linkend="SQL-DROPSTATISTICS"><command>DROP STATISTICS</command></link>.
+       linkend="sql-createstatistics"><command>CREATE STATISTICS</command></link>,
+       <link linkend="sql-alterstatistics"><command>ALTER STATISTICS</command></link>, and
+       <link linkend="sql-dropstatistics"><command>DROP STATISTICS</command></link>.
        This feature is helpful in estimating query memory usage and when
        combining the statistics from individual columns.
       </para>
@@ -976,7 +1612,7 @@
 -->
        <para>
         Allow explicit control
-        over <link linkend="SQL-EXPLAIN"><command>EXPLAIN</command></link>'s display
+        over <link linkend="sql-explain"><command>EXPLAIN</command></link>'s display
         of planning and execution time (Ashutosh Bapat)
        </para>
 
@@ -1009,7 +1645,7 @@
 -->
        <para>
         Properly update the statistics collector during <link
-        linkend="SQL-REFRESHMATERIALIZEDVIEW"><command>REFRESH MATERIALIZED
+        linkend="sql-refreshmaterializedview"><command>REFRESH MATERIALIZED
         VIEW</command></link> (Jim Mlodgenski)
        </para>
       </listitem>
@@ -1592,7 +2228,7 @@
 2016-12-07 [f0e44751d] Implement table partitioning.
 -->
       <para>
-       Add table <link linkend="SQL-CREATETABLE-PARTITION">partitioning
+       Add table <link linkend="sql-createtable-partition">partitioning
        syntax</link> that automatically creates partition constraints and
        handles routing of tuple insertions and updates (Amit Langote)
       </para>
@@ -1609,7 +2245,7 @@
 2017-03-31 [597027163] Add transition table support to plpgsql.
 -->
       <para>
-       Add <link linkend="SQL-CREATETRIGGER"><literal>AFTER</literal> trigger</link>
+       Add <link linkend="sql-createtrigger"><literal>AFTER</literal> trigger</link>
        transition tables to record changed rows (Kevin Grittner, Thomas
        Munro)
       </para>
@@ -1625,7 +2261,7 @@
 2016-12-05 [093129c9d] Add support for restrictive RLS policies
 -->
       <para>
-       Allow <link linkend="SQL-CREATEPOLICY">restrictive row-level
+       Allow <link linkend="sql-createpolicy">restrictive row-level
        security policies</link> (Stephen Frost)
       </para>
 
@@ -1661,7 +2297,7 @@
 2017-03-28 [ab89e465c] Altering default privileges on schemas
 -->
       <para>
-       Allow <link linkend="SQL-ALTERDEFAULTPRIVILEGES">default
+       Allow <link linkend="sql-alterdefaultprivileges">default
        permissions</link> on schemas (Matheus Oliveira)
       </para>
 
@@ -1675,7 +2311,7 @@
 2017-02-10 [2ea5b06c7] Add CREATE SEQUENCE AS <data type> clause
 -->
       <para>
-       Add <link linkend="SQL-CREATESEQUENCE"><command>CREATE SEQUENCE
+       Add <link linkend="sql-createsequence"><command>CREATE SEQUENCE
        AS</command></link> command to create a sequence matching an integer data type
        (Peter Eisentraut)
       </para>
@@ -1711,7 +2347,7 @@
       </para>
 
       <para>
-       For example, allow <link linkend="SQL-DROPFUNCTION"><command>DROP
+       For example, allow <link linkend="sql-dropfunction"><command>DROP
        FUNCTION</command></link> on a function name without arguments if there
        is only one function with that name.  This behavior is required by the
        <acronym>SQL</acronym> standard.
@@ -1735,9 +2371,9 @@
 -->
       <para>
        Support <literal>IF NOT EXISTS</literal>
-       in <link linkend="SQL-CREATESERVER"><command>CREATE SERVER</command></link>,
-       <link linkend="SQL-CREATEUSERMAPPING"><command>CREATE USER MAPPING</command></link>,
-       and <link linkend="SQL-CREATECOLLATION"><command>CREATE COLLATION</command></link>
+       in <link linkend="sql-createserver"><command>CREATE SERVER</command></link>,
+       <link linkend="sql-createusermapping"><command>CREATE USER MAPPING</command></link>,
+       and <link linkend="sql-createcollation"><command>CREATE COLLATION</command></link>
        (Anastasia Lubennikova, Peter Eisentraut)
       </para>
      </listitem>
@@ -1748,7 +2384,7 @@
 2017-03-03 [9eb344faf] Allow vacuums to report oldestxmin
 -->
       <para>
-       Make <link linkend="SQL-VACUUM"><command>VACUUM VERBOSE</command></link> report
+       Make <link linkend="sql-vacuum"><command>VACUUM VERBOSE</command></link> report
        the number of skipped frozen pages and oldest xmin (Masahiko
        Sawada, Simon Riggs)
       </para>
@@ -1815,7 +2451,7 @@
 2017-04-06 [321732705] Identity columns
 -->
       <para>
-       Add <link linkend="SQL-CREATETABLE">identity columns</link> for
+       Add <link linkend="sql-createtable">identity columns</link> for
        assigning a numeric value to columns on insert (Peter Eisentraut)
       </para>
 
@@ -1835,7 +2471,7 @@
       </para>
 
       <para>
-       This uses the syntax <link linkend="SQL-ALTERTYPE"><command>ALTER
+       This uses the syntax <link linkend="sql-altertype"><command>ALTER
        TYPE ... RENAME VALUE</command></link>.
       </para>
      </listitem>
@@ -2197,7 +2833,7 @@
     <title>Client Applications</title>
 
     <sect4>
-     <title><xref linkend="APP-PSQL"></title>
+     <title><xref linkend="app-psql"></title>
 
      <itemizedlist>
 
@@ -2420,7 +3056,7 @@
 2016-10-19 [5d58c07a4] initdb pg_basebackup: Rename -\-noxxx options to -\-no-x
 -->
       <para>
-       Rename <link linkend="APP-INITDB"><application>initdb</application></link>
+       Rename <link linkend="app-initdb"><application>initdb</application></link>
        options <option>--noclean</option> and <option>--nosync</option> to be spelled
        <option>--no-clean</option> and <option>--no-sync</option> (Vik Fearing,
        Peter Eisentraut)
@@ -2434,9 +3070,9 @@
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</application></link>,
-     <link linkend="APP-PG-DUMPALL"><application>pg_dumpall</application></link>,
-     <link linkend="APP-PGRESTORE"><application>pg_restore</application></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link>,
+     <link linkend="app-pg-dumpall"><application>pg_dumpall</application></link>,
+     <link linkend="app-pgrestore"><application>pg_restore</application></link></title>
 
      <itemizedlist>
 
diff --git a/doc/src/sgml/release-9.2.sgml b/doc/src/sgml/release-9.2.sgml
index c1c864b237d136454dab9d5459af9450709ba372..2f5f054c4e94f4a838e4034d9bf6ad8e88103f94 100644
--- a/doc/src/sgml/release-9.2.sgml
+++ b/doc/src/sgml/release-9.2.sgml
@@ -1,6 +1,182 @@
 <!-- doc/src/sgml/release-9.2.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-2-24">
+  <title>Release 9.2.24</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.23.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2">.
+  </para>
+
+  <para>
+   This is expected to be the last <productname>PostgreSQL</productname>
+   release in the 9.2.X series.  Users are encouraged to update to a newer
+   release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.24</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.22,
+    see <xref linkend="release-9-2-22">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-2-23">
   <title>Release 9.2.23</title>
 
@@ -16,7 +192,7 @@
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.2.X release series in September 2017.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -43,20 +219,20 @@
     <listitem>
      <para>
       Show foreign tables
-      in <structname>information_schema</>.<structname>table_privileges</>
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
       view (Peter Eisentraut)
      </para>
 
      <para>
-      All other relevant <structname>information_schema</> views include
+      All other relevant <structname>information_schema</structname> views include
       foreign tables, but this one ignored them.
      </para>
 
      <para>
-      Since this view definition is installed by <application>initdb</>,
+      Since this view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can, as a superuser, do this
-      in <application>psql</>:
+      in <application>psql</application>:
 <programlisting>
 SET search_path TO information_schema;
 CREATE OR REPLACE VIEW table_privileges AS
@@ -95,21 +271,21 @@ CREATE OR REPLACE VIEW table_privileges AS
                OR grantee.rolname = 'PUBLIC');
 </programlisting>
       This must be repeated in each database to be fixed,
-      including <literal>template0</>.
+      including <literal>template0</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Clean up handling of a fatal exit (e.g., due to receipt
-      of <systemitem>SIGTERM</>) that occurs while trying to execute
-      a <command>ROLLBACK</> of a failed transaction (Tom Lane)
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
      </para>
 
      <para>
       This situation could result in an assertion failure.  In production
       builds, the exit would still occur, but it would log an unexpected
-      message about <quote>cannot drop active portal</>.
+      message about <quote>cannot drop active portal</quote>.
      </para>
     </listitem>
 
@@ -126,7 +302,7 @@ CREATE OR REPLACE VIEW table_privileges AS
      </para>
 
      <para>
-      Certain <command>ALTER</> commands that change the definition of a
+      Certain <command>ALTER</command> commands that change the definition of a
       composite type or domain type are supposed to fail if there are any
       stored values of that type in the database, because they lack the
       infrastructure needed to update or check such values.  Previously,
@@ -138,13 +314,13 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Change <application>ecpg</>'s parser to allow <literal>RETURNING</>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
       clauses without attached C variables (Michael Meskes)
      </para>
 
      <para>
-      This allows <application>ecpg</> programs to contain SQL constructs
-      that use <literal>RETURNING</> internally (for example, inside a CTE)
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
       rather than using it to define values to be returned to the client.
      </para>
     </listitem>
@@ -156,12 +332,12 @@ CREATE OR REPLACE VIEW table_privileges AS
 
      <para>
       This fix avoids possible crashes of PL/Perl due to inconsistent
-      assumptions about the width of <type>time_t</> values.
+      assumptions about the width of <type>time_t</type> values.
       A side-effect that may be visible to extension developers is
-      that <literal>_USE_32BIT_TIME_T</> is no longer defined globally
-      in <productname>PostgreSQL</> Windows builds.  This is not expected
-      to cause problems, because type <type>time_t</> is not used
-      in any <productname>PostgreSQL</> API definitions.
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
      </para>
     </listitem>
 
@@ -185,7 +361,7 @@ CREATE OR REPLACE VIEW table_privileges AS
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.2.X release series in September 2017.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -217,7 +393,7 @@ CREATE OR REPLACE VIEW table_privileges AS
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -225,11 +401,11 @@ CREATE OR REPLACE VIEW table_privileges AS
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -244,15 +420,15 @@ CREATE OR REPLACE VIEW table_privileges AS
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -283,15 +459,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -305,7 +481,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -319,16 +495,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -406,28 +582,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -436,56 +612,56 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -496,22 +672,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -522,14 +698,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -540,21 +716,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -562,7 +738,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -574,8 +750,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -587,7 +763,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -607,27 +783,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -651,7 +827,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.2.X release series in September 2017.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -683,18 +859,18 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -718,7 +894,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -732,7 +908,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -745,7 +921,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -753,7 +929,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -768,19 +944,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -788,27 +964,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -822,33 +998,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -866,21 +1042,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -895,20 +1071,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -920,19 +1096,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
@@ -967,7 +1143,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -981,9 +1157,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -996,15 +1172,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
       other zone file (see <xref linkend="datatype-timezones">).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
@@ -1058,15 +1234,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1075,13 +1251,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
       Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1098,7 +1274,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      In corner cases, a spurious <quote>out-of-sequence TLI</> error
+      In corner cases, a spurious <quote>out-of-sequence TLI</quote> error
       could be reported during recovery.
      </para>
     </listitem>
@@ -1144,7 +1320,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
@@ -1162,15 +1338,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1203,12 +1379,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1223,15 +1399,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1242,33 +1418,33 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1280,8 +1456,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1293,28 +1469,28 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1333,21 +1509,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1359,23 +1535,23 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1386,8 +1562,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
@@ -1414,7 +1590,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1489,71 +1665,71 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
+      Fix <command>EXPLAIN</command> to emit valid XML when
       <xref linkend="guc-track-io-timing"> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -1575,7 +1751,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -1589,7 +1765,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -1600,30 +1776,30 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -1631,8 +1807,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -1653,17 +1829,17 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -1676,15 +1852,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -1730,17 +1906,17 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -1754,7 +1930,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -1763,22 +1939,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -1788,40 +1964,40 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -1832,12 +2008,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -1847,7 +2023,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -1860,19 +2036,19 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -1881,12 +2057,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -1894,8 +2070,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -1907,7 +2083,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -1942,8 +2118,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -1956,29 +2132,29 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -2012,7 +2188,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -2024,7 +2200,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -2080,7 +2256,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -2089,7 +2265,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -2103,10 +2279,10 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -2114,8 +2290,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -2127,28 +2303,28 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -2156,7 +2332,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
@@ -2177,22 +2353,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -2205,12 +2381,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -2218,9 +2394,9 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -2267,56 +2443,56 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -2342,27 +2518,27 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -2376,20 +2552,20 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
@@ -2410,21 +2586,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -2485,25 +2661,25 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -2512,7 +2688,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -2531,21 +2707,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -2554,7 +2730,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -2576,14 +2752,14 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -2635,7 +2811,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -2648,14 +2824,14 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -2668,7 +2844,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -2694,13 +2870,13 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -2708,15 +2884,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -2724,21 +2900,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -2746,23 +2922,23 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -2770,18 +2946,18 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -2791,44 +2967,44 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -2837,22 +3013,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -2860,29 +3036,29 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -2890,42 +3066,42 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -2937,19 +3113,19 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -2957,11 +3133,11 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -2970,7 +3146,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -3016,8 +3192,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -3043,13 +3219,13 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -3067,7 +3243,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -3085,7 +3261,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      </para>
 
      <para>
-      This substantially improves performance when <application>pg_dump</>
+      This substantially improves performance when <application>pg_dump</application>
       tries to dump a large number of tables.
      </para>
     </listitem>
@@ -3100,13 +3276,13 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -3118,14 +3294,14 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3133,21 +3309,21 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -3160,7 +3336,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -3212,22 +3388,22 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -3240,9 +3416,9 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -3250,7 +3426,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -3271,12 +3447,12 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -3296,7 +3472,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -3333,7 +3509,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -3341,44 +3517,44 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -3395,14 +3571,14 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <filename>contrib/sepgsql</>'s handling of <command>SELECT INTO</>
+      Fix <filename>contrib/sepgsql</filename>'s handling of <command>SELECT INTO</command>
       statements (Kohei KaiGai)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3410,64 +3586,64 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -3475,11 +3651,11 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -3488,18 +3664,18 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -3507,11 +3683,11 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -3519,14 +3695,14 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -3538,38 +3714,38 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -3618,7 +3794,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -3629,13 +3805,13 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -3681,12 +3857,12 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -3700,36 +3876,36 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -3763,8 +3939,8 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
@@ -3802,7 +3978,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -3812,7 +3988,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -3822,15 +3998,15 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -3839,16 +4015,16 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -3856,16 +4032,16 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -3907,7 +4083,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -3935,7 +4111,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -3943,7 +4119,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -3964,14 +4140,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</quote> error
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -3991,19 +4167,19 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -4050,18 +4226,18 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -4074,20 +4250,20 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -4100,20 +4276,20 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -4121,14 +4297,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -4137,32 +4313,32 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -4175,38 +4351,38 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -4219,14 +4395,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -4238,7 +4414,7 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -4246,28 +4422,28 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -4275,8 +4451,8 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
@@ -4288,18 +4464,18 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix failure in <application>pg_receivexlog</> (Andres Freund)
+      Fix failure in <application>pg_receivexlog</application> (Andres Freund)
      </para>
 
      <para>
       A patch merge mistake in 9.2.10 led to <quote>could not create archive
-      status file</> errors.
+      status file</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -4311,7 +4487,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -4346,11 +4522,11 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
 
    <para>
@@ -4367,15 +4543,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -4385,27 +4561,27 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -4413,12 +4589,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -4459,7 +4635,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -4484,35 +4660,35 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -4520,14 +4696,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Ensure that unlogged tables are copied correctly
-      during <command>CREATE DATABASE</> or <command>ALTER DATABASE SET
-      TABLESPACE</> (Pavan Deolasee, Andres Freund)
+      during <command>CREATE DATABASE</command> or <command>ALTER DATABASE SET
+      TABLESPACE</command> (Pavan Deolasee, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>DROP</>'s dependency searching to correctly handle the
+      Fix <command>DROP</command>'s dependency searching to correctly handle the
       case where a table column is recursively visited before its table
       (Petr Jelinek, Tom Lane)
      </para>
@@ -4535,7 +4711,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This case is only known to arise when an extension creates both a
       datatype and a table using that datatype.  The faulty code might
-      refuse a <command>DROP EXTENSION</> unless <literal>CASCADE</> is
+      refuse a <command>DROP EXTENSION</command> unless <literal>CASCADE</literal> is
       specified, which should not be required.
      </para>
     </listitem>
@@ -4547,22 +4723,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -4570,12 +4746,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -4585,7 +4761,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -4611,7 +4787,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -4624,19 +4800,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -4649,7 +4825,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Matching would often fail when the number of allowed iterations is
-      limited by a <literal>?</> quantifier or a bound expression.
+      limited by a <literal>?</literal> quantifier or a bound expression.
      </para>
     </listitem>
 
@@ -4668,7 +4844,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -4699,14 +4875,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -4720,7 +4896,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      In some contexts, constructs like <literal>row_to_json(tab.*)</> may
+      In some contexts, constructs like <literal>row_to_json(tab.*)</literal> may
       not produce the expected column names.  This is fixed properly as of
       9.4; in older branches, just ensure that we produce some nonempty
       name.  (In some cases this will be the underlying table's column name
@@ -4732,19 +4908,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix mishandling of system columns,
-      particularly <structfield>tableoid</>, in FDW queries (Etsuro Fujita)
+      particularly <structfield>tableoid</structfield>, in FDW queries (Etsuro Fujita)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid doing <literal><replaceable>indexed_column</> = ANY
-      (<replaceable>array</>)</literal> as an index qualifier if that leads
+      Avoid doing <literal><replaceable>indexed_column</replaceable> = ANY
+      (<replaceable>array</replaceable>)</literal> as an index qualifier if that leads
       to an inferior plan (Andrew Gierth)
      </para>
 
      <para>
-      In some cases, <literal>= ANY</> conditions applied to non-first index
+      In some cases, <literal>= ANY</literal> conditions applied to non-first index
       columns would be done as index conditions even though it would be
       better to use them as simple filter conditions.
      </para>
@@ -4753,7 +4929,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -4766,8 +4942,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -4793,7 +4969,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -4826,12 +5002,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
@@ -4845,7 +5021,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -4853,14 +5029,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -4869,7 +5045,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -4883,32 +5059,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -4916,14 +5092,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -4931,32 +5107,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -4966,7 +5142,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -4974,17 +5150,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -4992,16 +5168,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <application>pg_dump</> when the database
+      Improve performance of <application>pg_dump</application> when the database
       contains many instances of multiple dependency paths between the same
       two objects (Tom Lane)
      </para>
@@ -5009,7 +5185,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to restore its ability to dump from
+      Fix <application>pg_dumpall</application> to restore its ability to dump from
       pre-8.1 servers (Gilles Darold)
      </para>
     </listitem>
@@ -5023,28 +5199,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix failure of <filename>contrib/auto_explain</> to print per-node
-      timing information when doing <command>EXPLAIN ANALYZE</> (Tom Lane)
+      Fix failure of <filename>contrib/auto_explain</filename> to print per-node
+      timing information when doing <command>EXPLAIN ANALYZE</command> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix upgrade-from-unpackaged script for <filename>contrib/citext</>
+      Fix upgrade-from-unpackaged script for <filename>contrib/citext</filename>
       (Tom Lane)
      </para>
     </listitem>
@@ -5052,7 +5228,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -5064,7 +5240,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -5072,7 +5248,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix file descriptor leak in <filename>contrib/pg_test_fsync</>
+      Fix file descriptor leak in <filename>contrib/pg_test_fsync</filename>
       (Jeff Janes)
      </para>
 
@@ -5084,24 +5260,24 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -5109,7 +5285,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Mark some <filename>contrib</> I/O functions with correct volatility
+      Mark some <filename>contrib</filename> I/O functions with correct volatility
       properties (Tom Lane)
      </para>
 
@@ -5143,29 +5319,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -5177,15 +5353,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -5197,9 +5373,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -5208,21 +5384,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -5281,15 +5457,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -5335,7 +5511,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -5347,14 +5523,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This oversight could result in <quote>variable not found in subplan
-      target lists</> errors, or in silently wrong query results.
+      target lists</quote> errors, or in silently wrong query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failures
-      with <literal>UNION ALL</> over subqueries reading from tables with
+      Fix <quote>could not find pathkey item to sort</quote> planner failures
+      with <literal>UNION ALL</literal> over subqueries reading from tables with
       inheritance children (Tom Lane)
      </para>
     </listitem>
@@ -5375,7 +5551,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Improve planner to drop constant-NULL inputs
-      of <literal>AND</>/<literal>OR</> when possible (Tom Lane)
+      of <literal>AND</literal>/<literal>OR</literal> when possible (Tom Lane)
      </para>
 
      <para>
@@ -5387,13 +5563,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix identification of input type category in <function>to_json()</>
+      Fix identification of input type category in <function>to_json()</function>
       and friends (Tom Lane)
      </para>
 
      <para>
-      This is known to have led to inadequate quoting of <type>money</>
-      fields in the <type>JSON</> result, and there may have been wrong
+      This is known to have led to inadequate quoting of <type>money</type>
+      fields in the <type>JSON</type> result, and there may have been wrong
       results for other data types as well.
      </para>
     </listitem>
@@ -5408,13 +5584,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -5429,7 +5605,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -5442,7 +5618,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -5463,19 +5639,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -5483,7 +5659,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -5495,14 +5671,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix client host name lookup when processing <filename>pg_hba.conf</>
+      Fix client host name lookup when processing <filename>pg_hba.conf</filename>
       entries that specify host names instead of IP addresses (Tom Lane)
      </para>
 
@@ -5516,21 +5692,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Allow the root user to use <literal>postgres -C variable</> and
-      <literal>postgres --describe-config</> (MauMau)
+      Allow the root user to use <literal>postgres -C variable</literal> and
+      <literal>postgres --describe-config</literal> (MauMau)
      </para>
 
      <para>
       The prohibition on starting the server as root does not need to extend
       to these operations, and relaxing it prevents failure
-      of <application>pg_ctl</> in some scenarios.
+      of <application>pg_ctl</application> in some scenarios.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -5539,16 +5715,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -5584,15 +5760,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -5603,17 +5779,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -5621,15 +5797,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -5637,52 +5813,52 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for cases where the new server creates
+      Fix <application>pg_upgrade</application> for cases where the new server creates
       a TOAST table but the old version did not (Bruce Momjian)
      </para>
 
      <para>
-      This rare situation would manifest as <quote>relation OID mismatch</>
+      This rare situation would manifest as <quote>relation OID mismatch</quote>
       errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <filename>contrib/auto_explain</> from changing the output of
-      a user's <command>EXPLAIN</> (Tom Lane)
+      Prevent <filename>contrib/auto_explain</filename> from changing the output of
+      a user's <command>EXPLAIN</command> (Tom Lane)
      </para>
 
      <para>
-      If <filename>auto_explain</> is active, it could cause
-      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</> command to nonetheless
+      If <filename>auto_explain</filename> is active, it could cause
+      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal> command to nonetheless
       print timing information.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in <filename>contrib/dblink</>
+      Fix query-lifespan memory leak in <filename>contrib/dblink</filename>
       (MauMau, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -5691,27 +5867,27 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Prevent use of already-freed memory in
-      <filename>contrib/pgstattuple</>'s <function>pgstat_heap()</>
+      <filename>contrib/pgstattuple</filename>'s <function>pgstat_heap()</function>
       (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -5771,7 +5947,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -5795,7 +5971,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -5808,17 +5984,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -5837,8 +6013,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>walsender</>'s failure to shut down cleanly when client
-      is <application>pg_receivexlog</> (Fujii Masao)
+      Fix <application>walsender</application>'s failure to shut down cleanly when client
+      is <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -5858,13 +6034,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
@@ -5877,13 +6053,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix tracking of <application>psql</> script line numbers
-      during <literal>\copy</> from out-of-line data
+      Fix tracking of <application>psql</application> script line numbers
+      during <literal>\copy</literal> from out-of-line data
       (Kumar Rajeev Rastogi, Amit Khandekar)
      </para>
 
      <para>
-      <literal>\copy ... from</> incremented the script file line number
+      <literal>\copy ... from</literal> incremented the script file line number
       for each data line, even if the data was not coming from the script
       file.  This mistake resulted in wrong line numbers being reported for
       any errors occurring later in the same script file.
@@ -5892,14 +6068,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -5945,19 +6121,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -5970,7 +6146,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -5990,7 +6166,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -6004,12 +6180,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -6036,7 +6212,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -6048,35 +6224,35 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -6091,7 +6267,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -6111,20 +6287,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -6142,8 +6318,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      When <literal>pause_at_recovery_target</>
-      and <literal>recovery_target_inclusive</> are both set, ensure the
+      When <literal>pause_at_recovery_target</literal>
+      and <literal>recovery_target_inclusive</literal> are both set, ensure the
       target record is applied before pausing, not after (Heikki
       Linnakangas)
      </para>
@@ -6156,7 +6332,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
@@ -6169,19 +6345,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -6205,7 +6381,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -6225,7 +6401,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
@@ -6239,19 +6415,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>UPDATE/DELETE</> of an inherited target table
-      that has <literal>UNION ALL</> subqueries (Tom Lane)
+      Fix <literal>UPDATE/DELETE</literal> of an inherited target table
+      that has <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Without this fix, <literal>UNION ALL</> subqueries aren't correctly
+      Without this fix, <literal>UNION ALL</literal> subqueries aren't correctly
       inserted into the update plans for inheritance child tables after the
       first one, typically resulting in no update happening for those child
       table(s).
@@ -6260,12 +6436,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -6273,21 +6449,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -6319,12 +6495,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -6332,8 +6508,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix placement of permissions checks in <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> (Andres Freund, Magnus Hagander)
+      Fix placement of permissions checks in <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> (Andres Freund, Magnus Hagander)
      </para>
 
      <para>
@@ -6344,44 +6520,44 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>*</>-qualification of named parameters in SQL-language
+      Fix <literal>*</literal>-qualification of named parameters in SQL-language
       functions (Tom Lane)
      </para>
 
      <para>
       Given a composite-type parameter
-      named <literal>foo</>, <literal>$1.*</> worked fine,
-      but <literal>foo.*</> not so much.
+      named <literal>foo</literal>, <literal>$1.*</literal> worked fine,
+      but <literal>foo.*</literal> not so much.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
@@ -6389,14 +6565,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix incorrect translation handling in
-      some <application>psql</> <literal>\d</> commands
+      some <application>psql</application> <literal>\d</literal> commands
       (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <application>pg_basebackup</>'s background process is killed
+      Ensure <application>pg_basebackup</application>'s background process is killed
       when exiting its foreground process (Magnus Hagander)
      </para>
     </listitem>
@@ -6404,7 +6580,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible incorrect printing of filenames
-      in <application>pg_basebackup</>'s verbose mode (Magnus Hagander)
+      in <application>pg_basebackup</application>'s verbose mode (Magnus Hagander)
      </para>
     </listitem>
 
@@ -6417,20 +6593,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -6441,15 +6617,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_stat_statement</>'s handling
-      of <literal>CURRENT_DATE</> and related constructs (Kyotaro
+      Fix <filename>contrib/pg_stat_statement</filename>'s handling
+      of <literal>CURRENT_DATE</literal> and related constructs (Kyotaro
       Horiguchi)
      </para>
     </listitem>
@@ -6463,28 +6639,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -6493,20 +6669,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -6558,19 +6734,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
       need to happen before actual loss occurs, but it's not zero.  In 9.2.0
       and later, the probability of loss is higher, and it's also possible
-      to get <quote>could not access status of transaction</> errors as a
+      to get <quote>could not access status of transaction</quote> errors as a
       consequence of this bug.  Users upgrading from releases 9.0.4 or 8.4.8
       or earlier are not affected, but all later versions contain the bug.
      </para>
@@ -6578,18 +6754,18 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -6620,13 +6796,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This could lead to corruption of the lock data structures in shared
-      memory, causing <quote>lock already held</> and other odd errors.
+      memory, causing <quote>lock already held</quote> and other odd errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -6637,14 +6813,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure an anti-wraparound <command>VACUUM</> counts a page as scanned
+      Ensure an anti-wraparound <command>VACUUM</command> counts a page as scanned
       when it's only verified that no tuples need freezing (Sergey
       Burladyan, Jeff Janes)
      </para>
 
      <para>
       This bug could result in failing to
-      advance <structfield>relfrozenxid</>, so that the table would still be
+      advance <structfield>relfrozenxid</structfield>, so that the table would still be
       thought to need another anti-wraparound vacuum.  In the worst case the
       database might even shut down to prevent wraparound.
      </para>
@@ -6663,15 +6839,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <quote>unexpected spgdoinsert() failure</> error during SP-GiST
+      Fix <quote>unexpected spgdoinsert() failure</quote> error during SP-GiST
       index creation (Teodor Sigaev)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -6688,14 +6864,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect planning in cases where the same non-strict expression
-      appears in multiple <literal>WHERE</> and outer <literal>JOIN</>
+      appears in multiple <literal>WHERE</literal> and outer <literal>JOIN</literal>
       equality clauses (Tom Lane)
      </para>
     </listitem>
@@ -6763,13 +6939,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
@@ -6783,7 +6959,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -6797,7 +6973,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -6808,10 +6984,10 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -6821,28 +6997,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>ecpg</> search for quoted cursor names
+      Make <application>ecpg</application> search for quoted cursor names
       case-sensitively (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -6894,7 +7070,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      <productname>PostgreSQL</> case-folds non-ASCII characters only
+      <productname>PostgreSQL</productname> case-folds non-ASCII characters only
       when using a single-byte server encoding.
      </para>
     </listitem>
@@ -6909,7 +7085,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix checkpoint memory leak in background writer when <literal>wal_level =
-      hot_standby</> (Naoya Anzai)
+      hot_standby</literal> (Naoya Anzai)
      </para>
     </listitem>
 
@@ -6922,7 +7098,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix memory overcommit bug when <varname>work_mem</> is using more
+      Fix memory overcommit bug when <varname>work_mem</varname> is using more
       than 24GB of memory (Stephen Frost)
      </para>
     </listitem>
@@ -6964,58 +7140,58 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Previously tests like <literal>col IS NOT TRUE</> and <literal>col IS
-      NOT FALSE</> did not properly factor in NULL values when estimating
+      Previously tests like <literal>col IS NOT TRUE</literal> and <literal>col IS
+      NOT FALSE</literal> did not properly factor in NULL values when estimating
       plan costs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix accounting for qualifier evaluation costs in <literal>UNION ALL</>
+      Fix accounting for qualifier evaluation costs in <literal>UNION ALL</literal>
       and inheritance queries (Tom Lane)
      </para>
 
      <para>
       This fixes cases where suboptimal query plans could be chosen if
-      some <literal>WHERE</> clauses are expensive to calculate.
+      some <literal>WHERE</literal> clauses are expensive to calculate.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent pushing down <literal>WHERE</> clauses into unsafe
-      <literal>UNION/INTERSECT</> subqueries (Tom Lane)
+      Prevent pushing down <literal>WHERE</literal> clauses into unsafe
+      <literal>UNION/INTERSECT</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Subqueries of a <literal>UNION</> or <literal>INTERSECT</> that
+      Subqueries of a <literal>UNION</literal> or <literal>INTERSECT</literal> that
       contain set-returning functions or volatile functions in their
-      <literal>SELECT</> lists could be improperly optimized, leading to
+      <literal>SELECT</literal> lists could be improperly optimized, leading to
       run-time errors or incorrect query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare case of <quote>failed to locate grouping columns</>
+      Fix rare case of <quote>failed to locate grouping columns</quote>
       planner failure (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> of foreign tables with dropped columns (Andrew Dunstan)
+      Fix <application>pg_dump</application> of foreign tables with dropped columns (Andrew Dunstan)
      </para>
 
      <para>
-      Previously such cases could cause a <application>pg_upgrade</> error.
+      Previously such cases could cause a <application>pg_upgrade</application> error.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reorder <application>pg_dump</> processing of extension-related
+      Reorder <application>pg_dump</application> processing of extension-related
       rules and event triggers (Joe Conway)
      </para>
     </listitem>
@@ -7023,7 +7199,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Force dumping of extension tables if specified by <command>pg_dump
-      -t</> or <literal>-n</> (Joe Conway)
+      -t</command> or <literal>-n</literal> (Joe Conway)
      </para>
     </listitem>
 
@@ -7036,25 +7212,25 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>pg_restore -l</> with the directory archive to display
+      Fix <command>pg_restore -l</command> with the directory archive to display
       the correct format name (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly record index comments created using <literal>UNIQUE</>
-      and <literal>PRIMARY KEY</> syntax (Andres Freund)
+      Properly record index comments created using <literal>UNIQUE</literal>
+      and <literal>PRIMARY KEY</literal> syntax (Andres Freund)
      </para>
 
      <para>
-      This fixes a parallel <application>pg_restore</> failure.
+      This fixes a parallel <application>pg_restore</application> failure.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Cause <command>pg_basebackup -x</> with an empty xlog directory
+      Cause <command>pg_basebackup -x</command> with an empty xlog directory
       to throw an error rather than crashing (Magnus Hagander, Haruka
       Takatsuka)
      </para>
@@ -7093,13 +7269,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REINDEX TABLE</> and <command>REINDEX DATABASE</>
+      Fix <command>REINDEX TABLE</command> and <command>REINDEX DATABASE</command>
       to properly revalidate constraints and mark invalidated indexes as
       valid (Noah Misch)
      </para>
 
      <para>
-      <command>REINDEX INDEX</> has always worked properly.
+      <command>REINDEX INDEX</command> has always worked properly.
      </para>
     </listitem>
 
@@ -7112,7 +7288,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible deadlock during concurrent <command>CREATE INDEX
-      CONCURRENTLY</> operations (Tom Lane)
+      CONCURRENTLY</command> operations (Tom Lane)
      </para>
     </listitem>
 
@@ -7124,7 +7300,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <function>regexp_matches()</> handling of zero-length matches
+      Fix <function>regexp_matches()</function> handling of zero-length matches
       (Jeevan Chalke)
      </para>
 
@@ -7148,14 +7324,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>ALTER DEFAULT PRIVILEGES</> to operate on schemas
+      Allow <command>ALTER DEFAULT PRIVILEGES</command> to operate on schemas
       without requiring CREATE permission (Tom Lane)
      </para>
     </listitem>
@@ -7167,31 +7343,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Specifically, lessen keyword restrictions for role names, language
-      names, <command>EXPLAIN</> and <command>COPY</> options, and
-      <command>SET</> values.  This allows <literal>COPY ... (FORMAT
-      BINARY)</> to work as expected; previously <literal>BINARY</> needed
+      names, <command>EXPLAIN</command> and <command>COPY</command> options, and
+      <command>SET</command> values.  This allows <literal>COPY ... (FORMAT
+      BINARY)</literal> to work as expected; previously <literal>BINARY</literal> needed
       to be quoted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Print proper line number during <command>COPY</> failure (Heikki
+      Print proper line number during <command>COPY</command> failure (Heikki
       Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgp_pub_decrypt()</> so it works for secret keys with
+      Fix <function>pgp_pub_decrypt()</function> so it works for secret keys with
       passwords (Marko Kreen)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_upgrade</> use <literal>pg_dump
-      --quote-all-identifiers</> to avoid problems with keyword changes
+      Make <application>pg_upgrade</application> use <literal>pg_dump
+      --quote-all-identifiers</literal> to avoid problems with keyword changes
       between releases (Tom Lane)
      </para>
     </listitem>
@@ -7205,7 +7381,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <command>VACUUM ANALYZE</> still runs the ANALYZE phase
+      Ensure that <command>VACUUM ANALYZE</command> still runs the ANALYZE phase
       if its attempt to truncate the file is cancelled due to lock conflicts
       (Kevin Grittner)
      </para>
@@ -7214,28 +7390,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Avoid possible failure when performing transaction control commands (e.g
-      <command>ROLLBACK</>) in prepared queries (Tom Lane)
+      <command>ROLLBACK</command>) in prepared queries (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that floating-point data input accepts standard spellings
-      of <quote>infinity</> on all platforms (Tom Lane)
+      of <quote>infinity</quote> on all platforms (Tom Lane)
      </para>
 
      <para>
-      The C99 standard says that allowable spellings are <literal>inf</>,
-      <literal>+inf</>, <literal>-inf</>, <literal>infinity</>,
-      <literal>+infinity</>, and <literal>-infinity</>.  Make sure we
-      recognize these even if the platform's <function>strtod</> function
+      The C99 standard says that allowable spellings are <literal>inf</literal>,
+      <literal>+inf</literal>, <literal>-inf</literal>, <literal>infinity</literal>,
+      <literal>+infinity</literal>, and <literal>-infinity</literal>.  Make sure we
+      recognize these even if the platform's <function>strtod</function> function
       doesn't.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid unnecessary reporting when <varname>track_activities</> is off
+      Avoid unnecessary reporting when <varname>track_activities</varname> is off
       (Tom Lane)
      </para>
     </listitem>
@@ -7249,7 +7425,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent crash when <application>psql</>'s <envar>PSQLRC</> variable
+      Prevent crash when <application>psql</application>'s <envar>PSQLRC</envar> variable
       contains a tilde (Bruce Momjian)
      </para>
     </listitem>
@@ -7262,7 +7438,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013d
+      Update time zone data files to <application>tzdata</application> release 2013d
       for DST law changes in Israel, Morocco, Palestine, and Paraguay.
       Also, historical zone data corrections for Macquarie Island.
      </para>
@@ -7297,7 +7473,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    <para>
     However, this release corrects several errors in management of GiST
     indexes.  After installing this update, it is advisable to
-    <command>REINDEX</> any GiST indexes that meet one or more of the
+    <command>REINDEX</command> any GiST indexes that meet one or more of the
     conditions described below.
    </para>
 
@@ -7321,7 +7497,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A connection request containing a database name that begins with
-      <quote><literal>-</></quote> could be crafted to damage or destroy
+      <quote><literal>-</literal></quote> could be crafted to damage or destroy
       files within the server's data directory, even if the request is
       eventually rejected.  (CVE-2013-1899)
      </para>
@@ -7335,9 +7511,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This avoids a scenario wherein random numbers generated by
-      <filename>contrib/pgcrypto</> functions might be relatively easy for
+      <filename>contrib/pgcrypto</filename> functions might be relatively easy for
       another database user to guess.  The risk is only significant when
-      the postmaster is configured with <varname>ssl</> = <literal>on</>
+      the postmaster is configured with <varname>ssl</varname> = <literal>on</literal>
       but most connections don't use SSL encryption.  (CVE-2013-1900)
      </para>
     </listitem>
@@ -7350,7 +7526,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       An unprivileged database user could exploit this mistake to call
-      <function>pg_start_backup()</> or <function>pg_stop_backup()</>,
+      <function>pg_start_backup()</function> or <function>pg_stop_backup()</function>,
       thus possibly interfering with creation of routine backups.
       (CVE-2013-1901)
      </para>
@@ -7358,32 +7534,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix GiST indexes to not use <quote>fuzzy</> geometric comparisons when
+      Fix GiST indexes to not use <quote>fuzzy</quote> geometric comparisons when
       it's not appropriate to do so (Alexander Korotkov)
      </para>
 
      <para>
-      The core geometric types perform comparisons using <quote>fuzzy</>
-      equality, but <function>gist_box_same</> must do exact comparisons,
+      The core geometric types perform comparisons using <quote>fuzzy</quote>
+      equality, but <function>gist_box_same</function> must do exact comparisons,
       else GiST indexes using it might become inconsistent.  After installing
-      this update, users should <command>REINDEX</> any GiST indexes on
-      <type>box</>, <type>polygon</>, <type>circle</>, or <type>point</>
-      columns, since all of these use <function>gist_box_same</>.
+      this update, users should <command>REINDEX</command> any GiST indexes on
+      <type>box</type>, <type>polygon</type>, <type>circle</type>, or <type>point</type>
+      columns, since all of these use <function>gist_box_same</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous range-union and penalty logic in GiST indexes that use
-      <filename>contrib/btree_gist</> for variable-width data types, that is
-      <type>text</>, <type>bytea</>, <type>bit</>, and <type>numeric</>
+      <filename>contrib/btree_gist</filename> for variable-width data types, that is
+      <type>text</type>, <type>bytea</type>, <type>bit</type>, and <type>numeric</type>
       columns (Tom Lane)
      </para>
 
      <para>
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in useless
-      index bloat.  Users are advised to <command>REINDEX</> such indexes
+      index bloat.  Users are advised to <command>REINDEX</command> such indexes
       after installing this update.
      </para>
     </listitem>
@@ -7398,21 +7574,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in indexes
       that are unnecessarily inefficient to search.  Users are advised to
-      <command>REINDEX</> multi-column GiST indexes after installing this
+      <command>REINDEX</command> multi-column GiST indexes after installing this
       update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>gist_point_consistent</>
+      Fix <function>gist_point_consistent</function>
       to handle fuzziness consistently (Alexander Korotkov)
      </para>
 
      <para>
-      Index scans on GiST indexes on <type>point</> columns would sometimes
+      Index scans on GiST indexes on <type>point</type> columns would sometimes
       yield results different from a sequential scan, because
-      <function>gist_point_consistent</> disagreed with the underlying
+      <function>gist_point_consistent</function> disagreed with the underlying
       operator code about whether to do comparisons exactly or fuzzily.
      </para>
     </listitem>
@@ -7423,7 +7599,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This bug could result in <quote>incorrect local pin count</> errors
+      This bug could result in <quote>incorrect local pin count</quote> errors
       during replay, making recovery impossible.
      </para>
     </listitem>
@@ -7431,7 +7607,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Ensure we do crash recovery before entering archive recovery, if the
-      database was not stopped cleanly and a <filename>recovery.conf</> file
+      database was not stopped cleanly and a <filename>recovery.conf</filename> file
       is present (Heikki Linnakangas, Kyotaro Horiguchi, Mitsumasa Kondo)
      </para>
 
@@ -7451,14 +7627,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix race condition in <command>DELETE RETURNING</> (Tom Lane)
+      Fix race condition in <command>DELETE RETURNING</command> (Tom Lane)
      </para>
 
      <para>
-      Under the right circumstances, <command>DELETE RETURNING</> could
+      Under the right circumstances, <command>DELETE RETURNING</command> could
       attempt to fetch data from a shared buffer that the current process
       no longer has any pin on.  If some other process changed the buffer
-      meanwhile, this would lead to garbage <literal>RETURNING</> output, or
+      meanwhile, this would lead to garbage <literal>RETURNING</literal> output, or
       even a crash.
      </para>
     </listitem>
@@ -7479,20 +7655,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to use ASCII-only case-folding rules where
+      Fix <function>to_char()</function> to use ASCII-only case-folding rules where
       appropriate (Tom Lane)
      </para>
 
      <para>
       This fixes misbehavior of some template patterns that should be
-      locale-independent, but mishandled <quote><literal>I</></quote> and
-      <quote><literal>i</></quote> in Turkish locales.
+      locale-independent, but mishandled <quote><literal>I</literal></quote> and
+      <quote><literal>i</literal></quote> in Turkish locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</>
+      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</literal>
       (Tom Lane)
      </para>
     </listitem>
@@ -7506,8 +7682,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix logic error when a single transaction does <command>UNLISTEN</>
-      then <command>LISTEN</> (Tom Lane)
+      Fix logic error when a single transaction does <command>UNLISTEN</command>
+      then <command>LISTEN</command> (Tom Lane)
      </para>
 
      <para>
@@ -7525,14 +7701,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix performance issue in <literal>EXPLAIN (ANALYZE, TIMING OFF)</>
+      Fix performance issue in <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal>
       (Pavel Stehule)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove useless <quote>picksplit doesn't support secondary split</> log
+      Remove useless <quote>picksplit doesn't support secondary split</quote> log
       messages (Josh Hansen, Tom Lane)
      </para>
 
@@ -7547,7 +7723,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Remove vestigial secondary-split support in
-      <function>gist_box_picksplit()</> (Tom Lane)
+      <function>gist_box_picksplit()</function> (Tom Lane)
      </para>
 
      <para>
@@ -7566,29 +7742,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</> function
+      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</function> function
       (Alex Hunsaker, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to handle database names containing
-      <quote><literal>=</></quote> correctly (Heikki Linnakangas)
+      Fix <application>pg_dumpall</application> to handle database names containing
+      <quote><literal>=</literal></quote> correctly (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <application>pg_dump</> when an incorrect connection
+      Avoid crash in <application>pg_dump</application> when an incorrect connection
       string is given (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore invalid indexes in <application>pg_dump</> and
-      <application>pg_upgrade</> (Michael Paquier, Bruce Momjian)
+      Ignore invalid indexes in <application>pg_dump</application> and
+      <application>pg_upgrade</application> (Michael Paquier, Bruce Momjian)
      </para>
 
      <para>
@@ -7597,15 +7773,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       a uniqueness condition not satisfied by the table's data.  Also, if the
       index creation is in fact still in progress, it seems reasonable to
       consider it to be an uncommitted DDL change, which
-      <application>pg_dump</> wouldn't be expected to dump anyway.
-      <application>pg_upgrade</> now also skips invalid indexes rather than
+      <application>pg_dump</application> wouldn't be expected to dump anyway.
+      <application>pg_upgrade</application> now also skips invalid indexes rather than
       failing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_basebackup</>, include only the current server
+      In <application>pg_basebackup</application>, include only the current server
       version's subdirectory when backing up a tablespace (Heikki
       Linnakangas)
      </para>
@@ -7613,16 +7789,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Add a server version check in <application>pg_basebackup</> and
-      <application>pg_receivexlog</>, so they fail cleanly with version
+      Add a server version check in <application>pg_basebackup</application> and
+      <application>pg_receivexlog</application>, so they fail cleanly with version
       combinations that won't work (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle inconsistent settings of
-      <varname>DateStyle</> or <varname>IntervalStyle</> safely (Daniel
+      Fix <filename>contrib/dblink</filename> to handle inconsistent settings of
+      <varname>DateStyle</varname> or <varname>IntervalStyle</varname> safely (Daniel
       Farina, Tom Lane)
      </para>
 
@@ -7630,7 +7806,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       Previously, if the remote server had different settings of these
       parameters, ambiguous dates might be read incorrectly.  This fix
       ensures that datetime and interval columns fetched by a
-      <filename>dblink</> query will be interpreted correctly.  Note however
+      <filename>dblink</filename> query will be interpreted correctly.  Note however
       that inconsistent settings are still risky, since literal values
       appearing in SQL commands sent to the remote server might be
       interpreted differently than they would be locally.
@@ -7639,25 +7815,25 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s <function>similarity()</> function
+      Fix <filename>contrib/pg_trgm</filename>'s <function>similarity()</function> function
       to return zero for trigram-less strings (Tom Lane)
      </para>
 
      <para>
-      Previously it returned <literal>NaN</> due to internal division by zero.
+      Previously it returned <literal>NaN</literal> due to internal division by zero.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Enable building <productname>PostgreSQL</> with Microsoft Visual
+      Enable building <productname>PostgreSQL</productname> with Microsoft Visual
       Studio 2012 (Brar Piening, Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013b
+      Update time zone data files to <application>tzdata</application> release 2013b
       for DST law changes in Chile, Haiti, Morocco, Paraguay, and some
       Russian areas.  Also, historical zone data corrections for numerous
       places.
@@ -7665,12 +7841,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Also, update the time zone abbreviation files for recent changes in
-      Russia and elsewhere: <literal>CHOT</>, <literal>GET</>,
-      <literal>IRKT</>, <literal>KGT</>, <literal>KRAT</>, <literal>MAGT</>,
-      <literal>MAWT</>, <literal>MSK</>, <literal>NOVT</>, <literal>OMST</>,
-      <literal>TKT</>, <literal>VLAT</>, <literal>WST</>, <literal>YAKT</>,
-      <literal>YEKT</> now follow their current meanings, and
-      <literal>VOLT</> (Europe/Volgograd) and <literal>MIST</>
+      Russia and elsewhere: <literal>CHOT</literal>, <literal>GET</literal>,
+      <literal>IRKT</literal>, <literal>KGT</literal>, <literal>KRAT</literal>, <literal>MAGT</literal>,
+      <literal>MAWT</literal>, <literal>MSK</literal>, <literal>NOVT</literal>, <literal>OMST</literal>,
+      <literal>TKT</literal>, <literal>VLAT</literal>, <literal>WST</literal>, <literal>YAKT</literal>,
+      <literal>YEKT</literal> now follow their current meanings, and
+      <literal>VOLT</literal> (Europe/Volgograd) and <literal>MIST</literal>
       (Antarctica/Macquarie) are added to the default abbreviations list.
      </para>
     </listitem>
@@ -7715,7 +7891,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -7742,7 +7918,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This mistake could result in incorrect <quote>WAL ends before end of
-      online backup</> errors.
+      online backup</quote> errors.
      </para>
     </listitem>
 
@@ -7824,8 +8000,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Improve performance of <function>SPI_execute</> and related
-      functions, thereby improving PL/pgSQL's <literal>EXECUTE</>
+      Improve performance of <function>SPI_execute</function> and related
+      functions, thereby improving PL/pgSQL's <literal>EXECUTE</literal>
       (Heikki Linnakangas, Tom Lane)
      </para>
 
@@ -7860,20 +8036,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix intermittent crash in <literal>DROP INDEX CONCURRENTLY</> (Tom Lane)
+      Fix intermittent crash in <literal>DROP INDEX CONCURRENTLY</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix potential corruption of shared-memory lock table during
-      <command>CREATE/DROP INDEX CONCURRENTLY</> (Tom Lane)
+      <command>CREATE/DROP INDEX CONCURRENTLY</command> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>COPY</>'s multiple-tuple-insertion code for the case of
+      Fix <command>COPY</command>'s multiple-tuple-insertion code for the case of
       a tuple larger than page size minus fillfactor (Heikki Linnakangas)
      </para>
 
@@ -7885,19 +8061,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -7909,13 +8085,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix error in <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       implementation (Andres Freund)
      </para>
 
      <para>
       In installations that have existed for more than <link
-      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</></link>
+      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</varname></link>
       transactions, this mistake prevented autovacuum from using partial-table
       scans, so that a full-table scan would always happen instead.
      </para>
@@ -7923,13 +8099,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -7947,7 +8123,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       There were some issues with default privileges for types, and
-      <application>pg_dump</> failed to dump such privileges at all.
+      <application>pg_dump</application> failed to dump such privileges at all.
      </para>
     </listitem>
 
@@ -7967,13 +8143,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Reject out-of-range dates in <function>to_date()</> (Hitoshi Harada)
+      Reject out-of-range dates in <function>to_date()</function> (Hitoshi Harada)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_extension_config_dump()</> to handle
+      Fix <function>pg_extension_config_dump()</function> to handle
       extension-update cases properly (Tom Lane)
      </para>
 
@@ -7991,7 +8167,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       The previous coding resulted in sometimes omitting the first line in
-      the <literal>CONTEXT</> traceback for the error.
+      the <literal>CONTEXT</literal> traceback for the error.
      </para>
     </listitem>
 
@@ -8009,13 +8185,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
@@ -8023,74 +8199,74 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible error if a relation file is removed while
-      <application>pg_basebackup</> is running (Heikki Linnakangas)
+      <application>pg_basebackup</application> is running (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Tolerate timeline switches while <literal>pg_basebackup -X fetch</>
+      Tolerate timeline switches while <literal>pg_basebackup -X fetch</literal>
       is backing up a standby server (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> exclude data of unlogged tables when
+      Make <application>pg_dump</application> exclude data of unlogged tables when
       running on a hot-standby server (Magnus Hagander)
      </para>
 
      <para>
       This would fail anyway because the data is not available on the standby
       server, so it seems most convenient to assume
-      <option>--no-unlogged-table-data</> automatically.
+      <option>--no-unlogged-table-data</option> automatically.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to deal with invalid indexes safely
+      Fix <application>pg_upgrade</application> to deal with invalid indexes safely
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s -O/-o options (Marti Raudsepp)
+      Fix <application>pg_upgrade</application>'s -O/-o options (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> use translated messages properly
+      Make <application>ecpglib</application> use translated messages properly
       (Chen Huajun)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly install <application>ecpg_compat</> and
-      <application>pgtypes</> libraries on MSVC (Jiang Guiqing)
+      Properly install <application>ecpg_compat</application> and
+      <application>pgtypes</application> libraries on MSVC (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Include our version of <function>isinf()</> in
-      <application>libecpg</> if it's not provided by the system
+      Include our version of <function>isinf()</function> in
+      <application>libecpg</application> if it's not provided by the system
       (Jiang Guiqing)
      </para>
     </listitem>
@@ -8110,15 +8286,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -8153,7 +8329,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </para>
 
    <para>
-    However, you may need to perform <command>REINDEX</> operations to
+    However, you may need to perform <command>REINDEX</command> operations to
     correct problems in concurrently-built indexes, as described in the first
     changelog item below.
    </para>
@@ -8173,22 +8349,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE/DROP INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane, Simon Riggs, Pavan Deolasee)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane, Simon Riggs, Pavan Deolasee)
      </para>
 
      <para>
-      An error introduced while adding <command>DROP INDEX CONCURRENTLY</>
+      An error introduced while adding <command>DROP INDEX CONCURRENTLY</command>
       allowed incorrect indexing decisions to be made during the initial
-      phase of <command>CREATE INDEX CONCURRENTLY</>; so that indexes built
+      phase of <command>CREATE INDEX CONCURRENTLY</command>; so that indexes built
       by that command could be corrupt.  It is recommended that indexes
-      built in 9.2.X with <command>CREATE INDEX CONCURRENTLY</> be rebuilt
+      built in 9.2.X with <command>CREATE INDEX CONCURRENTLY</command> be rebuilt
       after applying this update.
      </para>
 
      <para>
-      In addition, fix <command>CREATE/DROP INDEX CONCURRENTLY</> to use
+      In addition, fix <command>CREATE/DROP INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       again resulting in corrupt concurrently-created indexes.
      </para>
@@ -8196,33 +8372,33 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
 
      <para>
-      Also fix <command>DROP INDEX CONCURRENTLY</> to not disable
+      Also fix <command>DROP INDEX CONCURRENTLY</command> to not disable
       insertions into the target index until all queries using it are done.
      </para>
 
      <para>
-      Also fix misbehavior if <command>DROP INDEX CONCURRENTLY</> is
+      Also fix misbehavior if <command>DROP INDEX CONCURRENTLY</command> is
       canceled: the previous coding could leave an un-droppable index behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correct predicate locking for <command>DROP INDEX CONCURRENTLY</>
+      Correct predicate locking for <command>DROP INDEX CONCURRENTLY</command>
       (Kevin Grittner)
      </para>
 
      <para>
       Previously, SSI predicate locks were processed at the wrong time,
       possibly leading to incorrect behavior of serializable transactions
-      executing in parallel with the <command>DROP</>.
+      executing in parallel with the <command>DROP</command>.
      </para>
     </listitem>
 
@@ -8280,13 +8456,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This oversight could prevent subsequent execution of certain
-      operations such as <command>CREATE INDEX CONCURRENTLY</>.
+      operations such as <command>CREATE INDEX CONCURRENTLY</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid bogus <quote>out-of-sequence timeline ID</> errors in standby
+      Avoid bogus <quote>out-of-sequence timeline ID</quote> errors in standby
       mode (Heikki Linnakangas)
      </para>
     </listitem>
@@ -8306,20 +8482,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix the syslogger process to not fail when
-      <varname>log_rotation_age</> exceeds 2^31 milliseconds (about 25 days)
+      <varname>log_rotation_age</varname> exceeds 2^31 milliseconds (about 25 days)
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>WaitLatch()</> to return promptly when the requested
+      Fix <function>WaitLatch()</function> to return promptly when the requested
       timeout expires (Jeff Janes, Tom Lane)
      </para>
 
      <para>
       With the previous coding, a steady stream of non-wait-terminating
-      interrupts could delay return from <function>WaitLatch()</>
+      interrupts could delay return from <function>WaitLatch()</function>
       indefinitely.  This has been shown to be a problem for the autovacuum
       launcher process, and might cause trouble elsewhere as well.
      </para>
@@ -8372,8 +8548,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
       9.2 showed this type of error in more cases than previous releases,
       but the basic bug has been there for a long time.
      </para>
@@ -8381,13 +8557,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>SELECT DISTINCT</> with index-optimized
-      <function>MIN</>/<function>MAX</> on an inheritance tree (Tom Lane)
+      Fix <command>SELECT DISTINCT</command> with index-optimized
+      <function>MIN</function>/<function>MAX</function> on an inheritance tree (Tom Lane)
      </para>
 
      <para>
       The planner would fail with <quote>failed to re-find MinMaxAggInfo
-      record</> given this combination of factors.
+      record</quote> given this combination of factors.
      </para>
     </listitem>
 
@@ -8407,7 +8583,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A strict join clause can be sufficient to establish an
-      <replaceable>x</> <literal>IS NOT NULL</> predicate, for example.
+      <replaceable>x</replaceable> <literal>IS NOT NULL</literal> predicate, for example.
       This fixes a planner regression in 9.2, since previous versions could
       make comparable deductions.
      </para>
@@ -8434,10 +8610,10 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -8450,8 +8626,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This oversight could result in wrong answers from merge joins whose
       inner side is an index scan using an
-      <literal><replaceable>indexed_column</> =
-      ANY(<replaceable>array</>)</literal> condition.
+      <literal><replaceable>indexed_column</replaceable> =
+      ANY(<replaceable>array</replaceable>)</literal> condition.
      </para>
     </listitem>
 
@@ -8475,12 +8651,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
       In very unusual circumstances, this oversight could result in passing
-      incorrect data to a trigger <literal>WHEN</> condition, or to the
+      incorrect data to a trigger <literal>WHEN</literal> condition, or to the
       precheck logic for a foreign-key enforcement trigger.  That could
       result in a crash, or in an incorrect decision about whether to
       fire the trigger.
@@ -8489,7 +8665,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to handle inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to handle inherited check
       constraints properly (Pavan Deolasee)
      </para>
 
@@ -8501,7 +8677,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER EXTENSION SET SCHEMA</>'s failure  to move some
+      Fix <command>ALTER EXTENSION SET SCHEMA</command>'s failure  to move some
       subsidiary objects into the new schema (&Aacute;lvaro Herrera, Dimitri
       Fontaine)
      </para>
@@ -8509,7 +8685,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Handle <command>CREATE TABLE AS EXECUTE</> correctly in extended query
+      Handle <command>CREATE TABLE AS EXECUTE</command> correctly in extended query
       protocol (Tom Lane)
      </para>
     </listitem>
@@ -8517,7 +8693,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Don't modify the input parse tree in <command>DROP RULE IF NOT
-      EXISTS</> and <command>DROP TRIGGER IF NOT EXISTS</> (Tom Lane)
+      EXISTS</command> and <command>DROP TRIGGER IF NOT EXISTS</command> (Tom Lane)
      </para>
 
      <para>
@@ -8528,14 +8704,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -8549,7 +8725,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -8557,7 +8733,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -8579,22 +8755,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix failure to advance XID epoch if XID wraparound happens during a
-      checkpoint and <varname>wal_level</> is <literal>hot_standby</>
+      checkpoint and <varname>wal_level</varname> is <literal>hot_standby</literal>
       (Tom Lane, Andres Freund)
      </para>
 
      <para>
       While this mistake had no particular impact on
       <productname>PostgreSQL</productname> itself, it was bad for
-      applications that rely on <function>txid_current()</> and related
+      applications that rely on <function>txid_current()</function> and related
       functions: the TXID value would appear to go backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_terminate_backend()</> and
-      <function>pg_cancel_backend()</> to not throw error for a non-existent
+      Fix <function>pg_terminate_backend()</function> and
+      <function>pg_cancel_backend()</function> to not throw error for a non-existent
       target process (Josh Kupershmidt)
      </para>
 
@@ -8607,7 +8783,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix display of
-      <structname>pg_stat_replication</>.<structfield>sync_state</> at a
+      <structname>pg_stat_replication</structname>.<structfield>sync_state</structfield> at a
       page boundary (Kyotaro Horiguchi)
      </para>
     </listitem>
@@ -8621,7 +8797,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -8646,8 +8822,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -8657,45 +8833,45 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> dump <literal>SEQUENCE SET</> items in
+      Make <application>pg_dump</application> dump <literal>SEQUENCE SET</literal> items in
       the data not pre-data section of the archive (Tom Lane)
      </para>
 
      <para>
       This fixes an undesirable inconsistency between the meanings of
-      <option>--data-only</> and <option>--section=data</>, and also fixes
+      <option>--data-only</option> and <option>--section=data</option>, and also fixes
       dumping of sequences that are marked as extension configuration tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s handling of <command>DROP DATABASE</>
-      commands in <option>--clean</> mode (Guillaume Lelarge)
+      Fix <application>pg_dump</application>'s handling of <command>DROP DATABASE</command>
+      commands in <option>--clean</option> mode (Guillaume Lelarge)
      </para>
 
      <para>
-      Beginning in 9.2.0, <literal>pg_dump --clean</> would issue a
-      <command>DROP DATABASE</> command, which was either useless or
+      Beginning in 9.2.0, <literal>pg_dump --clean</literal> would issue a
+      <command>DROP DATABASE</command> command, which was either useless or
       dangerous depending on the usage scenario.  It no longer does that.
-      This change also fixes the combination of <option>--clean</> and
-      <option>--create</> to work sensibly, i.e., emit <command>DROP
-      DATABASE</> then <command>CREATE DATABASE</> before reconnecting to the
+      This change also fixes the combination of <option>--clean</option> and
+      <option>--create</option> to work sensibly, i.e., emit <command>DROP
+      DATABASE</command> then <command>CREATE DATABASE</command> before reconnecting to the
       target database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> for views with circular dependencies and
+      Fix <application>pg_dump</application> for views with circular dependencies and
       no relation options (Tom Lane)
      </para>
 
@@ -8703,31 +8879,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       The previous fix to dump relation options when a view is
       involved in a circular dependency didn't work right for the case
       that the view has no options; it emitted <literal>ALTER VIEW foo
-      SET ()</> which is invalid syntax.
+      SET ()</literal> which is invalid syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -8738,82 +8914,82 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <literal>tar</> files emitted by <application>pg_basebackup</> to
+      Fix <literal>tar</literal> files emitted by <application>pg_basebackup</application> to
       be POSIX conformant (Brian Weaver, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s <function>ecpg_get_data</> function to
+      Fix <application>ecpg</application>'s <function>ecpg_get_data</function> function to
       handle arrays properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <application>pg_upgrade</> from trying to process TOAST tables
+      Prevent <application>pg_upgrade</application> from trying to process TOAST tables
       for system catalogs (Bruce Momjian)
      </para>
 
      <para>
-      This fixes an error seen when the <literal>information_schema</> has
+      This fixes an error seen when the <literal>information_schema</literal> has
       been dropped and recreated.  Other failures were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_upgrade</> performance by setting
-      <varname>synchronous_commit</> to <literal>off</> in the new cluster
+      Improve <application>pg_upgrade</application> performance by setting
+      <varname>synchronous_commit</varname> to <literal>off</literal> in the new cluster
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Work around unportable behavior of <literal>malloc(0)</> and
-      <literal>realloc(NULL, 0)</> (Tom Lane)
+      Work around unportable behavior of <literal>malloc(0)</literal> and
+      <literal>realloc(NULL, 0)</literal> (Tom Lane)
      </para>
 
      <para>
-      On platforms where these calls return <literal>NULL</>, some code
+      On platforms where these calls return <literal>NULL</literal>, some code
       mistakenly thought that meant out-of-memory.
-      This is known to have broken <application>pg_dump</> for databases
+      This is known to have broken <application>pg_dump</application> for databases
       containing no user-defined aggregates.  There might be other cases
       as well.
      </para>
@@ -8821,19 +8997,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <literal>make install</> for an extension creates the
-      <filename>extension</> installation directory (C&eacute;dric Villemain)
+      Ensure that <literal>make install</literal> for an extension creates the
+      <filename>extension</filename> installation directory (C&eacute;dric Villemain)
      </para>
 
      <para>
-      Previously, this step was missed if <varname>MODULEDIR</> was set in
+      Previously, this step was missed if <varname>MODULEDIR</varname> was set in
       the extension's Makefile.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -8844,7 +9020,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -8877,8 +9053,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </para>
 
    <para>
-    However, you may need to perform <command>REINDEX</> and/or
-    <command>VACUUM</> operations to recover from the effects of the data
+    However, you may need to perform <command>REINDEX</command> and/or
+    <command>VACUUM</command> operations to recover from the effects of the data
     corruption bug described in the first changelog item below.
    </para>
 
@@ -8903,7 +9079,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       likely to occur on standby slave servers since those perform much
       more WAL replay.  There is a low probability of corruption of btree
       and GIN indexes.  There is a much higher probability of corruption
-      of table <quote>visibility maps</>, which might lead to wrong answers
+      of table <quote>visibility maps</quote>, which might lead to wrong answers
       from index-only scans.  Table data proper cannot be corrupted by this
       bug.
      </para>
@@ -8911,16 +9087,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       While no index corruption due to this bug is known to have occurred
       in the field, as a precautionary measure it is recommended that
-      production installations <command>REINDEX</> all btree and GIN
+      production installations <command>REINDEX</command> all btree and GIN
       indexes at a convenient time after upgrading to 9.2.1.
      </para>
 
      <para>
-      Also, it is recommended to perform a <command>VACUUM</> of all tables
+      Also, it is recommended to perform a <command>VACUUM</command> of all tables
       while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any incorrect visibility map data.  <link
-      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</></link>
+      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</varname></link>
       can be adjusted to reduce the performance impact of vacuuming, while
       causing it to take longer to finish.
      </para>
@@ -8929,14 +9105,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible incorrect sorting of output from queries involving
-      <literal>WHERE <replaceable>indexed_column</> IN
-      (<replaceable>list_of_values</>)</literal> (Tom Lane)
+      <literal>WHERE <replaceable>indexed_column</replaceable> IN
+      (<replaceable>list_of_values</replaceable>)</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner failure for queries involving <literal>GROUP BY</>
+      Fix planner failure for queries involving <literal>GROUP BY</literal>
       expressions along with window functions and aggregates (Tom Lane)
      </para>
     </listitem>
@@ -8948,7 +9124,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This error could result in wrong answers from queries that scan the
-      same <literal>WITH</> subquery multiple times.
+      same <literal>WITH</literal> subquery multiple times.
      </para>
     </listitem>
 
@@ -8961,7 +9137,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Improve selectivity estimation for text search queries involving
-      prefixes, i.e. <replaceable>word</><literal>:*</> patterns  (Tom Lane)
+      prefixes, i.e. <replaceable>word</replaceable><literal>:*</literal> patterns  (Tom Lane)
      </para>
     </listitem>
 
@@ -8972,14 +9148,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A command that needed no locks other than ones its transaction already
-      had might fail to notice a concurrent <command>GRANT</> or
-      <command>REVOKE</> that committed since the start of its transaction.
+      had might fail to notice a concurrent <command>GRANT</command> or
+      <command>REVOKE</command> that committed since the start of its transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</> to not fail when a column is a domain over an
+      Fix <command>ANALYZE</command> to not fail when a column is a domain over an
       array type (Tom Lane)
      </para>
     </listitem>
@@ -8998,7 +9174,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -9006,14 +9182,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Remove unnecessary dependency on <application>pg_config</> from
-      <application>pg_upgrade</> (Peter Eisentraut)
+      Remove unnecessary dependency on <application>pg_config</application> from
+      <application>pg_upgrade</application> (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -9047,7 +9223,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow queries to retrieve data only from indexes, avoiding heap
-        access (<firstterm>index-only scans</>)
+        access (<firstterm>index-only scans</firstterm>)
        </para>
       </listitem>
 
@@ -9069,14 +9245,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Allow streaming replication slaves to forward data to other slaves
         (<link linkend="cascading-replication"><firstterm>cascading
-        replication</></link>)
+        replication</firstterm></link>)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         to make base backups from standby servers
        </para>
       </listitem>
@@ -9084,14 +9260,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         tool to archive WAL file changes as they are written
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <link linkend="SPGiST">SP-GiST</link> (Space-Partitioned
+        Add the <link linkend="spgist">SP-GiST</link> (Space-Partitioned
         GiST) index access method
        </para>
       </listitem>
@@ -9112,14 +9288,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="SQL-CREATEVIEW"><literal>security_barrier</></link>
+        linkend="sql-createview"><literal>security_barrier</literal></link>
         option for views
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>libpq</> connection strings to have the format of a
+        Allow <application>libpq</application> connection strings to have the format of a
         <link linkend="libpq-connstring"><acronym>URI</acronym></link>
        </para>
       </listitem>
@@ -9127,7 +9303,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link linkend="libpq-single-row-mode">single-row processing
-        mode</link> to <application>libpq</> for better handling of large
+        mode</link> to <application>libpq</application> for better handling of large
         result sets
        </para>
       </listitem>
@@ -9162,8 +9338,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Remove the <structfield>spclocation</> field from <link
-        linkend="catalog-pg-tablespace"><structname>pg_tablespace</></link>
+        Remove the <structfield>spclocation</structfield> field from <link
+        linkend="catalog-pg-tablespace"><structname>pg_tablespace</structname></link>
         (Magnus Hagander)
        </para>
 
@@ -9173,23 +9349,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         a tablespace.  This change allows tablespace directories to be moved
         while the server is down, by manually adjusting the symbolic links.
         To replace this field, we have added <link
-        linkend="functions-info-catalog-table"><function>pg_tablespace_location()</></link>
+        linkend="functions-info-catalog-table"><function>pg_tablespace_location()</function></link>
         to allow querying of the symbolic links.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Move <type>tsvector</> most-common-element statistics to new
-        <link linkend="view-pg-stats"><structname>pg_stats</></link> columns
+        Move <type>tsvector</type> most-common-element statistics to new
+        <link linkend="view-pg-stats"><structname>pg_stats</structname></link> columns
         (Alexander Korotkov)
        </para>
 
        <para>
-        Consult <structfield>most_common_elems</>
-        and <structfield>most_common_elem_freqs</> for the data formerly
-        available in <structfield>most_common_vals</>
-        and <structfield>most_common_freqs</> for a <type>tsvector</> column.
+        Consult <structfield>most_common_elems</structfield>
+        and <structfield>most_common_elem_freqs</structfield> for the data formerly
+        available in <structfield>most_common_vals</structfield>
+        and <structfield>most_common_freqs</structfield> for a <type>tsvector</type> column.
        </para>
       </listitem>
 
@@ -9204,14 +9380,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Remove <link linkend="hstore">hstore</link>'s <literal>=&gt;</>
+        Remove <link linkend="hstore">hstore</link>'s <literal>=&gt;</literal>
         operator (Robert Haas)
        </para>
 
        <para>
-        Users should now use <function>hstore(text, text)</>.  Since
+        Users should now use <function>hstore(text, text)</function>.  Since
         <productname>PostgreSQL</productname> 9.0, a warning message has been
-        emitted when an operator named <literal>=&gt;</> is created because
+        emitted when an operator named <literal>=&gt;</literal> is created because
         the <acronym>SQL</acronym> standard reserves that token for
         another use.
        </para>
@@ -9220,7 +9396,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Ensure that <link
-        linkend="functions-xml-processing"><function>xpath()</></link>
+        linkend="functions-xml-processing"><function>xpath()</function></link>
         escapes special characters in string values (Florian Pflug)
        </para>
 
@@ -9233,13 +9409,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make <link
-        linkend="functions-admin-dbobject"><function>pg_relation_size()</></link>
+        linkend="functions-admin-dbobject"><function>pg_relation_size()</function></link>
         and friends return NULL if the object does not exist (Phil Sorber)
        </para>
 
        <para>
         This prevents queries that call these functions from returning
-        errors immediately after a concurrent <command>DROP</>.
+        errors immediately after a concurrent <command>DROP</command>.
        </para>
       </listitem>
 
@@ -9247,7 +9423,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Make <link
         linkend="functions-datetime-extract"><function>EXTRACT(EPOCH FROM
-        <replaceable>timestamp without time zone</>)</function></link>
+        <replaceable>timestamp without time zone</replaceable>)</function></link>
         measure the epoch from local midnight, not <acronym>UTC</acronym>
         midnight (Tom Lane)
        </para>
@@ -9256,17 +9432,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         This change reverts an ill-considered change made in release 7.3.
         Measuring from <acronym>UTC</acronym> midnight was inconsistent
         because it made the result dependent on the <link
-        linkend="guc-timezone"><varname>timezone</></link> setting, which
-        computations for <type>timestamp without time zone</> should not be.
+        linkend="guc-timezone"><varname>timezone</varname></link> setting, which
+        computations for <type>timestamp without time zone</type> should not be.
         The previous behavior remains available by casting the input value
-        to <type>timestamp with time zone</>.
+        to <type>timestamp with time zone</type>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Properly parse time strings with trailing <literal>yesterday</>,
-        <literal>today</>, and <literal>tomorrow</> (Dean Rasheed)
+        Properly parse time strings with trailing <literal>yesterday</literal>,
+        <literal>today</literal>, and <literal>tomorrow</literal> (Dean Rasheed)
        </para>
 
        <para>
@@ -9278,8 +9454,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Fix <link
-        linkend="functions-formatting"><function>to_date()</></link> and
-        <function>to_timestamp()</> to wrap incomplete dates toward 2020
+        linkend="functions-formatting"><function>to_date()</function></link> and
+        <function>to_timestamp()</function> to wrap incomplete dates toward 2020
         (Bruce Momjian)
        </para>
 
@@ -9300,7 +9476,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Prevent  <link linkend="SQL-ALTERDOMAIN"><command>ALTER
+        Prevent  <link linkend="sql-alterdomain"><command>ALTER
         DOMAIN</command></link> from working on non-domain types (Peter
         Eisentraut)
        </para>
@@ -9314,15 +9490,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         No longer forcibly lowercase procedural language names in <link
-        linkend="SQL-CREATEFUNCTION"><command>CREATE FUNCTION</></link>
+        linkend="sql-createfunction"><command>CREATE FUNCTION</command></link>
         (Robert Haas)
        </para>
 
        <para>
         While unquoted language identifiers are still lowercased, strings
         and quoted identifiers are no longer forcibly down-cased.
-        Thus for example <literal>CREATE FUNCTION ... LANGUAGE 'C'</>
-        will no longer work; it must be spelled <literal>'c'</>, or better
+        Thus for example <literal>CREATE FUNCTION ... LANGUAGE 'C'</literal>
+        will no longer work; it must be spelled <literal>'c'</literal>, or better
         omit the quotes.
        </para>
       </listitem>
@@ -9352,15 +9528,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Provide consistent backquote, variable
         expansion, and quoted substring behavior in <link
-        linkend="APP-PSQL"><application>psql</></link> meta-command
+        linkend="app-psql"><application>psql</application></link> meta-command
         arguments (Tom Lane)
        </para>
 
        <para>
         Previously, such references were treated oddly when not separated by
-        whitespace from adjacent text.  For example <literal>'FOO'BAR</> was
-        output as <literal>FOO BAR</> (unexpected insertion of a space) and
-        <literal>FOO'BAR'BAZ</> was output unchanged (not removing the quotes
+        whitespace from adjacent text.  For example <literal>'FOO'BAR</literal> was
+        output as <literal>FOO BAR</literal> (unexpected insertion of a space) and
+        <literal>FOO'BAR'BAZ</literal> was output unchanged (not removing the quotes
         as most would expect).
        </para>
       </listitem>
@@ -9368,9 +9544,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         No longer treat <link
-        linkend="APP-CLUSTERDB"><application>clusterdb</></link>
+        linkend="app-clusterdb"><application>clusterdb</application></link>
         table names as double-quoted; no longer treat <link
-        linkend="APP-REINDEXDB"><application>reindexdb</></link> table
+        linkend="app-reindexdb"><application>reindexdb</application></link> table
         and index names as double-quoted (Bruce Momjian)
        </para>
 
@@ -9382,20 +9558,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        <link linkend="APP-CREATEUSER"><application>createuser</></link>
+        <link linkend="app-createuser"><application>createuser</application></link>
         no longer prompts for option settings by default (Peter Eisentraut)
        </para>
 
        <para>
-        Use <option>--interactive</> to obtain the old behavior.
+        Use <option>--interactive</option> to obtain the old behavior.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Disable prompting for the user name in <link
-        linkend="APP-DROPUSER"><application>dropuser</></link> unless
-        <option>--interactive</> is specified (Peter Eisentraut)
+        linkend="app-dropuser"><application>dropuser</application></link> unless
+        <option>--interactive</option> is specified (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -9417,36 +9593,36 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This allows changing the names and locations of the files that were
-        previously hard-coded as <filename>server.crt</>,
-        <filename>server.key</>, <filename>root.crt</>, and
-        <filename>root.crl</> in the data directory.
-        <emphasis>The server will no longer examine <filename>root.crt</> or
-        <filename>root.crl</> by default</emphasis>; to load these files, the
+        previously hard-coded as <filename>server.crt</filename>,
+        <filename>server.key</filename>, <filename>root.crt</filename>, and
+        <filename>root.crl</filename> in the data directory.
+        <emphasis>The server will no longer examine <filename>root.crt</filename> or
+        <filename>root.crl</filename> by default</emphasis>; to load these files, the
         associated parameters must be set to non-default values.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>silent_mode</> parameter (Heikki Linnakangas)
+        Remove the <varname>silent_mode</varname> parameter (Heikki Linnakangas)
        </para>
 
        <para>
         Similar behavior can be obtained with <command>pg_ctl start
-        -l postmaster.log</>.
+        -l postmaster.log</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>wal_sender_delay</> parameter,
+        Remove the <varname>wal_sender_delay</varname> parameter,
         as it is no longer needed (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>custom_variable_classes</> parameter (Tom Lane)
+        Remove the <varname>custom_variable_classes</varname> parameter (Tom Lane)
        </para>
 
        <para>
@@ -9466,19 +9642,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Rename <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</></link><structfield>.procpid</>
-        to <structfield>pid</>, to match other system tables (Magnus Hagander)
+        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</structname></link><structfield>.procpid</structfield>
+        to <structfield>pid</structfield>, to match other system tables (Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Create a separate <structfield>pg_stat_activity</> column to
+        Create a separate <structfield>pg_stat_activity</structfield> column to
         report process state (Scott Mead, Magnus Hagander)
        </para>
 
        <para>
-        The previous <structfield>query</> and <structfield>query_start</>
+        The previous <structfield>query</structfield> and <structfield>query_start</structfield>
         values now remain available for an idle session, allowing enhanced
         analysis.
        </para>
@@ -9486,8 +9662,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Rename <structname>pg_stat_activity</>.<structfield>current_query</> to
-        <structfield>query</> because it is not cleared when the query
+        Rename <structname>pg_stat_activity</structname>.<structfield>current_query</structfield> to
+        <structfield>query</structfield> because it is not cleared when the query
         completes (Magnus Hagander)
        </para>
       </listitem>
@@ -9495,24 +9671,24 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Change all <acronym>SQL</acronym>-level statistics timing values
-        to be <type>float8</> columns measured in milliseconds (Tom Lane)
+        to be <type>float8</type> columns measured in milliseconds (Tom Lane)
        </para>
 
        <para>
         This change eliminates the designed-in assumption that the values
-        are accurate to microseconds and no more (since the <type>float8</>
+        are accurate to microseconds and no more (since the <type>float8</type>
         values can be fractional).
         The columns affected are
-        <structname>pg_stat_user_functions</>.<structfield>total_time</>,
-        <structname>pg_stat_user_functions</>.<structfield>self_time</>,
-        <structname>pg_stat_xact_user_functions</>.<structfield>total_time</>,
+        <structname>pg_stat_user_functions</structname>.<structfield>total_time</structfield>,
+        <structname>pg_stat_user_functions</structname>.<structfield>self_time</structfield>,
+        <structname>pg_stat_xact_user_functions</structname>.<structfield>total_time</structfield>,
         and
-        <structname>pg_stat_xact_user_functions</>.<structfield>self_time</>.
+        <structname>pg_stat_xact_user_functions</structname>.<structfield>self_time</structfield>.
         The statistics functions underlying these columns now also return
-        <type>float8</> milliseconds, rather than <type>bigint</>
+        <type>float8</type> milliseconds, rather than <type>bigint</type>
         microseconds.
-        <filename>contrib/pg_stat_statements</>'
-        <structfield>total_time</> column is now also measured in
+        <filename>contrib/pg_stat_statements</filename>'
+        <structfield>total_time</structfield> column is now also measured in
         milliseconds.
        </para>
       </listitem>
@@ -9546,7 +9722,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This feature is often called <firstterm>index-only scans</>.
+        This feature is often called <firstterm>index-only scans</firstterm>.
         Heap access can be skipped for heap pages containing only tuples that
         are visible to all sessions, as reported by the visibility map; so
         the benefit applies mainly to mostly-static data.  The visibility map
@@ -9556,7 +9732,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add the <link linkend="SPGiST">SP-GiST</link> (Space-Partitioned
+        Add the <link linkend="spgist">SP-GiST</link> (Space-Partitioned
         GiST) index access method (Teodor Sigaev, Oleg Bartunov, Tom
         Lane)
        </para>
@@ -9618,7 +9794,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Move the frequently accessed members of the <structname>PGPROC</>
+        Move the frequently accessed members of the <structname>PGPROC</structname>
         shared memory array to a separate array (Pavan
         Deolasee, Heikki Linnakangas, Robert Haas)
        </para>
@@ -9663,7 +9839,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make the number of CLOG buffers scale based on <link
-        linkend="guc-shared-buffers"><varname>shared_buffers</></link>
+        linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
         (Robert Haas, Simon Riggs, Tom Lane)
        </para>
       </listitem>
@@ -9724,7 +9900,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         Previously, only <link
-        linkend="guc-wal-writer-delay"><varname>wal_writer_delay</></link>
+        linkend="guc-wal-writer-delay"><varname>wal_writer_delay</varname></link>
         triggered <acronym>WAL</acronym> flushing to disk; now filling a
         <acronym>WAL</acronym> buffer also triggers <acronym>WAL</acronym>
         writes.
@@ -9763,7 +9939,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         In the past, a prepared statement always had a single
-        <quote>generic</> plan that was used for all parameter values, which
+        <quote>generic</quote> plan that was used for all parameter values, which
         was frequently much inferior to the plans used for non-prepared
         statements containing explicit constant values.  Now, the planner
         attempts to generate custom plans for specific parameter values.
@@ -9781,7 +9957,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        The new <quote>parameterized path</> mechanism allows inner
+        The new <quote>parameterized path</quote> mechanism allows inner
         index scans to use values from relations that are more than one join
         level up from the scan.  This can greatly improve performance in
         situations where semantic restrictions (such as outer joins) limit
@@ -9796,7 +9972,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Wrappers can now provide multiple access <quote>paths</> for their
+        Wrappers can now provide multiple access <quote>paths</quote> for their
         tables, allowing more flexibility in join planning.
        </para>
       </listitem>
@@ -9809,14 +9985,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This check is only performed when <link
-        linkend="guc-constraint-exclusion"><varname>constraint_exclusion</></link>
+        linkend="guc-constraint-exclusion"><varname>constraint_exclusion</varname></link>
         is <literal>on</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <literal>indexed_col op ANY(ARRAY[...])</> conditions to be
+        Allow <literal>indexed_col op ANY(ARRAY[...])</literal> conditions to be
         used in plain index scans and index-only scans (Tom Lane)
        </para>
 
@@ -9827,14 +10003,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Support <function>MIN</>/<function>MAX</> index optimizations on
+        Support <function>MIN</function>/<function>MAX</function> index optimizations on
         <type>boolean</type> columns (Marti Raudsepp)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Account for set-returning functions in <command>SELECT</> target
+        Account for set-returning functions in <command>SELECT</command> target
         lists when setting row count estimates (Tom Lane)
        </para>
       </listitem>
@@ -9882,7 +10058,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve statistical estimates for subqueries using
-        <literal>DISTINCT</> (Tom Lane)
+        <literal>DISTINCT</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -9897,13 +10073,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Do not treat role names and <literal>samerole</> specified in <link
+        Do not treat role names and <literal>samerole</literal> specified in <link
         linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         as automatically including superusers (Andrew Dunstan)
        </para>
 
        <para>
-        This makes it easier to use <literal>reject</> lines with group roles.
+        This makes it easier to use <literal>reject</literal> lines with group roles.
        </para>
       </listitem>
 
@@ -9958,7 +10134,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This logging is triggered by <link
-        linkend="guc-log-autovacuum-min-duration"><varname>log_autovacuum_min_duration</></link>.
+        linkend="guc-log-autovacuum-min-duration"><varname>log_autovacuum_min_duration</varname></link>.
        </para>
       </listitem>
 
@@ -9977,7 +10153,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-admin-backup"><function>pg_xlog_location_diff()</></link>
+        linkend="functions-admin-backup"><function>pg_xlog_location_diff()</function></link>
         to simplify WAL location comparisons (Euler Taveira de Oliveira)
        </para>
 
@@ -9995,15 +10171,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         This allows different instances to use the event log
         with different identifiers, by setting the <link
-        linkend="guc-event-source"><varname>event_source</></link>
+        linkend="guc-event-source"><varname>event_source</varname></link>
         server parameter, which is similar to how <link
-        linkend="guc-syslog-ident"><varname>syslog_ident</></link> works.
+        linkend="guc-syslog-ident"><varname>syslog_ident</varname></link> works.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <quote>unexpected EOF</> messages to <literal>DEBUG1</> level,
+        Change <quote>unexpected EOF</quote> messages to <literal>DEBUG1</literal> level,
         except when there is an open transaction (Magnus Hagander)
        </para>
 
@@ -10025,14 +10201,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Track temporary file sizes and file counts in the <link
-        linkend="pg-stat-database-view"><structname>pg_stat_database</></link>
+        linkend="pg-stat-database-view"><structname>pg_stat_database</structname></link>
         system view (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a deadlock counter to the <structname>pg_stat_database</>
+        Add a deadlock counter to the <structname>pg_stat_database</structname>
         system view (Magnus Hagander)
        </para>
       </listitem>
@@ -10040,7 +10216,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a server parameter <link
-        linkend="guc-track-io-timing"><varname>track_io_timing</></link>
+        linkend="guc-track-io-timing"><varname>track_io_timing</varname></link>
         to track I/O timings (Ants Aasma, Robert Haas)
        </para>
       </listitem>
@@ -10048,7 +10224,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Report checkpoint timing information in <link
-        linkend="pg-stat-bgwriter-view"><structname>pg_stat_bgwriter</></link>
+        linkend="pg-stat-bgwriter-view"><structname>pg_stat_bgwriter</structname></link>
         (Greg Smith, Peter Geoghegan)
        </para>
       </listitem>
@@ -10065,7 +10241,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Silently ignore nonexistent schemas specified in <link
-        linkend="guc-search-path"><varname>search_path</></link> (Tom Lane)
+        linkend="guc-search-path"><varname>search_path</varname></link> (Tom Lane)
        </para>
 
        <para>
@@ -10077,12 +10253,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow superusers to set <link
-        linkend="guc-deadlock-timeout"><varname>deadlock_timeout</></link>
+        linkend="guc-deadlock-timeout"><varname>deadlock_timeout</varname></link>
         per-session, not just per-cluster (Noah Misch)
        </para>
 
        <para>
-        This allows <varname>deadlock_timeout</> to be reduced for
+        This allows <varname>deadlock_timeout</varname> to be reduced for
         transactions that are likely to be involved in a deadlock, thus
         detecting the failure more quickly.  Alternatively, increasing the
         value can be used to reduce the chances of a session being chosen for
@@ -10093,7 +10269,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a server parameter <link
-        linkend="guc-temp-file-limit"><varname>temp_file_limit</></link>
+        linkend="guc-temp-file-limit"><varname>temp_file_limit</varname></link>
         to constrain temporary file space usage per session (Mark Kirkwood)
        </para>
       </listitem>
@@ -10114,13 +10290,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="app-postmaster">postmaster</link> <option>-C</>
+        Add <link linkend="app-postmaster">postmaster</link> <option>-C</option>
         option to query configuration parameters (Bruce Momjian)
        </para>
 
        <para>
-        This allows <application>pg_ctl</> to better handle cases where
-        <envar>PGDATA</> or <option>-D</> points to a configuration-only
+        This allows <application>pg_ctl</application> to better handle cases where
+        <envar>PGDATA</envar> or <option>-D</option> points to a configuration-only
         directory.
        </para>
       </listitem>
@@ -10128,14 +10304,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Replace an empty locale name with the implied value in
-        <command>CREATE DATABASE</>
+        <command>CREATE DATABASE</command>
         (Tom Lane)
        </para>
 
        <para>
         This prevents cases where
-        <structname>pg_database</>.<structfield>datcollate</> or
-        <structfield>datctype</> could be interpreted differently after a
+        <structname>pg_database</structname>.<structfield>datcollate</structfield> or
+        <structfield>datctype</structfield> could be interpreted differently after a
         server restart.
        </para>
       </listitem>
@@ -10170,22 +10346,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add an <literal>include_if_exists</> facility for configuration
+        Add an <literal>include_if_exists</literal> facility for configuration
         files (Greg Smith)
        </para>
 
        <para>
-        This works the same as <literal>include</>, except that an error
+        This works the same as <literal>include</literal>, except that an error
         is not thrown if the file is missing.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Identify the server time zone during <application>initdb</>, and set
+        Identify the server time zone during <application>initdb</application>, and set
         <filename>postgresql.conf</filename> entries
-        <link linkend="guc-timezone"><varname>timezone</></link> and
-        <link linkend="guc-log-timezone"><varname>log_timezone</></link>
+        <link linkend="guc-timezone"><varname>timezone</varname></link> and
+        <link linkend="guc-log-timezone"><varname>log_timezone</varname></link>
         accordingly (Tom Lane)
        </para>
 
@@ -10197,7 +10373,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Fix <link
-        linkend="view-pg-settings"><structname>pg_settings</></link> to
+        linkend="view-pg-settings"><structname>pg_settings</structname></link> to
         report <filename>postgresql.conf</filename> line numbers on Windows
         (Tom Lane)
        </para>
@@ -10220,7 +10396,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Allow streaming replication slaves to forward data to other slaves
         (<link linkend="cascading-replication"><firstterm>cascading
-        replication</></link>) (Fujii Masao)
+        replication</firstterm></link>) (Fujii Masao)
        </para>
 
        <para>
@@ -10232,8 +10408,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add new <link
-        linkend="guc-synchronous-commit"><varname>synchronous_commit</></link>
-        mode <literal>remote_write</> (Fujii Masao, Simon Riggs)
+        linkend="guc-synchronous-commit"><varname>synchronous_commit</varname></link>
+        mode <literal>remote_write</literal> (Fujii Masao, Simon Riggs)
        </para>
 
        <para>
@@ -10246,7 +10422,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         tool to archive WAL file changes as they are written, rather
         than waiting for completed WAL files (Magnus Hagander)
        </para>
@@ -10255,7 +10431,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         to make base backups from standby servers (Jun Ishizuka, Fujii Masao)
        </para>
 
@@ -10267,7 +10443,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow streaming of WAL files while <application>pg_basebackup</>
+        Allow streaming of WAL files while <application>pg_basebackup</application>
         is performing a backup (Magnus Hagander)
        </para>
 
@@ -10306,19 +10482,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This change allows better results when a row value is converted to
-        <type>hstore</> or <type>json</> type: the fields of the resulting
+        <type>hstore</type> or <type>json</type> type: the fields of the resulting
         value will now have the expected names.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve column labels used for sub-<command>SELECT</> results
+        Improve column labels used for sub-<command>SELECT</command> results
         (Marti Raudsepp)
        </para>
 
        <para>
-        Previously, the generic label <literal>?column?</> was used.
+        Previously, the generic label <literal>?column?</literal> was used.
        </para>
       </listitem>
 
@@ -10348,7 +10524,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        When a row fails a <literal>CHECK</> or <literal>NOT NULL</>
+        When a row fails a <literal>CHECK</literal> or <literal>NOT NULL</literal>
         constraint, show the row's contents as error detail (Jan
         Kundr&aacute;t)
        </para>
@@ -10376,7 +10552,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This change adds locking that should eliminate <quote>cache lookup
-        failed</> errors in many scenarios.  Also, it is no longer possible
+        failed</quote> errors in many scenarios.  Also, it is no longer possible
         to add relations to a schema that is being concurrently dropped, a
         scenario that formerly led to inconsistent system catalog contents.
        </para>
@@ -10384,8 +10560,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <literal>CONCURRENTLY</> option to <link
-        linkend="SQL-DROPINDEX"><command>DROP INDEX</command></link>
+        Add <literal>CONCURRENTLY</literal> option to <link
+        linkend="sql-dropindex"><command>DROP INDEX</command></link>
         (Simon Riggs)
        </para>
 
@@ -10415,31 +10591,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <link linkend="ddl-constraints"><literal>CHECK</></link>
-        constraints to be declared <literal>NOT VALID</> (&Aacute;lvaro
+        Allow <link linkend="ddl-constraints"><literal>CHECK</literal></link>
+        constraints to be declared <literal>NOT VALID</literal> (&Aacute;lvaro
         Herrera)
        </para>
 
        <para>
-        Adding a <literal>NOT VALID</> constraint does not cause the table to
+        Adding a <literal>NOT VALID</literal> constraint does not cause the table to
         be scanned to verify that existing rows meet the constraint.
         Subsequently, newly added or updated rows are checked.
         Such constraints are ignored by the planner when considering
-        <varname>constraint_exclusion</>, since it is not certain that all
+        <varname>constraint_exclusion</varname>, since it is not certain that all
         rows meet the constraint.
        </para>
 
        <para>
-        The new <command>ALTER TABLE VALIDATE</> command allows <literal>NOT
-        VALID</> constraints to be checked for existing rows, after which
+        The new <command>ALTER TABLE VALIDATE</command> command allows <literal>NOT
+        VALID</literal> constraints to be checked for existing rows, after which
         they are converted into ordinary constraints.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <literal>CHECK</> constraints to be declared <literal>NO
-        INHERIT</> (Nikhil Sontakke, Alex Hunsaker, &Aacute;lvaro Herrera)
+        Allow <literal>CHECK</literal> constraints to be declared <literal>NO
+        INHERIT</literal> (Nikhil Sontakke, Alex Hunsaker, &Aacute;lvaro Herrera)
        </para>
 
        <para>
@@ -10450,7 +10626,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add the ability to <link linkend="SQL-ALTERTABLE">rename</link>
+        Add the ability to <link linkend="sql-altertable">rename</link>
         constraints (Peter Eisentraut)
        </para>
       </listitem>
@@ -10459,32 +10635,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><command>ALTER</></title>
+     <title><command>ALTER</command></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
         Reduce need to rebuild tables and indexes for certain <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE</command></link>
-        ... <literal>ALTER COLUMN TYPE</> operations (Noah Misch)
+        linkend="sql-altertable"><command>ALTER TABLE</command></link>
+        ... <literal>ALTER COLUMN TYPE</literal> operations (Noah Misch)
        </para>
 
        <para>
-        Increasing the length limit for a <type>varchar</> or <type>varbit</>
+        Increasing the length limit for a <type>varchar</type> or <type>varbit</type>
         column, or removing the limit altogether, no longer requires a table
         rewrite.  Similarly, increasing the allowable precision of a
-        <type>numeric</> column, or changing a column from constrained
-        <type>numeric</> to unconstrained <type>numeric</>, no longer
+        <type>numeric</type> column, or changing a column from constrained
+        <type>numeric</type> to unconstrained <type>numeric</type>, no longer
         requires a table rewrite.  Table rewrites are also avoided in similar
-        cases involving the <type>interval</>, <type>timestamp</>, and
-        <type>timestamptz</> types.
+        cases involving the <type>interval</type>, <type>timestamp</type>, and
+        <type>timestamptz</type> types.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Avoid having <link linkend="SQL-ALTERTABLE"><command>ALTER
+        Avoid having <link linkend="sql-altertable"><command>ALTER
         TABLE</command></link> revalidate foreign key constraints in some
         cases where it is not necessary (Noah Misch)
        </para>
@@ -10492,7 +10668,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <literal>IF EXISTS</> options to some <command>ALTER</command>
+        Add <literal>IF EXISTS</literal> options to some <command>ALTER</command>
         commands (Pavel Stehule)
        </para>
 
@@ -10504,17 +10680,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERFOREIGNDATAWRAPPER"><command>ALTER
-        FOREIGN DATA WRAPPER</command></link> ... <literal>RENAME</>
-        and <link linkend="SQL-ALTERSERVER"><command>ALTER
-        SERVER</command></link> ... <literal>RENAME</> (Peter Eisentraut)
+        Add <link linkend="sql-alterforeigndatawrapper"><command>ALTER
+        FOREIGN DATA WRAPPER</command></link> ... <literal>RENAME</literal>
+        and <link linkend="sql-alterserver"><command>ALTER
+        SERVER</command></link> ... <literal>RENAME</literal> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERDOMAIN"><command>ALTER
-        DOMAIN</command></link> ... <literal>RENAME</> (Peter Eisentraut)
+        Add <link linkend="sql-alterdomain"><command>ALTER
+        DOMAIN</command></link> ... <literal>RENAME</literal> (Peter Eisentraut)
        </para>
 
        <para>
@@ -10526,11 +10702,11 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Throw an error for <command>ALTER DOMAIN</command> ... <literal>DROP
-        CONSTRAINT</> on a nonexistent constraint (Peter Eisentraut)
+        CONSTRAINT</literal> on a nonexistent constraint (Peter Eisentraut)
        </para>
 
        <para>
-        An <literal>IF EXISTS</> option has been added to provide the
+        An <literal>IF EXISTS</literal> option has been added to provide the
         previous behavior.
        </para>
       </listitem>
@@ -10540,7 +10716,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-CREATETABLE"><command>CREATE TABLE</></link></title>
+     <title><link linkend="sql-createtable"><command>CREATE TABLE</command></link></title>
 
      <itemizedlist>
 
@@ -10565,8 +10741,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Fix <command>CREATE TABLE</command> ... <literal>AS EXECUTE</>
-        to handle <literal>WITH NO DATA</> and column name specifications
+        Fix <command>CREATE TABLE</command> ... <literal>AS EXECUTE</literal>
+        to handle <literal>WITH NO DATA</literal> and column name specifications
         (Tom Lane)
        </para>
       </listitem>
@@ -10583,14 +10759,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="SQL-CREATEVIEW"><literal>security_barrier</></link>
+        linkend="sql-createview"><literal>security_barrier</literal></link>
         option for views (KaiGai Kohei, Robert Haas)
        </para>
 
        <para>
         This option prevents optimizations that might allow view-protected
         data to be exposed to users, for example pushing a clause involving
-        an insecure function into the <literal>WHERE</> clause of the view.
+        an insecure function into the <literal>WHERE</literal> clause of the view.
         Such views can be expected to perform more poorly than ordinary
         views.
        </para>
@@ -10599,9 +10775,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a new <link
-        linkend="SQL-CREATEFUNCTION"><literal>LEAKPROOF</></link> function
+        linkend="sql-createfunction"><literal>LEAKPROOF</literal></link> function
         attribute to mark functions that can safely be pushed down
-        into <literal>security_barrier</> views (KaiGai Kohei)
+        into <literal>security_barrier</literal> views (KaiGai Kohei)
        </para>
       </listitem>
 
@@ -10611,8 +10787,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This adds support for the <acronym>SQL</>-conforming
-        <literal>USAGE</> privilege on types and domains.  The intent is
+        This adds support for the <acronym>SQL</acronym>-conforming
+        <literal>USAGE</literal> privilege on types and domains.  The intent is
         to be able to restrict which users can create dependencies on types,
         since such dependencies limit the owner's ability to alter the type.
        </para>
@@ -10628,7 +10804,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         Because the object is being created by <command>SELECT INTO</command>
         or <command>CREATE TABLE AS</command>, the creator would ordinarily
         have insert permissions; but there are corner cases where this is not
-        true, such as when <literal>ALTER DEFAULT PRIVILEGES</> has removed
+        true, such as when <literal>ALTER DEFAULT PRIVILEGES</literal> has removed
         such permissions.
        </para>
       </listitem>
@@ -10646,20 +10822,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-VACUUM"><command>VACUUM</></link> to more
+        Allow <link linkend="sql-vacuum"><command>VACUUM</command></link> to more
         easily skip pages that cannot be locked (Simon Riggs, Robert Haas)
        </para>
 
        <para>
-        This change should greatly reduce the incidence of <command>VACUUM</>
-        getting <quote>stuck</> waiting for other sessions.
+        This change should greatly reduce the incidence of <command>VACUUM</command>
+        getting <quote>stuck</quote> waiting for other sessions.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="SQL-EXPLAIN"><command>EXPLAIN</></link>
-        <literal>(BUFFERS)</> count blocks dirtied and written (Robert Haas)
+        Make <link linkend="sql-explain"><command>EXPLAIN</command></link>
+        <literal>(BUFFERS)</literal> count blocks dirtied and written (Robert Haas)
        </para>
       </listitem>
 
@@ -10677,8 +10853,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This is accomplished by setting the new <literal>TIMING</> option to
-        <literal>FALSE</>.
+        This is accomplished by setting the new <literal>TIMING</literal> option to
+        <literal>FALSE</literal>.
        </para>
       </listitem>
 
@@ -10719,41 +10895,41 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-json"><function>array_to_json()</></link>
-        and <function>row_to_json()</> (Andrew Dunstan)
+        linkend="functions-json"><function>array_to_json()</function></link>
+        and <function>row_to_json()</function> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a <link linkend="datatype-serial"><type>SMALLSERIAL</></link>
+        Add a <link linkend="datatype-serial"><type>SMALLSERIAL</type></link>
         data type (Mike Pultz)
        </para>
 
        <para>
-        This is like <type>SERIAL</>, except it stores the sequence in
-        a two-byte integer column (<type>int2</>).
+        This is like <type>SERIAL</type>, except it stores the sequence in
+        a two-byte integer column (<type>int2</type>).
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-CREATEDOMAIN">domains</link> to be
-        declared <literal>NOT VALID</> (&Aacute;lvaro Herrera)
+        Allow <link linkend="sql-createdomain">domains</link> to be
+        declared <literal>NOT VALID</literal> (&Aacute;lvaro Herrera)
        </para>
 
        <para>
         This option can be set at domain creation time, or via <command>ALTER
-        DOMAIN</command> ... <literal>ADD CONSTRAINT</> ... <literal>NOT
-        VALID</>. <command>ALTER DOMAIN</command> ... <literal>VALIDATE
-        CONSTRAINT</> fully validates the constraint.
+        DOMAIN</command> ... <literal>ADD CONSTRAINT</literal> ... <literal>NOT
+        VALID</literal>. <command>ALTER DOMAIN</command> ... <literal>VALIDATE
+        CONSTRAINT</literal> fully validates the constraint.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Support more locale-specific formatting options for the <link
-        linkend="datatype-money"><type>money</></link> data type (Tom Lane)
+        linkend="datatype-money"><type>money</type></link> data type (Tom Lane)
        </para>
 
        <para>
@@ -10766,22 +10942,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add bitwise <quote>and</>, <quote>or</>, and <quote>not</>
-        operators for the <type>macaddr</> data type (Brendan Jurd)
+        Add bitwise <quote>and</quote>, <quote>or</quote>, and <quote>not</quote>
+        operators for the <type>macaddr</type> data type (Brendan Jurd)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow <link
-        linkend="functions-xml-processing"><function>xpath()</></link> to
+        linkend="functions-xml-processing"><function>xpath()</function></link> to
         return a single-element <acronym>XML</acronym> array when supplied a
         scalar value (Florian Pflug)
        </para>
 
        <para>
         Previously, it returned an empty array.  This change will also
-        cause <function>xpath_exists()</> to return true, not false,
+        cause <function>xpath_exists()</function> to return true, not false,
         for such expressions.
        </para>
       </listitem>
@@ -10805,9 +10981,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow non-superusers to use <link
-        linkend="functions-admin-signal"><function>pg_cancel_backend()</></link>
+        linkend="functions-admin-signal"><function>pg_cancel_backend()</function></link>
         and <link
-        linkend="functions-admin-signal"><function>pg_terminate_backend()</></link>
+        linkend="functions-admin-signal"><function>pg_terminate_backend()</function></link>
         on other sessions belonging to the same user
         (Magnus Hagander, Josh Kupershmidt, Dan Farina)
        </para>
@@ -10827,8 +11003,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         This allows multiple transactions to share identical views of the
         database state.
         Snapshots are exported via <link
-        linkend="functions-snapshot-synchronization"><function>pg_export_snapshot()</></link>
-        and imported via <link linkend="SQL-SET-TRANSACTION"><command>SET
+        linkend="functions-snapshot-synchronization"><function>pg_export_snapshot()</function></link>
+        and imported via <link linkend="sql-set-transaction"><command>SET
         TRANSACTION SNAPSHOT</command></link>.  Only snapshots from
         currently-running transactions can be imported.
        </para>
@@ -10838,7 +11014,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Support <link
         linkend="functions-info-catalog-table"><literal>COLLATION
-        FOR</></link> on expressions (Peter Eisentraut)
+        FOR</literal></link> on expressions (Peter Eisentraut)
        </para>
 
        <para>
@@ -10849,23 +11025,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-info-schema-table"><function>pg_opfamily_is_visible()</></link>
+        linkend="functions-info-schema-table"><function>pg_opfamily_is_visible()</function></link>
         (Josh Kupershmidt)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a <type>numeric</> variant of <link
-        linkend="functions-admin-dbsize"><function>pg_size_pretty()</></link>
-        for use with <function>pg_xlog_location_diff()</> (Fujii Masao)
+        Add a <type>numeric</type> variant of <link
+        linkend="functions-admin-dbsize"><function>pg_size_pretty()</function></link>
+        for use with <function>pg_xlog_location_diff()</function> (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link
-        linkend="functions-info-session-table"><function>pg_trigger_depth()</></link>
+        linkend="functions-info-session-table"><function>pg_trigger_depth()</function></link>
         function (Kevin Grittner)
        </para>
 
@@ -10877,8 +11053,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow <link
-        linkend="functions-aggregate-table"><function>string_agg()</></link>
-        to process <type>bytea</> values (Pavel Stehule)
+        linkend="functions-aggregate-table"><function>string_agg()</function></link>
+        to process <type>bytea</type> values (Pavel Stehule)
        </para>
       </listitem>
 
@@ -10889,7 +11065,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        For example, <literal>^(\w+)( \1)+$</>.  Previous releases did not
+        For example, <literal>^(\w+)( \1)+$</literal>.  Previous releases did not
         check that the back-reference actually matched the first occurrence.
        </para>
       </listitem>
@@ -10906,22 +11082,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add information schema views
-        <structname>role_udt_grants</>, <structname>udt_privileges</>,
-        and <structname>user_defined_types</> (Peter Eisentraut)
+        <structname>role_udt_grants</structname>, <structname>udt_privileges</structname>,
+        and <structname>user_defined_types</structname> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add composite-type attributes to the
-        information schema <structname>element_types</> view
+        information schema <structname>element_types</structname> view
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Implement <structfield>interval_type</> columns in the information
+        Implement <structfield>interval_type</structfield> columns in the information
         schema (Peter Eisentraut)
        </para>
 
@@ -10933,23 +11109,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Implement collation-related columns in the information schema
-        <structname>attributes</>, <structname>columns</>,
-        <structname>domains</>, and <structname>element_types</>
+        <structname>attributes</structname>, <structname>columns</structname>,
+        <structname>domains</structname>, and <structname>element_types</structname>
         views (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Implement the <structfield>with_hierarchy</> column in the
-        information schema <structname>table_privileges</> view (Peter
+        Implement the <structfield>with_hierarchy</structfield> column in the
+        information schema <structname>table_privileges</structname> view (Peter
         Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add display of sequence <literal>USAGE</> privileges to information
+        Add display of sequence <literal>USAGE</literal> privileges to information
         schema (Peter Eisentraut)
        </para>
       </listitem>
@@ -10980,7 +11156,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow the PL/pgSQL <command>OPEN</> cursor command to supply
+        Allow the PL/pgSQL <command>OPEN</command> cursor command to supply
         parameters by name (Yeb Havinga)
        </para>
       </listitem>
@@ -11002,7 +11178,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve performance and memory consumption for long chains of
-        <literal>ELSIF</> clauses (Tom Lane)
+        <literal>ELSIF</literal> clauses (Tom Lane)
        </para>
       </listitem>
 
@@ -11083,31 +11259,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="APP-INITDB"><application>initdb</></link>
-        options <option>--auth-local</> and <option>--auth-host</>
+        Add <link linkend="app-initdb"><application>initdb</application></link>
+        options <option>--auth-local</option> and <option>--auth-host</option>
         (Peter Eisentraut)
        </para>
 
        <para>
-        This allows separate control of <literal>local</> and
-        <literal>host</> <filename>pg_hba.conf</filename> authentication
-        settings.  <option>--auth</> still controls both.
+        This allows separate control of <literal>local</literal> and
+        <literal>host</literal> <filename>pg_hba.conf</filename> authentication
+        settings.  <option>--auth</option> still controls both.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--replication</>/<option>--no-replication</> flags to
-        <link linkend="APP-CREATEUSER"><application>createuser</></link>
+        Add <option>--replication</option>/<option>--no-replication</option> flags to
+        <link linkend="app-createuser"><application>createuser</application></link>
         to control replication permission (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <option>--if-exists</> option to <link
-        linkend="APP-DROPDB"><application>dropdb</></link> and <link
-        linkend="APP-DROPUSER"><application>dropuser</></link> (Josh
+        Add the <option>--if-exists</option> option to <link
+        linkend="app-dropdb"><application>dropdb</application></link> and <link
+        linkend="app-dropuser"><application>dropuser</application></link> (Josh
         Kupershmidt)
        </para>
       </listitem>
@@ -11115,15 +11291,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Give command-line tools the ability to specify the name of the
-        database to connect to, and fall back to <literal>template1</>
-        if a <literal>postgres</> database connection fails (Robert Haas)
+        database to connect to, and fall back to <literal>template1</literal>
+        if a <literal>postgres</literal> database connection fails (Robert Haas)
        </para>
       </listitem>
 
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PSQL"><application>psql</></link></title>
+     <title><link linkend="app-psql"><application>psql</application></link></title>
 
      <itemizedlist>
 
@@ -11134,7 +11310,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This adds the <literal>auto</> option to the <command>\x</>
+        This adds the <literal>auto</literal> option to the <command>\x</command>
         command, which switches to the expanded mode when the normal
         output would be wider than the screen.
        </para>
@@ -11147,32 +11323,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This is done with a new command <command>\ir</>.
+        This is done with a new command <command>\ir</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add support for non-<acronym>ASCII</acronym> characters in
-        <application>psql</> variable names (Tom Lane)
+        <application>psql</application> variable names (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for major-version-specific <filename>.psqlrc</> files
+        Add support for major-version-specific <filename>.psqlrc</filename> files
         (Bruce Momjian)
        </para>
 
        <para>
-        <application>psql</> already supported minor-version-specific
-        <filename>.psqlrc</> files.
+        <application>psql</application> already supported minor-version-specific
+        <filename>.psqlrc</filename> files.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Provide environment variable overrides for <application>psql</>
+        Provide environment variable overrides for <application>psql</application>
         history and startup file locations (Andrew Dunstan)
        </para>
 
@@ -11184,15 +11360,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <command>\setenv</> command to modify
+        Add a <command>\setenv</command> command to modify
         the environment variables passed to child processes (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Name <application>psql</>'s temporary editor files with a
-        <filename>.sql</> extension (Peter Eisentraut)
+        Name <application>psql</application>'s temporary editor files with a
+        <filename>.sql</filename> extension (Peter Eisentraut)
        </para>
 
        <para>
@@ -11202,19 +11378,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>psql</> to use zero-byte field and record
+        Allow <application>psql</application> to use zero-byte field and record
         separators (Peter Eisentraut)
        </para>
 
        <para>
         Various shell tools use zero-byte (NUL) separators,
-        e.g. <application>find</>.
+        e.g. <application>find</application>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make the <command>\timing</> option report times for
+        Make the <command>\timing</command> option report times for
         failed queries (Magnus Hagander)
        </para>
 
@@ -11225,13 +11401,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Unify and tighten <application>psql</>'s treatment of <command>\copy</>
-        and SQL <command>COPY</> (Noah Misch)
+        Unify and tighten <application>psql</application>'s treatment of <command>\copy</command>
+        and SQL <command>COPY</command> (Noah Misch)
        </para>
 
        <para>
         This fix makes failure behavior more predictable and honors
-        <command>\set ON_ERROR_ROLLBACK</>.
+        <command>\set ON_ERROR_ROLLBACK</command>.
        </para>
       </listitem>
 
@@ -11245,21 +11421,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <itemizedlist>
       <listitem>
        <para>
-        Make <command>\d</> on a sequence show the
+        Make <command>\d</command> on a sequence show the
         table/column name owning it (Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show statistics target for columns in <command>\d+</> (Magnus
+        Show statistics target for columns in <command>\d+</command> (Magnus
         Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show role password expiration dates in <command>\du</>
+        Show role password expiration dates in <command>\du</command>
         (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
@@ -11271,8 +11447,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        These are included in the output of <command>\dC+</>,
-        <command>\dc+</>, <command>\dD+</>, and <command>\dL</> respectively.
+        These are included in the output of <command>\dC+</command>,
+        <command>\dc+</command>, <command>\dD+</command>, and <command>\dL</command> respectively.
        </para>
       </listitem>
 
@@ -11283,15 +11459,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        These are included in the output of <command>\des+</>,
-        <command>\det+</>, and <command>\dew+</> for foreign servers, foreign
+        These are included in the output of <command>\des+</command>,
+        <command>\det+</command>, and <command>\dew+</command> for foreign servers, foreign
         tables, and foreign data wrappers respectively.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <command>\dd</> to display comments only for object types
+        Change <command>\dd</command> to display comments only for object types
         without their own backslash command (Josh Kupershmidt)
        </para>
       </listitem>
@@ -11307,9 +11483,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        In <application>psql</> tab completion, complete <acronym>SQL</>
+        In <application>psql</application> tab completion, complete <acronym>SQL</acronym>
         keywords in either upper or lower case according to the new <link
-        linkend="APP-PSQL-variables"><literal>COMP_KEYWORD_CASE</></link>
+        linkend="app-psql-variables"><literal>COMP_KEYWORD_CASE</literal></link>
         setting (Peter Eisentraut)
        </para>
       </listitem>
@@ -11348,14 +11524,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add an <option>--exclude-table-data</> option to
-        <application>pg_dump</> (Andrew Dunstan)
+        Add an <option>--exclude-table-data</option> option to
+        <application>pg_dump</application> (Andrew Dunstan)
        </para>
 
        <para>
@@ -11366,13 +11542,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <option>--section</> option to <application>pg_dump</>
-        and <application>pg_restore</> (Andrew Dunstan)
+        Add a <option>--section</option> option to <application>pg_dump</application>
+        and <application>pg_restore</application> (Andrew Dunstan)
        </para>
 
        <para>
-        Valid values are <literal>pre-data</>, <literal>data</>,
-        and <literal>post-data</>. The option can be
+        Valid values are <literal>pre-data</literal>, <literal>data</literal>,
+        and <literal>post-data</literal>. The option can be
         given more than once to select two or more sections.
        </para>
       </listitem>
@@ -11380,7 +11556,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make <link
-        linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link> dump all
+        linkend="app-pg-dumpall"><application>pg_dumpall</application></link> dump all
         roles first, then all configuration settings on roles (Phil Sorber)
        </para>
 
@@ -11392,8 +11568,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_dumpall</> to avoid errors if the
-        <literal>postgres</> database is missing in the new cluster
+        Allow <application>pg_dumpall</application> to avoid errors if the
+        <literal>postgres</literal> database is missing in the new cluster
         (Robert Haas)
        </para>
       </listitem>
@@ -11418,13 +11594,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Tighten rules for when extension configuration tables are dumped
-        by <application>pg_dump</> (Tom Lane)
+        by <application>pg_dump</application> (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_dump</> emit more useful dependency
+        Make <application>pg_dump</application> emit more useful dependency
         information (Tom Lane)
        </para>
 
@@ -11438,7 +11614,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Improve <application>pg_dump</>'s performance when dumping many
+        Improve <application>pg_dump</application>'s performance when dumping many
         database objects (Tom Lane)
        </para>
       </listitem>
@@ -11450,19 +11626,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </sect3>
 
     <sect3>
-     <title><link linkend="libpq"><application>libpq</></link></title>
+     <title><link linkend="libpq"><application>libpq</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>libpq</> connection strings to have the format of a
+        Allow <application>libpq</application> connection strings to have the format of a
         <link linkend="libpq-connstring"><acronym>URI</acronym></link>
         (Alexander Shulgin)
        </para>
 
        <para>
-        The syntax begins with <literal>postgres://</>.  This can allow
+        The syntax begins with <literal>postgres://</literal>.  This can allow
         applications to avoid implementing their own parser for URIs
         representing database connections.
        </para>
@@ -11489,30 +11665,30 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Previously, <application>libpq</> always collected the entire query
+        Previously, <application>libpq</application> always collected the entire query
         result in memory before passing it back to the application.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>const</> qualifiers to the declarations of the functions
-        <function>PQconnectdbParams</>, <function>PQconnectStartParams</>,
-        and <function>PQpingParams</> (Lionel Elie Mamane)
+        Add <literal>const</literal> qualifiers to the declarations of the functions
+        <function>PQconnectdbParams</function>, <function>PQconnectStartParams</function>,
+        and <function>PQpingParams</function> (Lionel Elie Mamane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow the <filename>.pgpass</> file to include escaped characters
+        Allow the <filename>.pgpass</filename> file to include escaped characters
         in the password field (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make library functions use <function>abort()</> instead of
-        <function>exit()</> when it is necessary to terminate the process
+        Make library functions use <function>abort()</function> instead of
+        <function>exit()</function> when it is necessary to terminate the process
         (Peter Eisentraut)
        </para>
 
@@ -11557,7 +11733,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Install <filename>plpgsql.h</> into <filename>include/server</> during installation
+        Install <filename>plpgsql.h</filename> into <filename>include/server</filename> during installation
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -11583,14 +11759,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve the concurrent transaction regression tests
-        (<application>isolationtester</>) (Noah Misch)
+        (<application>isolationtester</application>) (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Modify <application>thread_test</> to create its test files in
-        the current directory, rather than <filename>/tmp</> (Bruce Momjian)
+        Modify <application>thread_test</application> to create its test files in
+        the current directory, rather than <filename>/tmp</filename> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -11639,7 +11815,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <application>pg_upgrade</> test suite (Peter Eisentraut)
+        Add a <application>pg_upgrade</application> test suite (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -11659,14 +11835,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add options to <application>git_changelog</> for use in major
+        Add options to <application>git_changelog</application> for use in major
         release note creation (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support Linux's <filename>/proc/self/oom_score_adj</> API (Tom Lane)
+        Support Linux's <filename>/proc/self/oom_score_adj</filename> API (Tom Lane)
        </para>
       </listitem>
 
@@ -11688,13 +11864,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This improvement does not apply to
-        <function>dblink_send_query()</>/<function>dblink_get_result()</>.
+        <function>dblink_send_query()</function>/<function>dblink_get_result()</function>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>force_not_null</> option in <link
+        Support <literal>force_not_null</literal> option in <link
         linkend="file-fdw">file_fdw</link> (Shigeru Hanada)
        </para>
       </listitem>
@@ -11702,7 +11878,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Implement dry-run mode for <link
-        linkend="pgarchivecleanup"><application>pg_archivecleanup</></link>
+        linkend="pgarchivecleanup"><application>pg_archivecleanup</application></link>
         (Gabriele Bartolini)
        </para>
 
@@ -11714,29 +11890,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add new <link linkend="pgbench">pgbench</link> switches
-        <option>--unlogged-tables</>, <option>--tablespace</>, and
-        <option>--index-tablespace</> (Robert Haas)
+        <option>--unlogged-tables</option>, <option>--tablespace</option>, and
+        <option>--index-tablespace</option> (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Change <link
-        linkend="pgtestfsync"><application>pg_test_fsync</></link> to test
+        linkend="pgtestfsync"><application>pg_test_fsync</application></link> to test
         for a fixed amount of time, rather than a fixed number of cycles
         (Bruce Momjian)
        </para>
 
        <para>
-        The <option>-o</>/cycles option was removed, and
-        <option>-s</>/seconds added.
+        The <option>-o</option>/cycles option was removed, and
+        <option>-s</option>/seconds added.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link
-        linkend="pgtesttiming"><application>pg_test_timing</></link>
+        linkend="pgtesttiming"><application>pg_test_timing</application></link>
         utility to measure clock monotonicity and timing overhead (Ants
         Aasma, Greg Smith)
        </para>
@@ -11753,19 +11929,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="pgupgrade"><application>pg_upgrade</></link></title>
+     <title><link linkend="pgupgrade"><application>pg_upgrade</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Adjust <application>pg_upgrade</> environment variables (Bruce
+        Adjust <application>pg_upgrade</application> environment variables (Bruce
         Momjian)
        </para>
 
        <para>
         Rename data, bin, and port environment
-        variables to begin with <literal>PG</>, and support
+        variables to begin with <literal>PG</literal>, and support
         <envar>PGPORTOLD</envar>/<envar>PGPORTNEW</envar>, to replace
         <envar>PGPORT</envar>.
        </para>
@@ -11773,22 +11949,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Overhaul <application>pg_upgrade</> logging and failure reporting
+        Overhaul <application>pg_upgrade</application> logging and failure reporting
         (Bruce Momjian)
        </para>
 
        <para>
         Create four append-only log files, and delete them on success.
-        Add <option>-r</>/<option>--retain</> option to unconditionally
-        retain these files.  Also remove <application>pg_upgrade</> options
-        <option>-g</>/<option>-G</>/<option>-l</> options as unnecessary,
+        Add <option>-r</option>/<option>--retain</option> option to unconditionally
+        retain these files.  Also remove <application>pg_upgrade</application> options
+        <option>-g</option>/<option>-G</option>/<option>-l</option> options as unnecessary,
         and tighten log file permissions.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> create a script to incrementally
+        Make <application>pg_upgrade</application> create a script to incrementally
         generate more accurate optimizer statistics (Bruce Momjian)
        </para>
 
@@ -11800,14 +11976,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to upgrade an old cluster that
-        does not have a <literal>postgres</> database (Bruce Momjian)
+        Allow <application>pg_upgrade</application> to upgrade an old cluster that
+        does not have a <literal>postgres</literal> database (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to handle cases where some
+        Allow <application>pg_upgrade</application> to handle cases where some
         old or new databases are missing, as long as they are empty
         (Bruce Momjian)
        </para>
@@ -11815,14 +11991,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to handle configuration-only
+        Allow <application>pg_upgrade</application> to handle configuration-only
         directory installations (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>pg_upgrade</>, add <option>-o</>/<option>-O</>
+        In <application>pg_upgrade</application>, add <option>-o</option>/<option>-O</option>
         options to pass parameters to the servers (Bruce Momjian)
        </para>
 
@@ -11833,7 +12009,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Change <application>pg_upgrade</> to use port 50432 by default
+        Change <application>pg_upgrade</application> to use port 50432 by default
         (Bruce Momjian)
        </para>
 
@@ -11844,7 +12020,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Reduce cluster locking in <application>pg_upgrade</> (Bruce
+        Reduce cluster locking in <application>pg_upgrade</application> (Bruce
         Momjian)
        </para>
 
@@ -11859,13 +12035,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="pgstatstatements"><application>pg_stat_statements</></link></title>
+     <title><link linkend="pgstatstatements"><application>pg_stat_statements</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>pg_stat_statements</> to aggregate similar
+        Allow <application>pg_stat_statements</application> to aggregate similar
         queries via SQL text normalization (Peter Geoghegan, Tom Lane)
        </para>
 
@@ -11878,13 +12054,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add dirtied and written block counts and read/write times to
-        <application>pg_stat_statements</> (Robert Haas, Ants Aasma)
+        <application>pg_stat_statements</application> (Robert Haas, Ants Aasma)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Prevent <application>pg_stat_statements</> from double-counting
+        Prevent <application>pg_stat_statements</application> from double-counting
         <command>PREPARE</command> and <command>EXECUTE</command> commands
         (Tom Lane)
        </para>
@@ -11900,7 +12076,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <itemizedlist>
       <listitem>
        <para>
-        Support <literal>SECURITY LABEL</> on global objects (KaiGai
+        Support <literal>SECURITY LABEL</literal> on global objects (KaiGai
         Kohei, Robert Haas)
        </para>
 
@@ -11925,7 +12101,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <function>sepgsql_setcon()</> and related functions to control
+        Add <function>sepgsql_setcon()</function> and related functions to control
         the sepgsql security domain (KaiGai Kohei)
        </para>
       </listitem>
@@ -11954,7 +12130,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Use <command>gmake STYLE=website draft</>.
+        Use <command>gmake STYLE=website draft</command>.
        </para>
       </listitem>
 
@@ -11967,7 +12143,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Document that user/database names are preserved with double-quoting
-        by command-line tools like <application>vacuumdb</>  (Bruce
+        by command-line tools like <application>vacuumdb</application>  (Bruce
         Momjian)
        </para>
       </listitem>
@@ -11981,12 +12157,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Deprecate use of <literal>GLOBAL</> and <literal>LOCAL</> in
-        <command>CREATE TEMP TABLE</> (Noah Misch)
+        Deprecate use of <literal>GLOBAL</literal> and <literal>LOCAL</literal> in
+        <command>CREATE TEMP TABLE</command> (Noah Misch)
        </para>
 
        <para>
-        <productname>PostgreSQL</> has long treated these keyword as no-ops,
+        <productname>PostgreSQL</productname> has long treated these keyword as no-ops,
         and continues to do so; but in future they might mean what the SQL
         standard says they mean, so applications should avoid using them.
        </para>
diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml
index 946e636d8bfc1c3a91b3e4b5e8ebeabd01217791..82f705522e6bdf074f89e48d2a609e191becdb65 100644
--- a/doc/src/sgml/release-9.3.sgml
+++ b/doc/src/sgml/release-9.3.sgml
@@ -1,6 +1,198 @@
 <!-- doc/src/sgml/release-9.3.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-3-20">
+  <title>Release 9.3.20</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.19.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.20</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.18,
+    see <xref linkend="release-9-3-18">.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-3-19">
   <title>Release 9.3.19</title>
 
@@ -37,20 +229,20 @@
     <listitem>
      <para>
       Show foreign tables
-      in <structname>information_schema</>.<structname>table_privileges</>
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
       view (Peter Eisentraut)
      </para>
 
      <para>
-      All other relevant <structname>information_schema</> views include
+      All other relevant <structname>information_schema</structname> views include
       foreign tables, but this one ignored them.
      </para>
 
      <para>
-      Since this view definition is installed by <application>initdb</>,
+      Since this view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can, as a superuser, do this
-      in <application>psql</>:
+      in <application>psql</application>:
 <programlisting>
 SET search_path TO information_schema;
 CREATE OR REPLACE VIEW table_privileges AS
@@ -89,21 +281,21 @@ CREATE OR REPLACE VIEW table_privileges AS
                OR grantee.rolname = 'PUBLIC');
 </programlisting>
       This must be repeated in each database to be fixed,
-      including <literal>template0</>.
+      including <literal>template0</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Clean up handling of a fatal exit (e.g., due to receipt
-      of <systemitem>SIGTERM</>) that occurs while trying to execute
-      a <command>ROLLBACK</> of a failed transaction (Tom Lane)
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
      </para>
 
      <para>
       This situation could result in an assertion failure.  In production
       builds, the exit would still occur, but it would log an unexpected
-      message about <quote>cannot drop active portal</>.
+      message about <quote>cannot drop active portal</quote>.
      </para>
     </listitem>
 
@@ -120,7 +312,7 @@ CREATE OR REPLACE VIEW table_privileges AS
      </para>
 
      <para>
-      Certain <command>ALTER</> commands that change the definition of a
+      Certain <command>ALTER</command> commands that change the definition of a
       composite type or domain type are supposed to fail if there are any
       stored values of that type in the database, because they lack the
       infrastructure needed to update or check such values.  Previously,
@@ -132,7 +324,7 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Fix crash in <application>pg_restore</> when using parallel mode and
+      Fix crash in <application>pg_restore</application> when using parallel mode and
       using a list file to select a subset of items to restore
       (Fabr&iacute;zio de Royes Mello)
      </para>
@@ -140,13 +332,13 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Change <application>ecpg</>'s parser to allow <literal>RETURNING</>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
       clauses without attached C variables (Michael Meskes)
      </para>
 
      <para>
-      This allows <application>ecpg</> programs to contain SQL constructs
-      that use <literal>RETURNING</> internally (for example, inside a CTE)
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
       rather than using it to define values to be returned to the client.
      </para>
     </listitem>
@@ -158,12 +350,12 @@ CREATE OR REPLACE VIEW table_privileges AS
 
      <para>
       This fix avoids possible crashes of PL/Perl due to inconsistent
-      assumptions about the width of <type>time_t</> values.
+      assumptions about the width of <type>time_t</type> values.
       A side-effect that may be visible to extension developers is
-      that <literal>_USE_32BIT_TIME_T</> is no longer defined globally
-      in <productname>PostgreSQL</> Windows builds.  This is not expected
-      to cause problems, because type <type>time_t</> is not used
-      in any <productname>PostgreSQL</> API definitions.
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
      </para>
     </listitem>
 
@@ -213,7 +405,7 @@ CREATE OR REPLACE VIEW table_privileges AS
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -221,11 +413,11 @@ CREATE OR REPLACE VIEW table_privileges AS
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -240,15 +432,15 @@ CREATE OR REPLACE VIEW table_privileges AS
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -279,15 +471,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -301,7 +493,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -315,16 +507,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -424,28 +616,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -453,7 +645,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -461,56 +653,56 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -521,20 +713,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -547,9 +739,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -560,8 +752,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -572,7 +764,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -585,14 +777,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -603,14 +795,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -618,13 +810,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -632,7 +824,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -644,8 +836,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -657,9 +849,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -670,7 +862,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -682,7 +874,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -702,27 +894,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -772,18 +964,18 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -807,7 +999,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -821,17 +1013,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -839,7 +1031,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -852,7 +1044,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -860,7 +1052,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -875,19 +1067,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -895,27 +1087,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -929,33 +1121,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -973,21 +1165,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -1002,20 +1194,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -1027,26 +1219,26 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -1059,7 +1251,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -1101,7 +1293,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -1115,9 +1307,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -1130,15 +1322,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
       other zone file (see <xref linkend="datatype-timezones">).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
@@ -1192,15 +1384,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1209,13 +1401,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
       Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1269,7 +1461,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
@@ -1287,15 +1479,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1309,7 +1501,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1339,13 +1531,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1353,12 +1545,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1373,15 +1565,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1392,33 +1584,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1430,8 +1622,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1443,15 +1635,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1464,14 +1656,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1490,21 +1682,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1516,23 +1708,23 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1543,22 +1735,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -1584,7 +1776,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1648,7 +1840,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -1656,19 +1848,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -1702,71 +1894,71 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
+      Fix <command>EXPLAIN</command> to emit valid XML when
       <xref linkend="guc-track-io-timing"> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -1788,7 +1980,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -1802,7 +1994,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -1813,30 +2005,30 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -1844,8 +2036,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -1856,7 +2048,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -1864,8 +2056,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -1886,17 +2078,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -1909,15 +2101,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -1963,17 +2155,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -1987,7 +2179,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -1996,22 +2188,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -2021,40 +2213,40 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -2065,19 +2257,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -2087,8 +2279,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -2102,7 +2294,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -2128,15 +2320,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -2165,12 +2357,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -2179,12 +2371,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -2199,15 +2391,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -2219,7 +2411,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -2254,8 +2446,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -2268,53 +2460,53 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -2322,8 +2514,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -2335,7 +2527,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -2347,7 +2539,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -2368,13 +2560,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -2394,7 +2586,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -2406,7 +2598,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -2462,7 +2654,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -2471,7 +2663,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -2485,10 +2677,10 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -2496,8 +2688,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -2509,28 +2701,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -2538,20 +2730,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -2586,22 +2778,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -2614,19 +2806,19 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -2634,9 +2826,9 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -2683,56 +2875,56 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -2758,27 +2950,27 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -2792,26 +2984,26 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -2839,21 +3031,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -2914,25 +3106,25 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -2941,7 +3133,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -2967,21 +3159,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -2990,7 +3182,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3004,13 +3196,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix planner's handling of <literal>LATERAL</> references (Tom
+      Fix planner's handling of <literal>LATERAL</literal> references (Tom
       Lane)
      </para>
 
      <para>
       This fixes some corner cases that led to <quote>failed to build any
-      N-way joins</> or <quote>could not devise a query plan</> planner
+      N-way joins</quote> or <quote>could not devise a query plan</quote> planner
       failures.
      </para>
     </listitem>
@@ -3032,22 +3224,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Speed up generation of unique table aliases in <command>EXPLAIN</> and
+      Speed up generation of unique table aliases in <command>EXPLAIN</command> and
       rule dumping, and ensure that generated aliases do not
-      exceed <literal>NAMEDATALEN</> (Tom Lane)
+      exceed <literal>NAMEDATALEN</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3099,7 +3291,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -3112,14 +3304,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -3132,7 +3324,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -3158,13 +3350,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -3172,15 +3364,15 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -3188,21 +3380,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -3210,23 +3402,23 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -3234,18 +3426,18 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -3255,51 +3447,51 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid repeated password prompts during parallel <application>pg_dump</>
+      Avoid repeated password prompts during parallel <application>pg_dump</application>
       (Zeus Kronion)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -3308,22 +3500,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -3331,42 +3523,42 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix premature clearing of <application>libpq</>'s input buffer when
+      Fix premature clearing of <application>libpq</application>'s input buffer when
       socket EOF is seen (Tom Lane)
      </para>
 
      <para>
-      This mistake caused <application>libpq</> to sometimes not report the
+      This mistake caused <application>libpq</application> to sometimes not report the
       backend's final error message before reporting <quote>server closed the
-      connection unexpectedly</>.
+      connection unexpectedly</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3374,36 +3566,36 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -3414,14 +3606,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -3445,19 +3637,19 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -3465,11 +3657,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -3478,7 +3670,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -3524,13 +3716,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Guard against stack overflows in <type>json</> parsing
+      Guard against stack overflows in <type>json</type> parsing
       (Oskari Saarenmaa)
      </para>
 
      <para>
-      If an application constructs PostgreSQL <type>json</>
-      or <type>jsonb</> values from arbitrary user input, the application's
+      If an application constructs PostgreSQL <type>json</type>
+      or <type>jsonb</type> values from arbitrary user input, the application's
       users can reliably crash the PostgreSQL server, causing momentary
       denial of service.  (CVE-2015-5289)
      </para>
@@ -3538,8 +3730,8 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -3572,13 +3764,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -3596,7 +3788,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -3608,7 +3800,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      This was seen primarily when restoring <application>pg_dump</> output
+      This was seen primarily when restoring <application>pg_dump</application> output
       for databases with many thousands of tables.
      </para>
     </listitem>
@@ -3623,13 +3815,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -3641,7 +3833,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
@@ -3649,15 +3841,15 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid logging complaints when a parameter that can only be set at
-      server start appears multiple times in <filename>postgresql.conf</>,
-      and fix counting of line numbers after an <literal>include_dir</>
+      server start appears multiple times in <filename>postgresql.conf</filename>,
+      and fix counting of line numbers after an <literal>include_dir</literal>
       directive (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3665,21 +3857,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -3692,7 +3884,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -3744,22 +3936,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -3772,9 +3964,9 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -3782,7 +3974,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -3803,12 +3995,12 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -3835,7 +4027,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -3872,7 +4064,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -3880,44 +4072,44 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -3929,20 +4121,20 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/postgres_fdw</>'s handling of
+      Improve <filename>contrib/postgres_fdw</filename>'s handling of
       collation-related decisions (Tom Lane)
      </para>
 
      <para>
       The main user-visible effect is expected to be that comparisons
-      involving <type>varchar</> columns will be sent to the remote server
+      involving <type>varchar</type> columns will be sent to the remote server
       for execution in more cases than before.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3950,64 +4142,64 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -4015,11 +4207,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -4028,18 +4220,18 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -4047,11 +4239,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -4059,14 +4251,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -4078,38 +4270,38 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -4141,7 +4333,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading an installation that was previously
-    upgraded using a <application>pg_upgrade</> version between 9.3.0 and
+    upgraded using a <application>pg_upgrade</application> version between 9.3.0 and
     9.3.4 inclusive, see the first changelog entry below.
    </para>
 
@@ -4164,52 +4356,52 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      Recent <productname>PostgreSQL</> releases introduced mechanisms to
+      Recent <productname>PostgreSQL</productname> releases introduced mechanisms to
       protect against multixact wraparound, but some of that code did not
       account for the possibility that it would need to run during crash
       recovery, when the database may not be in a consistent state.  This
       could result in failure to restart after a crash, or failure to start
       up a secondary server.  The lingering effects of a previously-fixed
-      bug in <application>pg_upgrade</> could also cause such a failure, in
-      installations that had used <application>pg_upgrade</> versions
+      bug in <application>pg_upgrade</application> could also cause such a failure, in
+      installations that had used <application>pg_upgrade</application> versions
       between 9.3.0 and 9.3.4.
      </para>
 
      <para>
-      The <application>pg_upgrade</> bug in question was that it would
-      set <literal>oldestMultiXid</> to 1 in <filename>pg_control</> even
+      The <application>pg_upgrade</application> bug in question was that it would
+      set <literal>oldestMultiXid</literal> to 1 in <filename>pg_control</filename> even
       if the true value should be higher.  With the fixes introduced in
       this release, such a situation will result in immediate emergency
-      autovacuuming until a correct <literal>oldestMultiXid</> value can be
+      autovacuuming until a correct <literal>oldestMultiXid</literal> value can be
       determined.  If that would pose a hardship, users can avoid it by
-      doing manual vacuuming <emphasis>before</> upgrading to this release.
+      doing manual vacuuming <emphasis>before</emphasis> upgrading to this release.
       In detail:
 
       <orderedlist>
        <listitem>
         <para>
-         Check whether <application>pg_controldata</> reports <quote>Latest
-         checkpoint's oldestMultiXid</> to be 1.  If not, there's nothing
+         Check whether <application>pg_controldata</application> reports <quote>Latest
+         checkpoint's oldestMultiXid</quote> to be 1.  If not, there's nothing
          to do.
         </para>
        </listitem>
        <listitem>
         <para>
-         Look in <filename>PGDATA/pg_multixact/offsets</> to see if there's a
-         file named <filename>0000</>.  If there is, there's nothing to do.
+         Look in <filename>PGDATA/pg_multixact/offsets</filename> to see if there's a
+         file named <filename>0000</filename>.  If there is, there's nothing to do.
         </para>
        </listitem>
        <listitem>
         <para>
          Otherwise, for each table that has
-         <structname>pg_class</>.<structfield>relminmxid</> equal to 1,
-         <command>VACUUM</> that table with
+         <structname>pg_class</structname>.<structfield>relminmxid</structfield> equal to 1,
+         <command>VACUUM</command> that table with
          both <xref linkend="guc-vacuum-multixact-freeze-min-age">
          and <xref linkend="guc-vacuum-multixact-freeze-table-age"> set to
          zero.  (You can use the vacuum cost delay parameters described
          in <xref linkend="runtime-config-resource-vacuum-cost"> to reduce
          the performance consequences for concurrent sessions.)  You must
-         use <productname>PostgreSQL</> 9.3.5 or later to perform this step.
+         use <productname>PostgreSQL</productname> 9.3.5 or later to perform this step.
         </para>
        </listitem>
       </orderedlist>
@@ -4223,7 +4415,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -4234,13 +4426,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -4302,12 +4494,12 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -4319,28 +4511,28 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      Also apply the same rules in <literal>initdb --sync-only</>.
+      Also apply the same rules in <literal>initdb --sync-only</literal>.
       This case is less critical but it should act similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
@@ -4355,15 +4547,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -4397,8 +4589,8 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
@@ -4436,7 +4628,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -4446,7 +4638,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -4456,15 +4648,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -4479,7 +4671,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       Under certain usage patterns, the existing defenses against this might
-      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      be insufficient, allowing <filename>pg_multixact/members</filename> files to be
       removed too early, resulting in data loss.
       The fix for this includes modifying the server to fail transactions
       that would result in overwriting old multixact member ID data, and
@@ -4491,16 +4683,16 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -4508,16 +4700,16 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -4559,7 +4751,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -4587,7 +4779,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -4595,7 +4787,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -4609,7 +4801,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -4629,19 +4821,19 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -4688,18 +4880,18 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -4719,20 +4911,20 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -4745,20 +4937,20 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -4766,14 +4958,14 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -4782,32 +4974,32 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -4820,38 +5012,38 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -4864,21 +5056,21 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      Avoid possible <application>pg_dump</application> failure when concurrent sessions
       are creating and dropping temporary functions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -4890,7 +5082,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -4898,28 +5090,28 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -4927,15 +5119,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -4953,7 +5145,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -4988,11 +5180,11 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
 
    <para>
@@ -5026,15 +5218,15 @@ Branch: REL9_0_STABLE [56b970f2e] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -5054,27 +5246,27 @@ Branch: REL9_0_STABLE [9e05c5063] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -5099,12 +5291,12 @@ Branch: REL9_0_STABLE [0a3ee8a5f] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -5165,7 +5357,7 @@ Branch: REL9_0_STABLE [3a2063369] 2015-01-28 12:33:29 -0500
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -5214,14 +5406,14 @@ Branch: REL9_2_STABLE [6bf343c6e] 2015-01-16 13:10:23 +0200
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
     </listitem>
 
@@ -5236,7 +5428,7 @@ Branch: REL9_0_STABLE [45a607d5c] 2014-11-04 13:24:26 -0500
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
@@ -5256,14 +5448,14 @@ Branch: REL9_0_STABLE [73f950fc8] 2014-10-30 13:03:39 -0400
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -5278,8 +5470,8 @@ Branch: REL9_1_STABLE [d5fef87e9] 2014-10-20 23:47:45 +0200
     <listitem>
      <para>
       Ensure that unlogged tables are copied correctly
-      during <command>CREATE DATABASE</> or <command>ALTER DATABASE SET
-      TABLESPACE</> (Pavan Deolasee, Andres Freund)
+      during <command>CREATE DATABASE</command> or <command>ALTER DATABASE SET
+      TABLESPACE</command> (Pavan Deolasee, Andres Freund)
      </para>
     </listitem>
 
@@ -5291,12 +5483,12 @@ Branch: REL9_3_STABLE [e35db342a] 2014-09-22 16:19:59 -0400
     <listitem>
      <para>
       Fix incorrect processing
-      of <structname>CreateEventTrigStmt</>.<structfield>eventname</> (Petr
+      of <structname>CreateEventTrigStmt</structname>.<structfield>eventname</structfield> (Petr
       Jelinek)
      </para>
 
      <para>
-      This could result in misbehavior if <command>CREATE EVENT TRIGGER</>
+      This could result in misbehavior if <command>CREATE EVENT TRIGGER</command>
       were executed as a prepared query, or via extended query protocol.
      </para>
     </listitem>
@@ -5310,7 +5502,7 @@ Branch: REL9_1_STABLE [94d5d57d5] 2014-11-11 17:00:28 -0500
 
     <listitem>
      <para>
-      Fix <command>DROP</>'s dependency searching to correctly handle the
+      Fix <command>DROP</command>'s dependency searching to correctly handle the
       case where a table column is recursively visited before its table
       (Petr Jelinek, Tom Lane)
      </para>
@@ -5318,7 +5510,7 @@ Branch: REL9_1_STABLE [94d5d57d5] 2014-11-11 17:00:28 -0500
      <para>
       This case is only known to arise when an extension creates both a
       datatype and a table using that datatype.  The faulty code might
-      refuse a <command>DROP EXTENSION</> unless <literal>CASCADE</> is
+      refuse a <command>DROP EXTENSION</command> unless <literal>CASCADE</literal> is
       specified, which should not be required.
      </para>
     </listitem>
@@ -5340,7 +5532,7 @@ Branch: REL9_0_STABLE [5308e085b] 2015-01-15 18:52:38 -0500
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
@@ -5369,8 +5561,8 @@ Branch: REL9_3_STABLE [54a8abc2b] 2015-01-04 15:48:29 -0300
     <listitem>
      <para>
       Fix failure to wait when a transaction tries to acquire a <literal>FOR
-      NO KEY EXCLUSIVE</> tuple lock, while multiple other transactions
-      currently hold <literal>FOR SHARE</> locks (&Aacute;lvaro Herrera)
+      NO KEY EXCLUSIVE</literal> tuple lock, while multiple other transactions
+      currently hold <literal>FOR SHARE</literal> locks (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -5384,15 +5576,15 @@ Branch: REL9_0_STABLE [662eebdc6] 2014-12-11 21:02:41 -0500
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -5408,12 +5600,12 @@ Branch: REL9_0_STABLE [f5e4e92fb] 2014-12-11 19:37:17 -0500
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -5429,7 +5621,7 @@ Branch: REL9_3_STABLE [939f0fb67] 2015-01-15 13:18:19 -0500
 
     <listitem>
      <para>
-      Improve performance of <command>EXPLAIN</> with large range tables
+      Improve performance of <command>EXPLAIN</command> with large range tables
       (Tom Lane)
      </para>
     </listitem>
@@ -5445,7 +5637,7 @@ Branch: REL9_0_STABLE [4ff49746e] 2014-08-09 13:46:52 -0400
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -5462,7 +5654,7 @@ Branch: REL9_3_STABLE [6306d0712] 2014-07-22 13:30:14 -0400
 
     <listitem>
      <para>
-      Re-enable error for <literal>SELECT ... OFFSET -1</> (Tom Lane)
+      Re-enable error for <literal>SELECT ... OFFSET -1</literal> (Tom Lane)
      </para>
 
      <para>
@@ -5499,7 +5691,7 @@ Branch: REL9_3_STABLE [8571ecb24] 2014-12-02 15:02:43 -0500
 
     <listitem>
      <para>
-      Fix <function>json_agg()</> to not return extra trailing right
+      Fix <function>json_agg()</function> to not return extra trailing right
       brackets in its result (Tom Lane)
      </para>
     </listitem>
@@ -5514,7 +5706,7 @@ Branch: REL9_0_STABLE [26f8a4691] 2014-09-11 23:31:06 -0400
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -5535,19 +5727,19 @@ Branch: REL9_0_STABLE [e6550626c] 2014-12-01 15:25:18 -0500
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -5566,7 +5758,7 @@ Branch: REL9_2_STABLE [3359a818c] 2014-09-23 20:25:39 -0400
 
      <para>
       Matching would often fail when the number of allowed iterations is
-      limited by a <literal>?</> quantifier or a bound expression.
+      limited by a <literal>?</literal> quantifier or a bound expression.
      </para>
     </listitem>
 
@@ -5601,7 +5793,7 @@ Branch: REL9_0_STABLE [10059c2da] 2014-10-27 10:51:38 +0200
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -5658,14 +5850,14 @@ Branch: REL9_0_STABLE [cebb3f032] 2015-01-17 22:37:32 -0500
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -5685,7 +5877,7 @@ Branch: REL9_2_STABLE [19ccaf9d4] 2014-11-10 15:21:26 -0500
      </para>
 
      <para>
-      In some contexts, constructs like <literal>row_to_json(tab.*)</> may
+      In some contexts, constructs like <literal>row_to_json(tab.*)</literal> may
       not produce the expected column names.  This is fixed properly as of
       9.4; in older branches, just ensure that we produce some nonempty
       name.  (In some cases this will be the underlying table's column name
@@ -5703,7 +5895,7 @@ Branch: REL9_2_STABLE [906599f65] 2014-11-22 16:01:15 -0500
     <listitem>
      <para>
       Fix mishandling of system columns,
-      particularly <structfield>tableoid</>, in FDW queries (Etsuro Fujita)
+      particularly <structfield>tableoid</structfield>, in FDW queries (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -5721,7 +5913,7 @@ Branch: REL9_3_STABLE [527ff8baf] 2015-01-30 12:30:43 -0500
      </para>
 
      <para>
-      This patch fixes corner-case <quote>unexpected operator NNNN</> planner
+      This patch fixes corner-case <quote>unexpected operator NNNN</quote> planner
       errors, and improves the selectivity estimates for some other cases.
      </para>
     </listitem>
@@ -5734,13 +5926,13 @@ Branch: REL9_2_STABLE [4586572d7] 2014-10-26 16:12:32 -0400
 
     <listitem>
      <para>
-      Avoid doing <literal><replaceable>indexed_column</> = ANY
-      (<replaceable>array</>)</literal> as an index qualifier if that leads
+      Avoid doing <literal><replaceable>indexed_column</replaceable> = ANY
+      (<replaceable>array</replaceable>)</literal> as an index qualifier if that leads
       to an inferior plan (Andrew Gierth)
      </para>
 
      <para>
-      In some cases, <literal>= ANY</> conditions applied to non-first index
+      In some cases, <literal>= ANY</literal> conditions applied to non-first index
       columns would be done as index conditions even though it would be
       better to use them as simple filter conditions.
      </para>
@@ -5753,9 +5945,9 @@ Branch: REL9_3_STABLE [4e54685d0] 2014-10-20 12:23:48 -0400
 
     <listitem>
      <para>
-      Fix <quote>variable not found in subplan target list</> planner
+      Fix <quote>variable not found in subplan target list</quote> planner
       failure when an inline-able SQL function taking a composite argument
-      is used in a <literal>LATERAL</> subselect and the composite argument
+      is used in a <literal>LATERAL</literal> subselect and the composite argument
       is a lateral reference (Tom Lane)
      </para>
     </listitem>
@@ -5771,7 +5963,7 @@ Branch: REL9_0_STABLE [288f15b7c] 2014-10-01 19:30:41 -0400
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -5800,8 +5992,8 @@ Branch: REL9_0_STABLE [50a757698] 2014-10-03 13:01:27 -0300
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -5835,7 +6027,7 @@ Branch: REL9_0_STABLE [91b4a881c] 2014-07-30 14:42:12 -0400
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -5899,12 +6091,12 @@ Branch: REL9_0_STABLE [804983961] 2014-07-29 11:58:17 +0300
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
@@ -5932,7 +6124,7 @@ Branch: REL9_0_STABLE [83c7bfb9a] 2014-11-06 21:26:21 +0900
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -5948,8 +6140,8 @@ Branch: REL9_0_STABLE [857a5d6b5] 2014-09-05 02:19:57 +0900
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
@@ -5965,7 +6157,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -5974,7 +6166,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -6018,7 +6210,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -6033,13 +6225,13 @@ Branch: REL9_0_STABLE [9880fea4f] 2014-11-25 17:39:09 +0200
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
@@ -6054,12 +6246,12 @@ Branch: REL9_0_STABLE [ac6e87537] 2014-10-22 18:42:01 -0400
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -6075,14 +6267,14 @@ Branch: REL9_0_STABLE [49ef4eba2] 2014-10-29 14:35:39 +0200
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -6098,7 +6290,7 @@ Branch: REL9_0_STABLE [1f3517039] 2014-11-25 14:10:54 +0200
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -6112,8 +6304,8 @@ Branch: REL9_0_STABLE [d9a1e9de5] 2014-10-06 21:23:50 -0400
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
@@ -6127,7 +6319,7 @@ Branch: REL9_0_STABLE [d67be559e] 2014-12-05 14:30:55 +0200
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
@@ -6142,12 +6334,12 @@ Branch: REL9_0_STABLE [44c518328] 2014-09-08 16:10:05 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -6157,7 +6349,7 @@ Branch: REL9_0_STABLE [44c518328] 2014-09-08 16:10:05 -0400
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -6175,17 +6367,17 @@ Branch: REL9_0_STABLE [2600e4436] 2014-12-31 12:17:12 -0500
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -6198,8 +6390,8 @@ Branch: REL9_3_STABLE [4b1953079] 2014-11-28 02:44:40 +0900
 
     <listitem>
      <para>
-      Make <application>psql</>'s <command>\watch</> command display
-      nulls as specified by <command>\pset null</> (Fujii Masao)
+      Make <application>psql</application>'s <command>\watch</command> command display
+      nulls as specified by <command>\pset null</command> (Fujii Masao)
      </para>
     </listitem>
 
@@ -6213,9 +6405,9 @@ Branch: REL9_0_STABLE [1f89fc218] 2014-09-12 11:24:39 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
@@ -6229,7 +6421,7 @@ Branch: REL9_3_STABLE [bb1e2426b] 2015-01-05 19:27:09 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle comments on event triggers
+      Fix <application>pg_dump</application> to handle comments on event triggers
       without failing (Tom Lane)
      </para>
     </listitem>
@@ -6243,8 +6435,8 @@ Branch: REL9_3_STABLE [cc609c46f] 2015-01-30 09:01:36 -0600
 
     <listitem>
      <para>
-      Allow parallel <application>pg_dump</> to
-      use <option>--serializable-deferrable</> (Kevin Grittner)
+      Allow parallel <application>pg_dump</application> to
+      use <option>--serializable-deferrable</option> (Kevin Grittner)
      </para>
     </listitem>
 
@@ -6257,7 +6449,7 @@ Branch: REL9_1_STABLE [40c333c39] 2014-07-25 19:48:54 -0400
 
     <listitem>
      <para>
-      Improve performance of <application>pg_dump</> when the database
+      Improve performance of <application>pg_dump</application> when the database
       contains many instances of multiple dependency paths between the same
       two objects (Tom Lane)
      </para>
@@ -6271,7 +6463,7 @@ Branch: REL9_2_STABLE [3c5ce5102] 2014-11-13 18:19:35 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to restore its ability to dump from
+      Fix <application>pg_dumpall</application> to restore its ability to dump from
       pre-8.1 servers (Gilles Darold)
      </para>
     </listitem>
@@ -6301,7 +6493,7 @@ Branch: REL9_0_STABLE [31021e7ba] 2014-10-17 12:49:15 -0400
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
@@ -6314,7 +6506,7 @@ Branch: REL9_3_STABLE [26a4e0ed7] 2014-11-15 01:21:11 +0100
     <listitem>
      <para>
       Fix failure to fsync tables in nondefault tablespaces
-      during <application>pg_upgrade</> (Abhijit Menon-Sen, Andres Freund)
+      during <application>pg_upgrade</application> (Abhijit Menon-Sen, Andres Freund)
      </para>
 
      <para>
@@ -6330,7 +6522,7 @@ Branch: REL9_3_STABLE [fca9f349b] 2014-08-07 14:56:13 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, cope with cases where the new cluster
+      In <application>pg_upgrade</application>, cope with cases where the new cluster
       creates a TOAST table for a table that didn't previously have one
       (Bruce Momjian)
      </para>
@@ -6347,8 +6539,8 @@ Branch: REL9_3_STABLE [24ae44914] 2014-08-04 11:45:45 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, don't try to
-      set <literal>autovacuum_multixact_freeze_max_age</> for the old cluster
+      In <application>pg_upgrade</application>, don't try to
+      set <literal>autovacuum_multixact_freeze_max_age</literal> for the old cluster
       (Bruce Momjian)
      </para>
 
@@ -6365,12 +6557,12 @@ Branch: REL9_3_STABLE [5724f491d] 2014-09-11 18:39:46 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve the transaction ID epoch
+      In <application>pg_upgrade</application>, preserve the transaction ID epoch
       (Bruce Momjian)
      </para>
 
      <para>
-      This oversight did not bother <productname>PostgreSQL</> proper,
+      This oversight did not bother <productname>PostgreSQL</productname> proper,
       but could confuse some external replication tools.
      </para>
     </listitem>
@@ -6386,7 +6578,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
@@ -6398,7 +6590,7 @@ Branch: REL9_3_STABLE [9747a9898] 2014-08-02 15:19:45 +0900
 
     <listitem>
      <para>
-      Fix memory leak in <application>pg_receivexlog</> (Fujii Masao)
+      Fix memory leak in <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -6409,7 +6601,7 @@ Branch: REL9_3_STABLE [39217ce41] 2014-08-02 14:59:10 +0900
 
     <listitem>
      <para>
-      Fix unintended suppression of <application>pg_receivexlog</> verbose
+      Fix unintended suppression of <application>pg_receivexlog</application> verbose
       messages (Fujii Masao)
      </para>
     </listitem>
@@ -6422,8 +6614,8 @@ Branch: REL9_2_STABLE [5ff8c2d7d] 2014-09-19 13:19:05 -0400
 
     <listitem>
      <para>
-      Fix failure of <filename>contrib/auto_explain</> to print per-node
-      timing information when doing <command>EXPLAIN ANALYZE</> (Tom Lane)
+      Fix failure of <filename>contrib/auto_explain</filename> to print per-node
+      timing information when doing <command>EXPLAIN ANALYZE</command> (Tom Lane)
      </para>
     </listitem>
 
@@ -6436,7 +6628,7 @@ Branch: REL9_1_STABLE [9807c8220] 2014-08-28 18:21:20 -0400
 
     <listitem>
      <para>
-      Fix upgrade-from-unpackaged script for <filename>contrib/citext</>
+      Fix upgrade-from-unpackaged script for <filename>contrib/citext</filename>
       (Tom Lane)
      </para>
     </listitem>
@@ -6449,7 +6641,7 @@ Branch: REL9_3_STABLE [f44290b7b] 2014-11-04 16:54:59 -0500
     <listitem>
      <para>
       Avoid integer overflow and buffer overrun
-      in <filename>contrib/hstore</>'s <function>hstore_to_json()</>
+      in <filename>contrib/hstore</filename>'s <function>hstore_to_json()</function>
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -6461,7 +6653,7 @@ Branch: REL9_3_STABLE [55c880797] 2014-12-01 11:44:48 -0500
 
     <listitem>
      <para>
-      Fix recognition of numbers in <function>hstore_to_json_loose()</>,
+      Fix recognition of numbers in <function>hstore_to_json_loose()</function>,
       so that JSON numbers and strings are correctly distinguished
       (Andrew Dunstan)
      </para>
@@ -6478,7 +6670,7 @@ Branch: REL9_0_STABLE [9dc2a3fd0] 2014-07-22 11:46:04 -0400
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -6498,7 +6690,7 @@ Branch: REL9_0_STABLE [ef5a3b957] 2014-11-11 17:22:58 -0500
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -6513,7 +6705,7 @@ Branch: REL9_1_STABLE [a855c90a7] 2014-11-19 12:26:06 -0500
 
     <listitem>
      <para>
-      Fix file descriptor leak in <filename>contrib/pg_test_fsync</>
+      Fix file descriptor leak in <filename>contrib/pg_test_fsync</filename>
       (Jeff Janes)
      </para>
 
@@ -6535,12 +6727,12 @@ Branch: REL9_0_STABLE [dc9a506e6] 2015-01-29 20:18:46 -0500
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
@@ -6555,12 +6747,12 @@ Branch: REL9_0_STABLE [6a694bbab] 2014-11-27 11:13:03 -0500
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -6575,7 +6767,7 @@ Branch: REL9_1_STABLE [7225abf00] 2014-11-05 11:34:25 -0500
 
     <listitem>
      <para>
-      Mark some <filename>contrib</> I/O functions with correct volatility
+      Mark some <filename>contrib</filename> I/O functions with correct volatility
       properties (Tom Lane)
      </para>
 
@@ -6696,10 +6888,10 @@ Branch: REL9_0_STABLE [4c6d0abde] 2014-07-22 11:02:25 -0400
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
@@ -6713,7 +6905,7 @@ Branch: REL9_0_STABLE [e6841c4d6] 2014-08-18 23:01:23 -0400
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
@@ -6730,13 +6922,13 @@ Branch: REL9_0_STABLE [338ff75fc] 2015-01-19 23:44:33 -0500
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -6756,15 +6948,15 @@ Branch: REL9_0_STABLE [870a980aa] 2014-10-16 15:22:26 -0400
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -6789,9 +6981,9 @@ Branch: REL9_0_STABLE [8b70023af] 2014-12-24 16:35:54 -0500
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -6818,21 +7010,21 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -6873,7 +7065,7 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
 
    <para>
     However, this release corrects a logic error
-    in <application>pg_upgrade</>, as well as an index corruption problem in
+    in <application>pg_upgrade</application>, as well as an index corruption problem in
     some GiST indexes.  See the first two changelog entries below to find out
     whether your installation has been affected and what steps you should take
     if so.
@@ -6900,15 +7092,15 @@ Branch: REL9_3_STABLE [cc5841809] 2014-06-24 16:11:06 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, remove <filename>pg_multixact</> files
-      left behind by <application>initdb</> (Bruce Momjian)
+      In <application>pg_upgrade</application>, remove <filename>pg_multixact</filename> files
+      left behind by <application>initdb</application> (Bruce Momjian)
      </para>
 
      <para>
-      If you used a pre-9.3.5 version of <application>pg_upgrade</> to
+      If you used a pre-9.3.5 version of <application>pg_upgrade</application> to
       upgrade a database cluster to 9.3, it might have left behind a file
-      <filename>$PGDATA/pg_multixact/offsets/0000</> that should not be
-      there and will eventually cause problems in <command>VACUUM</>.
+      <filename>$PGDATA/pg_multixact/offsets/0000</filename> that should not be
+      there and will eventually cause problems in <command>VACUUM</command>.
       <emphasis>However, in common cases this file is actually valid and
       must not be removed.</emphasis>
       To determine whether your installation has this problem, run this
@@ -6921,9 +7113,9 @@ SELECT EXISTS (SELECT * FROM list WHERE file = '0000') AND
        EXISTS (SELECT * FROM list WHERE file != '0000')
        AS file_0000_removal_required;
 </programlisting>
-      If this query returns <literal>t</>, manually remove the file
-      <filename>$PGDATA/pg_multixact/offsets/0000</>.
-      Do nothing if the query returns <literal>f</>.
+      If this query returns <literal>t</literal>, manually remove the file
+      <filename>$PGDATA/pg_multixact/offsets/0000</filename>.
+      Do nothing if the query returns <literal>f</literal>.
      </para>
     </listitem>
 
@@ -6939,15 +7131,15 @@ Branch: REL8_4_STABLE [e31d77c96] 2014-05-13 15:27:43 +0300
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -7032,7 +7224,7 @@ Branch: REL9_3_STABLE [167a2535f] 2014-06-09 15:17:23 -0400
 
     <listitem>
      <para>
-      Fix wraparound handling for <filename>pg_multixact/members</>
+      Fix wraparound handling for <filename>pg_multixact/members</filename>
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -7046,12 +7238,12 @@ Branch: REL9_3_STABLE [9a28c3752] 2014-06-27 14:43:52 -0400
 
     <listitem>
      <para>
-      Truncate <structname>pg_multixact</> during checkpoints, not
-      during <command>VACUUM</> (&Aacute;lvaro Herrera)
+      Truncate <structname>pg_multixact</structname> during checkpoints, not
+      during <command>VACUUM</command> (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      This change ensures that <structname>pg_multixact</> segments can't be
+      This change ensures that <structname>pg_multixact</structname> segments can't be
       removed if they'd still be needed during WAL replay after a crash.
      </para>
     </listitem>
@@ -7082,7 +7274,7 @@ Branch: REL8_4_STABLE [3ada1fab8] 2014-05-05 14:43:55 -0400
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -7108,8 +7300,8 @@ Branch: REL9_1_STABLE [555d0b200] 2014-06-26 10:42:08 -0700
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failures
-      with <literal>UNION ALL</> over subqueries reading from tables with
+      Fix <quote>could not find pathkey item to sort</quote> planner failures
+      with <literal>UNION ALL</literal> over subqueries reading from tables with
       inheritance children (Tom Lane)
      </para>
     </listitem>
@@ -7148,7 +7340,7 @@ Branch: REL9_2_STABLE [0901dbab3] 2014-04-29 13:12:33 -0400
     <listitem>
      <para>
       Improve planner to drop constant-NULL inputs
-      of <literal>AND</>/<literal>OR</> when possible (Tom Lane)
+      of <literal>AND</literal>/<literal>OR</literal> when possible (Tom Lane)
      </para>
 
      <para>
@@ -7166,8 +7358,8 @@ Branch: REL9_3_STABLE [d359f71ac] 2014-04-03 22:02:27 -0400
 
     <listitem>
      <para>
-      Ensure that the planner sees equivalent <literal>VARIADIC</> and
-      non-<literal>VARIADIC</> function calls as equivalent (Tom Lane)
+      Ensure that the planner sees equivalent <literal>VARIADIC</literal> and
+      non-<literal>VARIADIC</literal> function calls as equivalent (Tom Lane)
      </para>
 
      <para>
@@ -7188,13 +7380,13 @@ Branch: REL9_3_STABLE [a1fc36495] 2014-06-24 21:22:47 -0700
 
     <listitem>
      <para>
-      Fix handling of nested <type>JSON</> objects
-      in <function>json_populate_recordset()</> and friends
+      Fix handling of nested <type>JSON</type> objects
+      in <function>json_populate_recordset()</function> and friends
       (Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A nested <type>JSON</> object could result in previous fields of the
+      A nested <type>JSON</type> object could result in previous fields of the
       parent object not being shown in the output.
      </para>
     </listitem>
@@ -7208,13 +7400,13 @@ Branch: REL9_2_STABLE [25c933c5c] 2014-05-09 12:55:06 -0400
 
     <listitem>
      <para>
-      Fix identification of input type category in <function>to_json()</>
+      Fix identification of input type category in <function>to_json()</function>
       and friends (Tom Lane)
      </para>
 
      <para>
-      This is known to have led to inadequate quoting of <type>money</>
-      fields in the <type>JSON</> result, and there may have been wrong
+      This is known to have led to inadequate quoting of <type>money</type>
+      fields in the <type>JSON</type> result, and there may have been wrong
       results for other data types as well.
      </para>
     </listitem>
@@ -7239,7 +7431,7 @@ Branch: REL8_4_STABLE [70debcf09] 2014-05-01 15:19:23 -0400
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
@@ -7256,7 +7448,7 @@ Branch: REL8_4_STABLE [a81fbcfb3] 2014-07-11 19:12:56 -0400
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -7292,7 +7484,7 @@ Branch: REL8_4_STABLE [d297c91d4] 2014-06-19 22:14:00 -0400
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -7327,7 +7519,7 @@ Branch: REL8_4_STABLE [f3f40434b] 2014-06-10 22:49:08 -0400
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -7367,7 +7559,7 @@ Branch: REL8_4_STABLE [80d45ae4e] 2014-06-04 23:27:38 +0200
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
@@ -7384,12 +7576,12 @@ Branch: REL8_4_STABLE [82fbd88a7] 2014-04-24 13:30:14 -0400
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -7408,7 +7600,7 @@ Branch: REL8_4_STABLE [4b767789d] 2014-07-15 13:24:07 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -7422,8 +7614,8 @@ Branch: REL9_3_STABLE [e86cfc4bb] 2014-06-27 14:43:45 -0400
 
     <listitem>
      <para>
-      Prevent <structname>pg_class</>.<structfield>relminmxid</> values from
-      going backwards during <command>VACUUM FULL</> (&Aacute;lvaro Herrera)
+      Prevent <structname>pg_class</structname>.<structfield>relminmxid</structfield> values from
+      going backwards during <command>VACUUM FULL</command> (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -7461,7 +7653,7 @@ Branch: REL9_3_STABLE [e31193d49] 2014-05-01 20:22:39 -0400
     <listitem>
      <para>
       Fix dumping of rules/views when subsequent addition of a column has
-      resulted in multiple input columns matching a <literal>USING</>
+      resulted in multiple input columns matching a <literal>USING</literal>
       specification (Tom Lane)
      </para>
     </listitem>
@@ -7476,7 +7668,7 @@ Branch: REL9_3_STABLE [b978ab5f6] 2014-07-19 14:29:05 -0400
     <listitem>
      <para>
       Repair view printing for some cases involving functions
-      in <literal>FROM</> that return a composite type containing dropped
+      in <literal>FROM</literal> that return a composite type containing dropped
       columns (Tom Lane)
      </para>
     </listitem>
@@ -7498,7 +7690,7 @@ Branch: REL8_4_STABLE [969735cf1] 2014-04-05 18:16:24 -0400
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
@@ -7513,7 +7705,7 @@ Branch: REL9_1_STABLE [b7a424371] 2014-04-02 17:11:34 -0400
 
     <listitem>
      <para>
-      Fix client host name lookup when processing <filename>pg_hba.conf</>
+      Fix client host name lookup when processing <filename>pg_hba.conf</filename>
       entries that specify host names instead of IP addresses (Tom Lane)
      </para>
 
@@ -7534,14 +7726,14 @@ Branch: REL9_2_STABLE [6d25eb314] 2014-04-04 22:03:42 -0400
 
     <listitem>
      <para>
-      Allow the root user to use <literal>postgres -C variable</> and
-      <literal>postgres --describe-config</> (MauMau)
+      Allow the root user to use <literal>postgres -C variable</literal> and
+      <literal>postgres --describe-config</literal> (MauMau)
      </para>
 
      <para>
       The prohibition on starting the server as root does not need to extend
       to these operations, and relaxing it prevents failure
-      of <application>pg_ctl</> in some scenarios.
+      of <application>pg_ctl</application> in some scenarios.
      </para>
     </listitem>
 
@@ -7559,7 +7751,7 @@ Branch: REL8_4_STABLE [95cefd30e] 2014-06-14 09:41:18 -0400
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -7568,16 +7760,16 @@ Branch: REL8_4_STABLE [95cefd30e] 2014-06-14 09:41:18 -0400
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -7651,9 +7843,9 @@ Branch: REL8_4_STABLE [e3f273ff6] 2014-04-30 10:39:03 +0300
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
@@ -7669,7 +7861,7 @@ Branch: REL8_4_STABLE [ae41bb4be] 2014-05-30 18:18:32 -0400
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -7690,17 +7882,17 @@ Branch: REL8_4_STABLE [664ac3de7] 2014-05-07 21:38:50 -0400
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -7718,7 +7910,7 @@ Branch: REL8_4_STABLE [b4ae2e37d] 2014-04-16 18:59:48 +0200
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
@@ -7741,8 +7933,8 @@ Branch: REL9_0_STABLE [0c2eb989e] 2014-04-09 12:12:32 +0200
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -7756,13 +7948,13 @@ Branch: REL9_3_STABLE [3080bbaa9] 2014-03-29 17:34:03 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to cope with a materialized view that
+      Fix <application>pg_dump</application> to cope with a materialized view that
       depends on a table's primary key (Tom Lane)
      </para>
 
      <para>
       This occurs if the view's query relies on functional dependency to
-      abbreviate a <literal>GROUP BY</> list.  <application>pg_dump</> got
+      abbreviate a <literal>GROUP BY</literal> list.  <application>pg_dump</application> got
       sufficiently confused that it dumped the materialized view as a
       regular view.
      </para>
@@ -7776,7 +7968,7 @@ Branch: REL9_3_STABLE [63817f86b] 2014-03-18 10:38:38 -0400
 
     <listitem>
      <para>
-      Fix parsing of <application>pg_dumpall</>'s <option>-i</> switch
+      Fix parsing of <application>pg_dumpall</application>'s <option>-i</option> switch
       (Tom Lane)
      </para>
     </listitem>
@@ -7794,13 +7986,13 @@ Branch: REL8_4_STABLE [6adddac8a] 2014-06-12 20:14:55 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
@@ -7815,12 +8007,12 @@ Branch: REL9_2_STABLE [759c9fb63] 2014-07-07 13:24:08 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for cases where the new server creates
+      Fix <application>pg_upgrade</application> for cases where the new server creates
       a TOAST table but the old version did not (Bruce Momjian)
      </para>
 
      <para>
-      This rare situation would manifest as <quote>relation OID mismatch</>
+      This rare situation would manifest as <quote>relation OID mismatch</quote>
       errors.
      </para>
     </listitem>
@@ -7839,9 +8031,9 @@ Branch: REL9_3_STABLE [e7984cca0] 2014-07-21 11:42:05 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>,
-      preserve <structname>pg_database</>.<structfield>datminmxid</>
-      and <structname>pg_class</>.<structfield>relminmxid</> values from the
+      In <application>pg_upgrade</application>,
+      preserve <structname>pg_database</structname>.<structfield>datminmxid</structfield>
+      and <structname>pg_class</structname>.<structfield>relminmxid</structfield> values from the
       old cluster, or insert reasonable values when upgrading from pre-9.3;
       also defend against unreasonable values in the core server
       (Bruce Momjian, &Aacute;lvaro Herrera, Tom Lane)
@@ -7864,13 +8056,13 @@ Branch: REL9_2_STABLE [31f579f09] 2014-05-20 12:20:57 -0400
 
     <listitem>
      <para>
-      Prevent <filename>contrib/auto_explain</> from changing the output of
-      a user's <command>EXPLAIN</> (Tom Lane)
+      Prevent <filename>contrib/auto_explain</filename> from changing the output of
+      a user's <command>EXPLAIN</command> (Tom Lane)
      </para>
 
      <para>
-      If <filename>auto_explain</> is active, it could cause
-      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</> command to nonetheless
+      If <filename>auto_explain</filename> is active, it could cause
+      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal> command to nonetheless
       print timing information.
      </para>
     </listitem>
@@ -7885,7 +8077,7 @@ Branch: REL9_2_STABLE [3e2cfa42f] 2014-06-20 12:27:04 -0700
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in <filename>contrib/dblink</>
+      Fix query-lifespan memory leak in <filename>contrib/dblink</filename>
       (MauMau, Joe Conway)
      </para>
     </listitem>
@@ -7902,7 +8094,7 @@ Branch: REL8_4_STABLE [df2e62603] 2014-04-17 12:37:53 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -7919,7 +8111,7 @@ Branch: REL9_2_STABLE [f6d6b7b1e] 2014-06-30 17:00:40 -0400
     <listitem>
      <para>
       Prevent use of already-freed memory in
-      <filename>contrib/pgstattuple</>'s <function>pgstat_heap()</>
+      <filename>contrib/pgstattuple</filename>'s <function>pgstat_heap()</function>
       (Noah Misch)
      </para>
     </listitem>
@@ -7936,13 +8128,13 @@ Branch: REL8_4_STABLE [fd785441f] 2014-05-29 13:51:18 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
@@ -7960,7 +8152,7 @@ Branch: REL8_4_STABLE [c51da696b] 2014-07-19 15:01:45 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -8071,7 +8263,7 @@ Branch: REL9_0_STABLE [7aea1050e] 2014-03-13 12:03:07 -0400
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -8089,8 +8281,8 @@ Branch: REL9_3_STABLE [3973034e6] 2014-03-06 11:37:04 -0500
 
     <listitem>
      <para>
-      Allow materialized views to be referenced in <command>UPDATE</>
-      and <command>DELETE</> commands (Michael Paquier)
+      Allow materialized views to be referenced in <command>UPDATE</command>
+      and <command>DELETE</command> commands (Michael Paquier)
      </para>
 
      <para>
@@ -8133,7 +8325,7 @@ Branch: REL8_4_STABLE [dd378dd1e] 2014-02-18 12:44:36 -0500
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -8156,17 +8348,17 @@ Branch: REL8_4_STABLE [f043bddfe] 2014-03-06 19:31:22 -0500
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -8201,9 +8393,9 @@ Branch: REL9_3_STABLE [e8655a77f] 2014-02-21 17:10:49 -0500
     <listitem>
      <para>
       Use non-default selectivity estimates for
-      <literal><replaceable>value</> IN (<replaceable>list</>)</literal> and
-      <literal><replaceable>value</> <replaceable>operator</> ANY
-      (<replaceable>array</>)</literal>
+      <literal><replaceable>value</replaceable> IN (<replaceable>list</replaceable>)</literal> and
+      <literal><replaceable>value</replaceable> <replaceable>operator</replaceable> ANY
+      (<replaceable>array</replaceable>)</literal>
       expressions when the righthand side is a stable expression (Tom Lane)
      </para>
     </listitem>
@@ -8217,16 +8409,16 @@ Branch: REL9_3_STABLE [13ea43ab8] 2014-03-05 13:03:29 -0300
     <listitem>
      <para>
       Remove the correct per-database statistics file during <command>DROP
-      DATABASE</> (Tomas Vondra)
+      DATABASE</command> (Tomas Vondra)
      </para>
 
      <para>
       This fix prevents a permanent leak of statistics file space.
-      Users who have done many <command>DROP DATABASE</> commands since
-      upgrading to <productname>PostgreSQL</> 9.3 may wish to check their
+      Users who have done many <command>DROP DATABASE</command> commands since
+      upgrading to <productname>PostgreSQL</productname> 9.3 may wish to check their
       statistics directory and delete statistics files that do not
       correspond to any existing database.  Please note
-      that <filename>db_0.stat</> should not be removed.
+      that <filename>db_0.stat</filename> should not be removed.
      </para>
     </listitem>
 
@@ -8238,12 +8430,12 @@ Branch: REL9_3_STABLE [dcd1131c8] 2014-03-06 21:40:50 +0200
 
     <listitem>
      <para>
-      Fix <application>walsender</> ping logic to avoid inappropriate
+      Fix <application>walsender</application> ping logic to avoid inappropriate
       disconnects under continuous load (Andres Freund, Heikki Linnakangas)
      </para>
 
      <para>
-      <application>walsender</> failed to send ping messages to the client
+      <application>walsender</application> failed to send ping messages to the client
       if it was constantly busy sending WAL data; but it expected to see
       ping responses despite that, and would therefore disconnect
       once <xref linkend="guc-wal-sender-timeout"> elapsed.
@@ -8260,8 +8452,8 @@ Branch: REL9_1_STABLE [65e8dbb18] 2014-03-17 20:42:35 +0900
 
     <listitem>
      <para>
-      Fix <application>walsender</>'s failure to shut down cleanly when client
-      is <application>pg_receivexlog</> (Fujii Masao)
+      Fix <application>walsender</application>'s failure to shut down cleanly when client
+      is <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -8324,13 +8516,13 @@ Branch: REL8_4_STABLE [172c53e92] 2014-03-13 20:59:57 -0400
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
@@ -8358,13 +8550,13 @@ Branch: REL9_2_STABLE [b315b767f] 2014-03-10 15:47:13 -0400
 
     <listitem>
      <para>
-      Fix tracking of <application>psql</> script line numbers
-      during <literal>\copy</> from out-of-line data
+      Fix tracking of <application>psql</application> script line numbers
+      during <literal>\copy</literal> from out-of-line data
       (Kumar Rajeev Rastogi, Amit Khandekar)
      </para>
 
      <para>
-      <literal>\copy ... from</> incremented the script file line number
+      <literal>\copy ... from</literal> incremented the script file line number
       for each data line, even if the data was not coming from the script
       file.  This mistake resulted in wrong line numbers being reported for
       any errors occurring later in the same script file.
@@ -8379,12 +8571,12 @@ Branch: REL9_3_STABLE [73f0483fd] 2014-03-07 16:36:50 -0500
 
     <listitem>
      <para>
-      Fix <application>contrib/postgres_fdw</> to handle multiple join
+      Fix <application>contrib/postgres_fdw</application> to handle multiple join
       conditions properly (Tom Lane)
      </para>
 
      <para>
-      This oversight could result in sending <literal>WHERE</> clauses to
+      This oversight could result in sending <literal>WHERE</literal> clauses to
       the remote server for execution even though the clauses are not known
       to have the same semantics on the remote server (for example, clauses
       that use non-built-in operators).  The query might succeed anyway,
@@ -8404,7 +8596,7 @@ Branch: REL9_0_STABLE [665515539] 2014-03-16 11:47:37 +0100
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
@@ -8421,7 +8613,7 @@ Branch: REL8_4_STABLE [6e6c2c2e1] 2014-03-15 13:36:57 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -8494,19 +8686,19 @@ Branch: REL8_4_STABLE [ff35425c8] 2014-02-17 09:33:38 -0500
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -8529,7 +8721,7 @@ Branch: REL8_4_STABLE [823b9dc25] 2014-02-17 09:33:38 -0500
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -8559,7 +8751,7 @@ Branch: REL8_4_STABLE [e46476133] 2014-02-17 09:33:38 -0500
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -8583,12 +8775,12 @@ Branch: REL8_4_STABLE [d0ed1a6c0] 2014-02-17 09:33:39 -0500
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -8635,7 +8827,7 @@ Branch: REL8_4_STABLE [69d2bc14a] 2014-02-17 11:20:38 -0500
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -8657,16 +8849,16 @@ Branch: REL8_4_STABLE [69d2bc14a] 2014-02-17 11:20:38 -0500
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
@@ -8683,19 +8875,19 @@ Branch: REL8_4_STABLE [f58663ab1] 2014-02-17 11:24:51 -0500
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -8716,7 +8908,7 @@ Branch: REL9_3_STABLE [8e9a16ab8] 2013-12-16 11:29:51 -0300
      <para>
       The logic for tuple freezing was unable to handle some cases involving
       freezing of
-      <link linkend="vacuum-for-multixact-wraparound"><firstterm>multixact</>
+      <link linkend="vacuum-for-multixact-wraparound"><firstterm>multixact</firstterm>
       IDs</link>, with the practical effect that shared row-level locks
       might be forgotten once old enough.
      </para>
@@ -8725,7 +8917,7 @@ Branch: REL9_3_STABLE [8e9a16ab8] 2013-12-16 11:29:51 -0300
       Fixing this required changing the WAL record format for tuple
       freezing.  While this is no issue for standalone servers, when using
       replication it means that <emphasis>standby servers must be upgraded
-      to 9.3.3 or later before their masters are</>.  An older standby will
+      to 9.3.3 or later before their masters are</emphasis>.  An older standby will
       be unable to interpret freeze records generated by a newer master, and
       will fail with a PANIC message.  (In such a case, upgrading the
       standby should be sufficient to let it resume execution.)
@@ -8783,8 +8975,8 @@ Branch: REL9_3_STABLE [db1014bc4] 2013-12-18 13:31:27 -0300
      <para>
       This oversight could allow referential integrity checks to give false
       positives (for instance, allow deletes that should have been rejected).
-      Applications using the new commands <literal>SELECT FOR KEY SHARE</>
-      and <literal>SELECT FOR NO KEY UPDATE</> might also have suffered
+      Applications using the new commands <literal>SELECT FOR KEY SHARE</literal>
+      and <literal>SELECT FOR NO KEY UPDATE</literal> might also have suffered
       locking failures of this kind.
      </para>
     </listitem>
@@ -8797,7 +8989,7 @@ Branch: REL9_3_STABLE [c6cd27e36] 2013-12-05 12:21:55 -0300
 
     <listitem>
      <para>
-      Prevent <quote>forgetting</> valid row locks when one of several
+      Prevent <quote>forgetting</quote> valid row locks when one of several
       holders of a row lock aborts (&Aacute;lvaro Herrera)
      </para>
 
@@ -8822,8 +9014,8 @@ Branch: REL9_3_STABLE [2dcc48c35] 2013-12-05 17:47:51 -0300
 
      <para>
       This mistake could result in spurious <quote>could not serialize access
-      due to concurrent update</> errors in <literal>REPEATABLE READ</>
-      and <literal>SERIALIZABLE</> transaction isolation modes.
+      due to concurrent update</quote> errors in <literal>REPEATABLE READ</literal>
+      and <literal>SERIALIZABLE</literal> transaction isolation modes.
      </para>
     </listitem>
 
@@ -8836,7 +9028,7 @@ Branch: REL9_3_STABLE [03db79459] 2014-01-02 18:17:07 -0300
     <listitem>
      <para>
       Handle wraparound correctly during extension or truncation
-      of <filename>pg_multixact/members</>
+      of <filename>pg_multixact/members</filename>
       (Andres Freund, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -8849,7 +9041,7 @@ Branch: REL9_3_STABLE [948a3dfbb] 2014-01-02 18:17:29 -0300
 
     <listitem>
      <para>
-      Fix handling of 5-digit filenames in <filename>pg_multixact/members</>
+      Fix handling of 5-digit filenames in <filename>pg_multixact/members</filename>
       (&Aacute;lvaro Herrera)
      </para>
 
@@ -8886,7 +9078,7 @@ Branch: REL9_3_STABLE [85d3b3c3a] 2013-12-19 16:39:59 -0300
 
      <para>
       This fixes a performance regression from pre-9.3 versions when doing
-      <literal>SELECT FOR UPDATE</> followed by <literal>UPDATE/DELETE</>.
+      <literal>SELECT FOR UPDATE</literal> followed by <literal>UPDATE/DELETE</literal>.
      </para>
     </listitem>
 
@@ -8900,7 +9092,7 @@ Branch: REL9_3_STABLE [762bd379a] 2014-02-14 15:18:34 +0200
      <para>
       During archive recovery, prefer highest timeline number when WAL
       segments with the same ID are present in both the archive
-      and <filename>pg_xlog/</> (Kyotaro Horiguchi)
+      and <filename>pg_xlog/</filename> (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -8929,7 +9121,7 @@ Branch: REL8_4_STABLE [9620fede9] 2014-02-12 14:52:32 -0500
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -8958,7 +9150,7 @@ Branch: REL9_0_STABLE [5301c8395] 2014-01-08 14:34:21 +0200
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
@@ -8986,13 +9178,13 @@ Branch: REL9_0_STABLE [5d742b9ce] 2014-01-14 17:35:00 -0500
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -9028,8 +9220,8 @@ Branch: REL9_1_STABLE [0402f2441] 2014-01-08 23:31:01 +0200
 
     <listitem>
      <para>
-      When <literal>pause_at_recovery_target</>
-      and <literal>recovery_target_inclusive</> are both set, ensure the
+      When <literal>pause_at_recovery_target</literal>
+      and <literal>recovery_target_inclusive</literal> are both set, ensure the
       target record is applied before pausing, not after (Heikki
       Linnakangas)
      </para>
@@ -9058,14 +9250,14 @@ Branch: REL9_3_STABLE [478af9b79] 2013-12-13 11:50:25 -0500
     <listitem>
      <para>
       Prevent timeout interrupts from taking control away from mainline
-      code unless <varname>ImmediateInterruptOK</> is set
+      code unless <varname>ImmediateInterruptOK</varname> is set
       (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This is a serious issue for any application making use of statement
       timeouts, as it could cause all manner of strange failures after a
-      timeout occurred.  We have seen reports of <quote>stuck</> spinlocks,
+      timeout occurred.  We have seen reports of <quote>stuck</quote> spinlocks,
       ERRORs being unexpectedly promoted to PANICs, unkillable backends,
       and other misbehaviors.
      </para>
@@ -9088,7 +9280,7 @@ Branch: REL8_4_STABLE [458b20f2d] 2014-01-31 21:41:09 -0500
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
@@ -9119,13 +9311,13 @@ Branch: REL8_4_STABLE [01b882fd8] 2014-01-29 20:04:14 -0500
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
@@ -9141,7 +9333,7 @@ Branch: REL8_4_STABLE [d0070ac81] 2014-01-11 16:35:44 -0500
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -9185,7 +9377,7 @@ Branch: REL8_4_STABLE [a8a46d846] 2014-02-13 14:24:58 -0500
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -9227,7 +9419,7 @@ Branch: REL9_0_STABLE [f2eede9b5] 2014-01-21 23:01:40 -0500
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
@@ -9259,7 +9451,7 @@ Branch: REL8_4_STABLE [884c6384a] 2013-12-10 16:10:36 -0500
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
@@ -9272,13 +9464,13 @@ Branch: REL9_3_STABLE [a4aa854ca] 2014-01-30 14:51:19 -0500
 
     <listitem>
      <para>
-      Fix mishandling of <literal>WHERE</> conditions pulled up from
-      a <literal>LATERAL</> subquery (Tom Lane)
+      Fix mishandling of <literal>WHERE</literal> conditions pulled up from
+      a <literal>LATERAL</literal> subquery (Tom Lane)
      </para>
 
      <para>
       The typical symptom of this bug was a <quote>JOIN qualification
-      cannot refer to other relations</> error, though subtle logic
+      cannot refer to other relations</quote> error, though subtle logic
       errors in created plans seem possible as well.
      </para>
     </listitem>
@@ -9291,8 +9483,8 @@ Branch: REL9_3_STABLE [27ff4cfe7] 2014-01-11 19:03:15 -0500
 
     <listitem>
      <para>
-      Disallow <literal>LATERAL</> references to the target table of
-      an <literal>UPDATE/DELETE</> (Tom Lane)
+      Disallow <literal>LATERAL</literal> references to the target table of
+      an <literal>UPDATE/DELETE</literal> (Tom Lane)
      </para>
 
      <para>
@@ -9310,12 +9502,12 @@ Branch: REL9_2_STABLE [5d545b7ed] 2013-12-14 17:34:00 -0500
 
     <listitem>
      <para>
-      Fix <literal>UPDATE/DELETE</> of an inherited target table
-      that has <literal>UNION ALL</> subqueries (Tom Lane)
+      Fix <literal>UPDATE/DELETE</literal> of an inherited target table
+      that has <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Without this fix, <literal>UNION ALL</> subqueries aren't correctly
+      Without this fix, <literal>UNION ALL</literal> subqueries aren't correctly
       inserted into the update plans for inheritance child tables after the
       first one, typically resulting in no update happening for those child
       table(s).
@@ -9330,7 +9522,7 @@ Branch: REL9_3_STABLE [663f8419b] 2013-12-23 22:18:23 -0500
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</> to not fail on a column that's a domain over
+      Fix <command>ANALYZE</command> to not fail on a column that's a domain over
       a range type (Tom Lane)
      </para>
     </listitem>
@@ -9347,12 +9539,12 @@ Branch: REL8_4_STABLE [00b77771a] 2014-01-11 13:42:11 -0500
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -9370,14 +9562,14 @@ Branch: REL8_4_STABLE [0fb4e3ceb] 2014-01-18 18:50:47 -0500
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
@@ -9405,8 +9597,8 @@ Branch: REL8_4_STABLE [57ac7d8a7] 2014-01-08 20:18:24 -0500
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -9487,12 +9679,12 @@ Branch: REL8_4_STABLE [6141983fb] 2014-02-10 10:00:50 +0200
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -9508,8 +9700,8 @@ Branch: REL9_1_STABLE [026a91f86] 2014-01-07 18:00:36 +0100
 
     <listitem>
      <para>
-      Fix placement of permissions checks in <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> (Andres Freund, Magnus Hagander)
+      Fix placement of permissions checks in <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> (Andres Freund, Magnus Hagander)
      </para>
 
      <para>
@@ -9530,7 +9722,7 @@ Branch: REL8_4_STABLE [69f77d756] 2013-12-15 11:11:11 +0900
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
@@ -9544,14 +9736,14 @@ Branch: REL9_2_STABLE [888b56570] 2014-02-03 14:46:57 -0500
 
     <listitem>
      <para>
-      Fix <literal>*</>-qualification of named parameters in SQL-language
+      Fix <literal>*</literal>-qualification of named parameters in SQL-language
       functions (Tom Lane)
      </para>
 
      <para>
       Given a composite-type parameter
-      named <literal>foo</>, <literal>$1.*</> worked fine,
-      but <literal>foo.*</> not so much.
+      named <literal>foo</literal>, <literal>$1.*</literal> worked fine,
+      but <literal>foo.*</literal> not so much.
      </para>
     </listitem>
 
@@ -9567,11 +9759,11 @@ Branch: REL8_4_STABLE [5525529db] 2014-01-23 23:02:30 +0900
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
@@ -9587,14 +9779,14 @@ Branch: REL8_4_STABLE [7644a7bd8] 2014-02-13 18:45:32 -0500
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
@@ -9609,7 +9801,7 @@ Branch: REL9_2_STABLE [fa28f9cba] 2014-01-04 16:05:23 -0500
     <listitem>
      <para>
       Fix incorrect translation handling in
-      some <application>psql</> <literal>\d</> commands
+      some <application>psql</application> <literal>\d</literal> commands
       (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -9623,7 +9815,7 @@ Branch: REL9_2_STABLE [0ae288d2d] 2014-02-12 14:51:00 +0100
 
     <listitem>
      <para>
-      Ensure <application>pg_basebackup</>'s background process is killed
+      Ensure <application>pg_basebackup</application>'s background process is killed
       when exiting its foreground process (Magnus Hagander)
      </para>
     </listitem>
@@ -9639,7 +9831,7 @@ Branch: REL9_1_STABLE [c6e5c4dd1] 2014-02-09 12:09:55 +0100
     <listitem>
      <para>
       Fix possible incorrect printing of filenames
-      in <application>pg_basebackup</>'s verbose mode (Magnus Hagander)
+      in <application>pg_basebackup</application>'s verbose mode (Magnus Hagander)
      </para>
     </listitem>
 
@@ -9670,7 +9862,7 @@ Branch: REL8_4_STABLE [d68a65b01] 2014-01-09 15:58:37 +0100
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
@@ -9686,7 +9878,7 @@ Branch: REL8_4_STABLE [96de4939c] 2014-01-01 12:44:58 +0100
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
@@ -9703,7 +9895,7 @@ Branch: REL8_4_STABLE [6c8b16e30] 2013-12-07 16:56:34 -0800
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -9724,7 +9916,7 @@ Branch: REL8_4_STABLE [492b68541] 2014-01-13 15:44:14 +0200
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
@@ -9737,7 +9929,7 @@ Branch: REL9_3_STABLE [27902bc91] 2013-12-12 19:07:53 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgbench</>'s progress logging to avoid overflow
+      Fix <filename>contrib/pgbench</filename>'s progress logging to avoid overflow
       when the scale factor is large (Tatsuo Ishii)
      </para>
     </listitem>
@@ -9751,8 +9943,8 @@ Branch: REL9_2_STABLE [27ab1eb7e] 2014-01-21 16:34:35 -0500
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_stat_statement</>'s handling
-      of <literal>CURRENT_DATE</> and related constructs (Kyotaro
+      Fix <filename>contrib/pg_stat_statement</filename>'s handling
+      of <literal>CURRENT_DATE</literal> and related constructs (Kyotaro
       Horiguchi)
      </para>
     </listitem>
@@ -9766,7 +9958,7 @@ Branch: REL9_3_STABLE [eb3d350db] 2014-02-03 21:30:28 -0500
     <listitem>
      <para>
       Improve lost-connection error handling
-      in <filename>contrib/postgres_fdw</> (Tom Lane)
+      in <filename>contrib/postgres_fdw</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -9799,13 +9991,13 @@ Branch: REL8_4_STABLE [ae3c98b9b] 2014-02-01 15:16:52 -0500
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
@@ -9821,7 +10013,7 @@ Branch: REL9_0_STABLE [1c0bf372f] 2014-02-01 16:14:15 -0500
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
@@ -9850,8 +10042,8 @@ Branch: REL8_4_STABLE [432735cbf] 2014-02-10 20:48:30 -0500
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -9860,7 +10052,7 @@ Branch: REL8_4_STABLE [432735cbf] 2014-02-10 20:48:30 -0500
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
@@ -9877,13 +10069,13 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -9935,19 +10127,19 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
       need to happen before actual loss occurs, but it's not zero.  In 9.2.0
       and later, the probability of loss is higher, and it's also possible
-      to get <quote>could not access status of transaction</> errors as a
+      to get <quote>could not access status of transaction</quote> errors as a
       consequence of this bug.  Users upgrading from releases 9.0.4 or 8.4.8
       or earlier are not affected, but all later versions contain the bug.
      </para>
@@ -9955,12 +10147,12 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
@@ -9972,14 +10164,14 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
      <para>
       These bugs could lead to <quote>could not access status of
-      transaction</> errors, or to duplicate or vanishing rows.
+      transaction</quote> errors, or to duplicate or vanishing rows.
       Users upgrading from releases prior to 9.3.0 are not affected.
      </para>
 
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix latent corruption but will not be able to
       fix all pre-existing data errors.
      </para>
@@ -9995,7 +10187,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -10028,7 +10220,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      <para>
       These bugs could result in incorrect behavior, such as locking or even
       updating the wrong row, in the presence of concurrent updates.
-      Spurious <quote>unable to fetch updated version of tuple</> errors
+      Spurious <quote>unable to fetch updated version of tuple</quote> errors
       were also possible.
      </para>
     </listitem>
@@ -10040,7 +10232,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
      <para>
       This could lead to corruption of the lock data structures in shared
-      memory, causing <quote>lock already held</> and other odd errors.
+      memory, causing <quote>lock already held</quote> and other odd errors.
      </para>
     </listitem>
 
@@ -10057,7 +10249,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -10068,14 +10260,14 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Ensure an anti-wraparound <command>VACUUM</> counts a page as scanned
+      Ensure an anti-wraparound <command>VACUUM</command> counts a page as scanned
       when it's only verified that no tuples need freezing (Sergey
       Burladyan, Jeff Janes)
      </para>
 
      <para>
       This bug could result in failing to
-      advance <structfield>relfrozenxid</>, so that the table would still be
+      advance <structfield>relfrozenxid</structfield>, so that the table would still be
       thought to need another anti-wraparound vacuum.  In the worst case the
       database might even shut down to prevent wraparound.
      </para>
@@ -10104,7 +10296,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix <quote>unexpected spgdoinsert() failure</> error during SP-GiST
+      Fix <quote>unexpected spgdoinsert() failure</quote> error during SP-GiST
       index creation (Teodor Sigaev)
      </para>
     </listitem>
@@ -10122,12 +10314,12 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      </para>
 
      <para>
-      Historically <productname>PostgreSQL</> has accepted queries like
+      Historically <productname>PostgreSQL</productname> has accepted queries like
 <programlisting>
 SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 </programlisting>
       although a strict reading of the SQL standard would forbid the
-      duplicate usage of table alias <literal>x</>.  A misguided change in
+      duplicate usage of table alias <literal>x</literal>.  A misguided change in
       9.3.0 caused it to reject some such cases that were formerly accepted.
       Restore the previous behavior.
      </para>
@@ -10135,8 +10327,8 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -10153,14 +10345,14 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect planning in cases where the same non-strict expression
-      appears in multiple <literal>WHERE</> and outer <literal>JOIN</>
+      appears in multiple <literal>WHERE</literal> and outer <literal>JOIN</literal>
       equality clauses (Tom Lane)
      </para>
     </listitem>
@@ -10248,20 +10440,20 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Return a valid JSON value when converting an empty <type>hstore</> value
-      to <type>json</>
+      Return a valid JSON value when converting an empty <type>hstore</type> value
+      to <type>json</type>
       (Oskari Saarenmaa)
      </para>
     </listitem>
@@ -10276,7 +10468,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -10290,7 +10482,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -10301,10 +10493,10 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -10314,19 +10506,19 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix <application>pg_isready</> to handle its <option>-d</> option
+      Fix <application>pg_isready</application> to handle its <option>-d</option> option
       properly (Fabr&iacute;zio de Royes Mello and Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of WAL file names in <application>pg_receivexlog</>
+      Fix parsing of WAL file names in <application>pg_receivexlog</application>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      This error made <application>pg_receivexlog</> unable to restart
+      This error made <application>pg_receivexlog</application> unable to restart
       streaming after stopping, once at least 4 GB of WAL had been written.
      </para>
     </listitem>
@@ -10334,34 +10526,34 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
     <listitem>
      <para>
       Report out-of-disk-space failures properly
-      in <application>pg_upgrade</> (Peter Eisentraut)
+      in <application>pg_upgrade</application> (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</> search for quoted cursor names
+      Make <application>ecpg</application> search for quoted cursor names
       case-sensitively (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -10395,7 +10587,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
    </para>
 
    <para>
-    However, if you use the <literal>hstore</> extension, see the
+    However, if you use the <literal>hstore</literal> extension, see the
     first changelog entry.
    </para>
 
@@ -10408,18 +10600,18 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Ensure new-in-9.3 JSON functionality is added to the <literal>hstore</>
+      Ensure new-in-9.3 JSON functionality is added to the <literal>hstore</literal>
       extension during an update (Andrew Dunstan)
      </para>
 
      <para>
-      Users who upgraded a pre-9.3 database containing <literal>hstore</>
+      Users who upgraded a pre-9.3 database containing <literal>hstore</literal>
       should execute
 <programlisting>
 ALTER EXTENSION hstore UPDATE;
 </programlisting>
       after installing 9.3.1, to add two new JSON functions and a cast.
-      (If <literal>hstore</> is already up to date, this command does
+      (If <literal>hstore</literal> is already up to date, this command does
       nothing.)
      </para>
     </listitem>
@@ -10452,14 +10644,14 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Fix timeline handling bugs in <application>pg_receivexlog</>
+      Fix timeline handling bugs in <application>pg_receivexlog</application>
       (Heikki Linnakangas, Andrew Gierth)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
@@ -10488,7 +10680,7 @@ ALTER EXTENSION hstore UPDATE;
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.3 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.3 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -10497,7 +10689,7 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Add <link linkend="SQL-CREATEMATERIALIZEDVIEW">materialized
+      Add <link linkend="sql-creatematerializedview">materialized
       views</link>
      </para>
     </listitem>
@@ -10505,29 +10697,29 @@ ALTER EXTENSION hstore UPDATE;
     <listitem>
      <para>
       Make simple views <link
-      linkend="SQL-CREATEVIEW-updatable-views">auto-updatable</link>
+      linkend="sql-createview-updatable-views">auto-updatable</link>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add many features for the <type>JSON</> data type,
+      Add many features for the <type>JSON</type> data type,
       including <link linkend="functions-json">operators and functions</link>
-      to extract elements from <type>JSON</> values
+      to extract elements from <type>JSON</type> values
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Implement <acronym>SQL</>-standard <link
-      linkend="queries-lateral"><literal>LATERAL</></link> option for
-      <literal>FROM</>-clause subqueries and function calls
+      Implement <acronym>SQL</acronym>-standard <link
+      linkend="queries-lateral"><literal>LATERAL</literal></link> option for
+      <literal>FROM</literal>-clause subqueries and function calls
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <link linkend="SQL-CREATEFOREIGNDATAWRAPPER">foreign data
+      Allow <link linkend="sql-createforeigndatawrapper">foreign data
       wrappers</link> to support writes (inserts/updates/deletes) on foreign
       tables
      </para>
@@ -10535,9 +10727,9 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Add a <link linkend="postgres-fdw"><productname>Postgres</> foreign
+      Add a <link linkend="postgres-fdw"><productname>Postgres</productname> foreign
       data wrapper</link> to allow access to
-      other <productname>Postgres</> servers
+      other <productname>Postgres</productname> servers
      </para>
     </listitem>
 
@@ -10582,8 +10774,8 @@ ALTER EXTENSION hstore UPDATE;
 
    <para>
     A dump/restore using <link
-    linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link>, or use
-    of <link linkend="pgupgrade"><application>pg_upgrade</></link>, is
+    linkend="app-pg-dumpall"><application>pg_dumpall</application></link>, or use
+    of <link linkend="pgupgrade"><application>pg_upgrade</application></link>, is
     required for those wishing to migrate data from any previous release.
    </para>
 
@@ -10599,21 +10791,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Rename <varname>replication_timeout</> to <link
-        linkend="guc-wal-sender-timeout"><varname>wal_sender_timeout</></link>
+        Rename <varname>replication_timeout</varname> to <link
+        linkend="guc-wal-sender-timeout"><varname>wal_sender_timeout</varname></link>
         (Amit Kapila)
        </para>
 
        <para>
         This setting controls the <link
-        linkend="wal"><acronym>WAL</></link> sender timeout.
+        linkend="wal"><acronym>WAL</acronym></link> sender timeout.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Require superuser privileges to set <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         because it can now potentially delay other sessions (Simon Riggs)
        </para>
       </listitem>
@@ -10625,7 +10817,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         Users who have set <link
-        linkend="guc-work-mem"><varname>work_mem</></link> based on the
+        linkend="guc-work-mem"><varname>work_mem</varname></link> based on the
         previous behavior may need to revisit that setting.
        </para>
       </listitem>
@@ -10642,7 +10834,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Throw an error if a tuple to be updated or deleted has already been
-        updated or deleted by a <literal>BEFORE</> trigger (Kevin Grittner)
+        updated or deleted by a <literal>BEFORE</literal> trigger (Kevin Grittner)
        </para>
 
        <para>
@@ -10652,7 +10844,7 @@ ALTER EXTENSION hstore UPDATE;
         Now an error is thrown to prevent the inconsistent results from being
         committed.  If this change affects your application, the best solution
         is usually to move the data-propagation actions to
-        an <literal>AFTER</> trigger.
+        an <literal>AFTER</literal> trigger.
        </para>
 
        <para>
@@ -10664,16 +10856,16 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change multicolumn <link linkend="SQL-CREATETABLE"><literal>ON UPDATE
-        SET NULL/SET DEFAULT</></link> foreign key actions to affect
+        Change multicolumn <link linkend="sql-createtable"><literal>ON UPDATE
+        SET NULL/SET DEFAULT</literal></link> foreign key actions to affect
         all columns of the constraint, not just those changed in the
-        <command>UPDATE</> (Tom Lane)
+        <command>UPDATE</command> (Tom Lane)
        </para>
 
        <para>
         Previously, we would set only those referencing columns that
         correspond to referenced columns that were changed by
-        the <command>UPDATE</>.  This was what was required by SQL-92,
+        the <command>UPDATE</command>.  This was what was required by SQL-92,
         but more recent editions of the SQL standard specify the new behavior.
        </para>
       </listitem>
@@ -10681,35 +10873,35 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Force cached plans to be replanned if the <link
-        linkend="guc-search-path"><varname>search_path</></link> changes
+        linkend="guc-search-path"><varname>search_path</varname></link> changes
         (Tom Lane)
        </para>
 
        <para>
         Previously, cached plans already generated in the current session were
         not redone if the query was re-executed with a
-        new <varname>search_path</> setting, resulting in surprising behavior.
+        new <varname>search_path</varname> setting, resulting in surprising behavior.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix <link
-        linkend="functions-formatting-table"><function>to_number()</></link>
+        linkend="functions-formatting-table"><function>to_number()</function></link>
         to properly handle a period used as a thousands separator (Tom Lane)
        </para>
 
        <para>
         Previously, a period was considered to be a decimal point even when
-        the locale says it isn't and the <literal>D</> format code is used to
+        the locale says it isn't and the <literal>D</literal> format code is used to
         specify use of the locale-specific decimal point.  This resulted in
-        wrong answers if <literal>FM</> format was also used.
+        wrong answers if <literal>FM</literal> format was also used.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix <literal>STRICT</> non-set-returning functions that have
+        Fix <literal>STRICT</literal> non-set-returning functions that have
         set-returning functions in their arguments to properly return null
         rows (Tom Lane)
        </para>
@@ -10722,14 +10914,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Store <link linkend="wal"><acronym>WAL</></link> in a continuous
+        Store <link linkend="wal"><acronym>WAL</acronym></link> in a continuous
         stream, rather than skipping the last 16MB segment every 4GB
         (Heikki Linnakangas)
        </para>
 
        <para>
-        Previously, <acronym>WAL</> files with names ending in <literal>FF</>
-        were not used because of this skipping.  If you have <acronym>WAL</>
+        Previously, <acronym>WAL</acronym> files with names ending in <literal>FF</literal>
+        were not used because of this skipping.  If you have <acronym>WAL</acronym>
         backup or restore scripts that took this behavior into account, they
         will need to be adjusted.
        </para>
@@ -10738,15 +10930,15 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         In <link
-        linkend="catalog-pg-constraint"><structname>pg_constraint.confmatchtype</></link>,
-        store the default foreign key match type (non-<literal>FULL</>,
-        non-<literal>PARTIAL</>) as <literal>s</> for <quote>simple</>
+        linkend="catalog-pg-constraint"><structname>pg_constraint.confmatchtype</structname></link>,
+        store the default foreign key match type (non-<literal>FULL</literal>,
+        non-<literal>PARTIAL</literal>) as <literal>s</literal> for <quote>simple</quote>
         (Tom Lane)
        </para>
 
        <para>
-        Previously this case was represented by <literal>u</>
-        for <quote>unspecified</>.
+        Previously this case was represented by <literal>u</literal>
+        for <quote>unspecified</quote>.
        </para>
       </listitem>
 
@@ -10783,10 +10975,10 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         This change improves concurrency and reduces the probability of
         deadlocks when updating tables involved in a foreign-key constraint.
-        <command>UPDATE</>s that do not change any columns referenced in a
-        foreign key now take the new <literal>NO KEY UPDATE</> lock mode on
-        the row, while foreign key checks use the new <literal>KEY SHARE</>
-        lock mode, which does not conflict with <literal>NO KEY UPDATE</>.
+        <command>UPDATE</command>s that do not change any columns referenced in a
+        foreign key now take the new <literal>NO KEY UPDATE</literal> lock mode on
+        the row, while foreign key checks use the new <literal>KEY SHARE</literal>
+        lock mode, which does not conflict with <literal>NO KEY UPDATE</literal>.
         So there is no blocking unless a foreign-key column is changed.
        </para>
       </listitem>
@@ -10794,7 +10986,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add configuration variable <link
-        linkend="guc-lock-timeout"><varname>lock_timeout</></link> to
+        linkend="guc-lock-timeout"><varname>lock_timeout</varname></link> to
         allow limiting how long a session will wait to acquire any one lock
         (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
        </para>
@@ -10811,21 +11003,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="rangetypes-indexing"><acronym>SP-GiST</></link>
+        Add <link linkend="rangetypes-indexing"><acronym>SP-GiST</acronym></link>
         support for range data types (Alexander Korotkov)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="GiST"><acronym>GiST</></link> indexes to be
+        Allow <link linkend="gist"><acronym>GiST</acronym></link> indexes to be
         unlogged (Jeevan Chalke)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve performance of <acronym>GiST</> index insertion by randomizing
+        Improve performance of <acronym>GiST</acronym> index insertion by randomizing
         the choice of which page to descend to when there are multiple equally
         good alternatives (Heikki Linnakangas)
        </para>
@@ -10863,7 +11055,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve optimizer's hash table size estimate for
-        doing <literal>DISTINCT</> via hash aggregation (Tom Lane)
+        doing <literal>DISTINCT</literal> via hash aggregation (Tom Lane)
        </para>
       </listitem>
 
@@ -10893,7 +11085,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-COPY"><command>COPY FREEZE</></link>
+        Add <link linkend="sql-copy"><command>COPY FREEZE</command></link>
         option to avoid the overhead of marking tuples as frozen later
         (Simon Riggs, Jeff Davis)
        </para>
@@ -10902,7 +11094,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve performance of <link
-        linkend="datatype-numeric"><type>NUMERIC</></link> calculations
+        linkend="datatype-numeric"><type>NUMERIC</type></link> calculations
         (Kyotaro Horiguchi)
        </para>
       </listitem>
@@ -10910,20 +11102,20 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve synchronization of sessions waiting for <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         (Peter Geoghegan)
        </para>
 
        <para>
-        This greatly improves the usefulness of <varname>commit_delay</>.
+        This greatly improves the usefulness of <varname>commit_delay</varname>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve performance of the <link
-        linkend="SQL-CREATETABLE"><command>CREATE TEMPORARY TABLE ... ON
-        COMMIT DELETE ROWS</></link> option by not truncating such temporary
+        linkend="sql-createtable"><command>CREATE TEMPORARY TABLE ... ON
+        COMMIT DELETE ROWS</command></link> option by not truncating such temporary
         tables in transactions that haven't touched any temporary tables
         (Heikki Linnakangas)
        </para>
@@ -10948,7 +11140,7 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         This speeds up lock bookkeeping at statement completion in
         multi-statement transactions that hold many locks; it is particularly
-        useful for <application>pg_dump</>.
+        useful for <application>pg_dump</application>.
        </para>
       </listitem>
 
@@ -10960,7 +11152,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         This speeds up sessions that create many tables in successive
-        small transactions, such as a <application>pg_restore</> run.
+        small transactions, such as a <application>pg_restore</application> run.
        </para>
       </listitem>
 
@@ -10989,7 +11181,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         The checksum option can be set during <link
-        linkend="APP-INITDB">initdb</link>.
+        linkend="app-initdb">initdb</link>.
        </para>
       </listitem>
 
@@ -11042,7 +11234,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         When an authentication failure occurs, log the relevant
-        <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+        <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         line, to ease debugging of unintended failures
         (Magnus Hagander)
        </para>
@@ -11050,23 +11242,23 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Improve <link linkend="auth-ldap"><acronym>LDAP</></link> error
+        Improve <link linkend="auth-ldap"><acronym>LDAP</acronym></link> error
         reporting and documentation (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for specifying <acronym>LDAP</> authentication parameters
-        in <acronym>URL</> format, per RFC 4516 (Peter Eisentraut)
+        Add support for specifying <acronym>LDAP</acronym> authentication parameters
+        in <acronym>URL</acronym> format, per RFC 4516 (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Change the <link
-        linkend="guc-ssl-ciphers"><varname>ssl_ciphers</></link> parameter
-        to start with <literal>DEFAULT</>, rather than <literal>ALL</>,
+        linkend="guc-ssl-ciphers"><varname>ssl_ciphers</varname></link> parameter
+        to start with <literal>DEFAULT</literal>, rather than <literal>ALL</literal>,
         then remove insecure ciphers (Magnus Hagander)
        </para>
 
@@ -11078,12 +11270,12 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Parse and load <link
-        linkend="auth-username-maps"><filename>pg_ident.conf</></link>
+        linkend="auth-username-maps"><filename>pg_ident.conf</filename></link>
         once, not during each connection (Amit Kapila)
        </para>
 
        <para>
-        This is similar to how <filename>pg_hba.conf</> is processed.
+        This is similar to how <filename>pg_hba.conf</filename> is processed.
        </para>
       </listitem>
 
@@ -11103,8 +11295,8 @@ ALTER EXTENSION hstore UPDATE;
        </para>
 
        <para>
-        On Unix-like systems, <function>mmap()</> is now used for most
-        of <productname>PostgreSQL</>'s shared memory.  For most users, this
+        On Unix-like systems, <function>mmap()</function> is now used for most
+        of <productname>PostgreSQL</productname>'s shared memory.  For most users, this
         will eliminate any need to adjust kernel parameters for shared memory.
        </para>
       </listitem>
@@ -11117,8 +11309,8 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         The configuration parameter
-        <varname>unix_socket_directory</> is replaced by <link
-        linkend="guc-unix-socket-directories"><varname>unix_socket_directories</></link>,
+        <varname>unix_socket_directory</varname> is replaced by <link
+        linkend="guc-unix-socket-directories"><varname>unix_socket_directories</varname></link>,
         which accepts a list of directories.
        </para>
       </listitem>
@@ -11131,7 +11323,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         Such a directory is specified with <link
-        linkend="config-includes"><varname>include_dir</></link> in the server
+        linkend="config-includes"><varname>include_dir</varname></link> in the server
         configuration file.
        </para>
       </listitem>
@@ -11139,14 +11331,14 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Increase the maximum <link
-        linkend="APP-INITDB">initdb</link>-configured value for <link
-        linkend="guc-shared-buffers"><varname>shared_buffers</></link>
+        linkend="app-initdb">initdb</link>-configured value for <link
+        linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
         to 128MB (Robert Haas)
        </para>
 
        <para>
         This is the maximum value that initdb will attempt to set in <link
-        linkend="config-setting-configuration-file"><filename>postgresql.conf</></link>;
+        linkend="config-setting-configuration-file"><filename>postgresql.conf</filename></link>;
         the previous maximum was 32MB.
        </para>
       </listitem>
@@ -11154,7 +11346,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Remove the <link linkend="guc-external-pid-file">external
-        <acronym>PID</> file</link>, if any, on postmaster exit
+        <acronym>PID</acronym> file</link>, if any, on postmaster exit
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -11186,10 +11378,10 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <acronym>SQL</> functions <link
-        linkend="functions-admin-backup"><function>pg_is_in_backup()</></link>
+        Add <acronym>SQL</acronym> functions <link
+        linkend="functions-admin-backup"><function>pg_is_in_backup()</function></link>
         and <link
-        linkend="functions-admin-backup"><function>pg_backup_start_time()</></link>
+        linkend="functions-admin-backup"><function>pg_backup_start_time()</function></link>
         (Gilles Darold)
        </para>
 
@@ -11201,7 +11393,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve performance of streaming log shipping with <link
-        linkend="guc-synchronous-commit"><varname>synchronous_commit</></link>
+        linkend="guc-synchronous-commit"><varname>synchronous_commit</varname></link>
         disabled (Andres Freund)
        </para>
       </listitem>
@@ -11216,12 +11408,12 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add the last checkpoint's redo location to <link
-        linkend="APP-PGCONTROLDATA"><application>pg_controldata</></link>'s
+        linkend="app-pgcontroldata"><application>pg_controldata</application></link>'s
         output (Fujii Masao)
        </para>
 
        <para>
-        This information is useful for determining which <acronym>WAL</>
+        This information is useful for determining which <acronym>WAL</acronym>
         files are needed for restore.
        </para>
       </listitem>
@@ -11229,7 +11421,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow tools like <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         to run on computers with different architectures (Heikki
         Linnakangas)
        </para>
@@ -11245,9 +11437,9 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
-        <option>--write-recovery-conf</> output a
-        minimal <filename>recovery.conf</> file (Zolt&aacute;n
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+        <option>--write-recovery-conf</option> output a
+        minimal <filename>recovery.conf</filename> file (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi, Magnus Hagander)
        </para>
 
@@ -11259,10 +11451,10 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         and <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
-        <option>--xlog-method</> to handle streaming timeline switches
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+        <option>--xlog-method</option> to handle streaming timeline switches
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -11270,8 +11462,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link
-        linkend="guc-wal-receiver-timeout"><varname>wal_receiver_timeout</></link>
-        parameter to control the <acronym>WAL</> receiver's timeout
+        linkend="guc-wal-receiver-timeout"><varname>wal_receiver_timeout</varname></link>
+        parameter to control the <acronym>WAL</acronym> receiver's timeout
         (Amit Kapila)
        </para>
 
@@ -11282,7 +11474,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change the <link linkend="wal"><acronym>WAL</></link> record format to
+        Change the <link linkend="wal"><acronym>WAL</acronym></link> record format to
         allow splitting the record header across pages (Heikki Linnakangas)
        </para>
 
@@ -11303,23 +11495,23 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Implement <acronym>SQL</>-standard <link
-        linkend="queries-lateral"><literal>LATERAL</></link> option for
-        <literal>FROM</>-clause subqueries and function calls (Tom Lane)
+        Implement <acronym>SQL</acronym>-standard <link
+        linkend="queries-lateral"><literal>LATERAL</literal></link> option for
+        <literal>FROM</literal>-clause subqueries and function calls (Tom Lane)
        </para>
 
        <para>
-        This feature allows subqueries and functions in <literal>FROM</> to
-        reference columns from other tables in the <literal>FROM</>
-        clause. The <literal>LATERAL</> keyword is optional for functions.
+        This feature allows subqueries and functions in <literal>FROM</literal> to
+        reference columns from other tables in the <literal>FROM</literal>
+        clause. The <literal>LATERAL</literal> keyword is optional for functions.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add support for piping <link
-        linkend="SQL-COPY"><command>COPY</></link> and <link
-        linkend="APP-PSQL"><application>psql</></link> <command>\copy</>
+        linkend="sql-copy"><command>COPY</command></link> and <link
+        linkend="app-psql"><application>psql</application></link> <command>\copy</command>
         data to/from an external program (Etsuro Fujita)
        </para>
       </listitem>
@@ -11327,8 +11519,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow a multirow <link
-        linkend="SQL-VALUES"><literal>VALUES</></link> clause in a rule
-        to reference <literal>OLD</>/<literal>NEW</> (Tom Lane)
+        linkend="sql-values"><literal>VALUES</literal></link> clause in a rule
+        to reference <literal>OLD</literal>/<literal>NEW</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -11355,7 +11547,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-CREATEFOREIGNDATAWRAPPER">foreign data
+        Allow <link linkend="sql-createforeigndatawrapper">foreign data
         wrappers</link> to support writes (inserts/updates/deletes) on foreign
         tables (KaiGai Kohei)
        </para>
@@ -11363,15 +11555,15 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATESCHEMA"><command>CREATE SCHEMA ... IF
-        NOT EXISTS</></link> clause (Fabr&iacute;zio de Royes Mello)
+        Add <link linkend="sql-createschema"><command>CREATE SCHEMA ... IF
+        NOT EXISTS</command></link> clause (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="SQL-REASSIGN-OWNED"><command>REASSIGN
-        OWNED</></link> also change ownership of shared objects
+        Make <link linkend="sql-reassign-owned"><command>REASSIGN
+        OWNED</command></link> also change ownership of shared objects
         (&Aacute;lvaro Herrera)
        </para>
       </listitem>
@@ -11379,28 +11571,28 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link linkend="sql-createaggregate"><command>CREATE
-        AGGREGATE</></link> complain if the given initial value string is not
+        AGGREGATE</command></link> complain if the given initial value string is not
         valid input for the transition datatype (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Suppress <link linkend="SQL-CREATETABLE"><command>CREATE
-        TABLE</></link>'s messages about implicit index and sequence creation
+        Suppress <link linkend="sql-createtable"><command>CREATE
+        TABLE</command></link>'s messages about implicit index and sequence creation
         (Robert Haas)
        </para>
 
        <para>
-        These messages now appear at <literal>DEBUG1</> verbosity, so that
+        These messages now appear at <literal>DEBUG1</literal> verbosity, so that
         they will not be shown by default.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-DROPTABLE"><command>DROP TABLE IF
-        EXISTS</></link> to succeed when a non-existent schema is specified
+        Allow <link linkend="sql-droptable"><command>DROP TABLE IF
+        EXISTS</command></link> to succeed when a non-existent schema is specified
         in the table name (Bruce Momjian)
        </para>
 
@@ -11427,14 +11619,14 @@ ALTER EXTENSION hstore UPDATE;
      </itemizedlist>
 
     <sect4>
-     <title><command>ALTER</></title>
+     <title><command>ALTER</command></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Support <literal>IF NOT EXISTS</> option in <link
-        linkend="SQL-ALTERTYPE"><command>ALTER TYPE ... ADD VALUE</></link>
+        Support <literal>IF NOT EXISTS</literal> option in <link
+        linkend="sql-altertype"><command>ALTER TYPE ... ADD VALUE</command></link>
         (Andrew Dunstan)
        </para>
 
@@ -11445,22 +11637,22 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERROLE"><command>ALTER ROLE ALL
-        SET</></link> to establish settings for all users (Peter Eisentraut)
+        Add <link linkend="sql-alterrole"><command>ALTER ROLE ALL
+        SET</command></link> to establish settings for all users (Peter Eisentraut)
        </para>
 
        <para>
         This allows settings to apply to all users in all databases. <link
-        linkend="SQL-ALTERDATABASE"><command>ALTER DATABASE SET</></link>
+        linkend="sql-alterdatabase"><command>ALTER DATABASE SET</command></link>
         already allowed addition of settings for all users in a single
-        database.  <filename>postgresql.conf</> has a similar effect.
+        database.  <filename>postgresql.conf</filename> has a similar effect.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for <link linkend="SQL-ALTERRULE"><command>ALTER RULE
-        ... RENAME</></link> (Ali Dar)
+        Add support for <link linkend="sql-alterrule"><command>ALTER RULE
+        ... RENAME</command></link> (Ali Dar)
        </para>
       </listitem>
 
@@ -11469,13 +11661,13 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="rules-views"><command>VIEWs</></link></title>
+     <title><link linkend="rules-views"><command>VIEWs</command></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATEMATERIALIZEDVIEW">materialized
+        Add <link linkend="sql-creatematerializedview">materialized
         views</link> (Kevin Grittner)
        </para>
 
@@ -11491,7 +11683,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make simple views <link
-        linkend="SQL-CREATEVIEW-updatable-views">auto-updatable</link>
+        linkend="sql-createview-updatable-views">auto-updatable</link>
         (Dean Rasheed)
        </para>
 
@@ -11499,20 +11691,20 @@ ALTER EXTENSION hstore UPDATE;
         Simple views that reference some or all columns from a
         single base table are now updatable by default. More
         complex views can be made updatable using <link
-        linkend="SQL-CREATETRIGGER"><literal>INSTEAD OF</></link> triggers
-        or <link linkend="SQL-CREATERULE"><literal>INSTEAD</></link> rules.
+        linkend="sql-createtrigger"><literal>INSTEAD OF</literal></link> triggers
+        or <link linkend="sql-createrule"><literal>INSTEAD</literal></link> rules.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATEVIEW"><command>CREATE RECURSIVE
-        VIEW</></link> syntax (Peter Eisentraut)
+        Add <link linkend="sql-createview"><command>CREATE RECURSIVE
+        VIEW</command></link> syntax (Peter Eisentraut)
        </para>
 
        <para>
         Internally this is translated into <command>CREATE VIEW ... WITH
-        RECURSIVE ...</>.
+        RECURSIVE ...</command>.
        </para>
       </listitem>
 
@@ -11545,7 +11737,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Increase the maximum size of <link linkend="largeObjects">large
+        Increase the maximum size of <link linkend="largeobjects">large
         objects</link> from 2GB to 4TB (Nozomi Anzai, Yugo Nagata)
        </para>
 
@@ -11558,8 +11750,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow text <link linkend="datatype-timezones">timezone
-        designations</link>, e.g. <quote>America/Chicago</>, in the
-        <quote>T</> field of <acronym>ISO</>-format <type>timestamptz</type>
+        designations</link>, e.g. <quote>America/Chicago</quote>, in the
+        <quote>T</quote> field of <acronym>ISO</acronym>-format <type>timestamptz</type>
         input (Bruce Momjian)
        </para>
       </listitem>
@@ -11567,20 +11759,20 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
    <sect4>
-    <title><link linkend="datatype-json"><type>JSON</></link></title>
+    <title><link linkend="datatype-json"><type>JSON</type></link></title>
 
     <itemizedlist>
 
       <listitem>
        <para>
         Add <link linkend="functions-json">operators and functions</link>
-        to extract elements from <type>JSON</> values (Andrew Dunstan)
+        to extract elements from <type>JSON</type> values (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <type>JSON</> values to be <link
+        Allow <type>JSON</type> values to be <link
         linkend="functions-json">converted into records</link>
         (Andrew Dunstan)
        </para>
@@ -11589,7 +11781,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link linkend="functions-json">functions</link> to convert
-        scalars, records, and <type>hstore</> values to <type>JSON</> (Andrew
+        scalars, records, and <type>hstore</type> values to <type>JSON</type> (Andrew
         Dunstan)
        </para>
       </listitem>
@@ -11609,9 +11801,9 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link
-        linkend="array-functions-table"><function>array_remove()</></link>
+        linkend="array-functions-table"><function>array_remove()</function></link>
         and <link
-        linkend="array-functions-table"><function>array_replace()</></link>
+        linkend="array-functions-table"><function>array_replace()</function></link>
         functions (Marco Nenciarini, Gabriele Bartolini)
        </para>
       </listitem>
@@ -11619,10 +11811,10 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link
-        linkend="functions-string-other"><function>concat()</></link>
+        linkend="functions-string-other"><function>concat()</function></link>
         and <link
-        linkend="functions-string-format"><function>format()</></link>
-        to properly expand <literal>VARIADIC</>-labeled arguments
+        linkend="functions-string-format"><function>format()</function></link>
+        to properly expand <literal>VARIADIC</literal>-labeled arguments
         (Pavel Stehule)
        </para>
       </listitem>
@@ -11630,7 +11822,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve <link
-        linkend="functions-string-format"><function>format()</></link>
+        linkend="functions-string-format"><function>format()</function></link>
         to provide field width and left/right alignment options (Pavel Stehule)
        </para>
       </listitem>
@@ -11638,29 +11830,29 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_char()</></link>,
+        linkend="functions-formatting-table"><function>to_char()</function></link>,
         <link
-        linkend="functions-formatting-table"><function>to_date()</></link>,
+        linkend="functions-formatting-table"><function>to_date()</function></link>,
         and <link
-        linkend="functions-formatting-table"><function>to_timestamp()</></link>
+        linkend="functions-formatting-table"><function>to_timestamp()</function></link>
         handle negative (BC) century values properly
         (Bruce Momjian)
        </para>
 
        <para>
         Previously the behavior was either wrong or inconsistent
-        with positive/<acronym>AD</> handling, e.g. with the format mask
-        <quote>IYYY-IW-DY</>.
+        with positive/<acronym>AD</acronym> handling, e.g. with the format mask
+        <quote>IYYY-IW-DY</quote>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_date()</></link>
+        linkend="functions-formatting-table"><function>to_date()</function></link>
         and <link
-        linkend="functions-formatting-table"><function>to_timestamp()</></link>
-        return proper results when mixing <acronym>ISO</> and Gregorian
+        linkend="functions-formatting-table"><function>to_timestamp()</function></link>
+        return proper results when mixing <acronym>ISO</acronym> and Gregorian
         week/day designations (Bruce Momjian)
        </para>
       </listitem>
@@ -11668,27 +11860,27 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Cause <link
-        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</></link>
-        to start a new line by default after each <literal>SELECT</> target
-        list entry and <literal>FROM</> entry (Marko Tiikkaja)
+        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</function></link>
+        to start a new line by default after each <literal>SELECT</literal> target
+        list entry and <literal>FROM</literal> entry (Marko Tiikkaja)
        </para>
 
        <para>
         This reduces line length in view printing, for instance in <link
-        linkend="APP-PGDUMP"><application>pg_dump</></link> output.
+        linkend="app-pgdump"><application>pg_dump</application></link> output.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix <function>map_sql_value_to_xml_value()</> to print values of
+        Fix <function>map_sql_value_to_xml_value()</function> to print values of
         domain types the same way their base type would be printed
         (Pavel Stehule)
        </para>
 
        <para>
         There are special formatting rules for certain built-in types such as
-        <type>boolean</>; these rules now also apply to domains over these
+        <type>boolean</type>; these rules now also apply to domains over these
         types.
        </para>
       </listitem>
@@ -11707,13 +11899,13 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow PL/pgSQL to use <literal>RETURN</> with a composite-type
+        Allow PL/pgSQL to use <literal>RETURN</literal> with a composite-type
         expression (Asif Rehman)
        </para>
 
        <para>
         Previously, in a function returning a composite type,
-        <literal>RETURN</> could only reference a variable of that type.
+        <literal>RETURN</literal> could only reference a variable of that type.
        </para>
       </listitem>
 
@@ -11728,14 +11920,14 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow PL/pgSQL to access the number of rows processed by
-        <link linkend="SQL-COPY"><command>COPY</></link> (Pavel Stehule)
+        <link linkend="sql-copy"><command>COPY</command></link> (Pavel Stehule)
        </para>
 
        <para>
-        A <command>COPY</> executed in a PL/pgSQL function now updates the
+        A <command>COPY</command> executed in a PL/pgSQL function now updates the
         value retrieved by <link
         linkend="plpgsql-statements-diagnostics"><command>GET DIAGNOSTICS
-        x = ROW_COUNT</></link>.
+        x = ROW_COUNT</command></link>.
        </para>
       </listitem>
 
@@ -11779,9 +11971,9 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Handle <link linkend="spi"><acronym>SPI</></link> errors raised
-        explicitly (with PL/Python's <literal>RAISE</>) the same as
-        internal <acronym>SPI</> errors (Oskari Saarenmaa and Jan Urbanski)
+        Handle <link linkend="spi"><acronym>SPI</acronym></link> errors raised
+        explicitly (with PL/Python's <literal>RAISE</literal>) the same as
+        internal <acronym>SPI</acronym> errors (Oskari Saarenmaa and Jan Urbanski)
        </para>
       </listitem>
 
@@ -11798,7 +11990,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Prevent leakage of <acronym>SPI</> tuple tables during subtransaction
+        Prevent leakage of <acronym>SPI</acronym> tuple tables during subtransaction
         abort (Tom Lane)
        </para>
 
@@ -11809,7 +12001,7 @@ ALTER EXTENSION hstore UPDATE;
         of such tuple tables and release them manually in error-recovery code.
         Failure to do so caused a number of transaction-lifespan memory leakage
         issues in PL/pgSQL and perhaps other SPI clients.  <link
-        linkend="spi-spi-freetupletable"><function>SPI_freetuptable()</></link>
+        linkend="spi-spi-freetupletable"><function>SPI_freetuptable()</function></link>
         now protects itself against multiple freeing requests, so any existing
         code that did take care to clean up shouldn't be broken by this change.
        </para>
@@ -11817,8 +12009,8 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <acronym>SPI</> functions to access the number of rows processed
-        by <link linkend="SQL-COPY"><command>COPY</></link> (Pavel Stehule)
+        Allow <acronym>SPI</acronym> functions to access the number of rows processed
+        by <link linkend="sql-copy"><command>COPY</command></link> (Pavel Stehule)
        </para>
       </listitem>
 
@@ -11834,35 +12026,35 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add command-line utility <link
-        linkend="app-pg-isready"><application>pg_isready</></link> to
+        linkend="app-pg-isready"><application>pg_isready</application></link> to
         check if the server is ready to accept connections (Phil Sorber)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support multiple <option>--table</> arguments for <link
-        linkend="APP-PGRESTORE"><application>pg_restore</></link>,
-        <link linkend="APP-CLUSTERDB"><application>clusterdb</></link>,
-        <link linkend="APP-REINDEXDB"><application>reindexdb</></link>,
-        and <link linkend="APP-VACUUMDB"><application>vacuumdb</></link>
+        Support multiple <option>--table</option> arguments for <link
+        linkend="app-pgrestore"><application>pg_restore</application></link>,
+        <link linkend="app-clusterdb"><application>clusterdb</application></link>,
+        <link linkend="app-reindexdb"><application>reindexdb</application></link>,
+        and <link linkend="app-vacuumdb"><application>vacuumdb</application></link>
         (Josh Kupershmidt)
        </para>
 
        <para>
         This is similar to the way <link
-        linkend="APP-PGDUMP"><application>pg_dump</></link>'s
-        <option>--table</> option works.
+        linkend="app-pgdump"><application>pg_dump</application></link>'s
+        <option>--table</option> option works.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--dbname</> option to <link
-        linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link>, <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>, and
+        Add <option>--dbname</option> option to <link
+        linkend="app-pg-dumpall"><application>pg_dumpall</application></link>, <link
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>, and
         <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         to allow specifying a connection string (Amit Kapila)
        </para>
       </listitem>
@@ -11870,7 +12062,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add libpq function <link
-        linkend="libpq-pqconninfo"><function>PQconninfo()</></link>
+        linkend="libpq-pqconninfo"><function>PQconninfo()</function></link>
         to return connection information (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi, Magnus Hagander)
        </para>
@@ -11879,27 +12071,27 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PSQL"><application>psql</></link></title>
+     <title><link linkend="app-psql"><application>psql</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Adjust function cost settings so <application>psql</> tab
+        Adjust function cost settings so <application>psql</application> tab
         completion and pattern searching are more efficient (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>psql</>'s tab completion coverage (Jeff Janes,
+        Improve <application>psql</application>'s tab completion coverage (Jeff Janes,
         Dean Rasheed, Peter Eisentraut, Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow the <application>psql</> <option>--single-transaction</>
+        Allow the <application>psql</application> <option>--single-transaction</option>
         mode to work when reading from standard input (Fabien Coelho,
         Robert Haas)
        </para>
@@ -11911,61 +12103,61 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Remove <application>psql</> warning when connecting to an older
+        Remove <application>psql</application> warning when connecting to an older
         server (Peter Eisentraut)
        </para>
 
        <para>
         A warning is still issued when connecting to a server of a newer major
-        version than <application>psql</>'s.
+        version than <application>psql</application>'s.
        </para>
       </listitem>
 
      </itemizedlist>
 
     <sect5>
-     <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+     <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <application>psql</> command <command>\watch</> to repeatedly
+        Add <application>psql</application> command <command>\watch</command> to repeatedly
         execute a SQL command (Will Leinweber)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>psql</> command <command>\gset</> to store query
-        results in <application>psql</> variables (Pavel Stehule)
+        Add <application>psql</application> command <command>\gset</command> to store query
+        results in <application>psql</application> variables (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <acronym>SSL</> information to <application>psql</>'s
-        <command>\conninfo</> command (Alastair Turner)
+        Add <acronym>SSL</acronym> information to <application>psql</application>'s
+        <command>\conninfo</command> command (Alastair Turner)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <quote>Security</> column to <application>psql</>'s
-        <command>\df+</> output (Jon Erdman)
+        Add <quote>Security</quote> column to <application>psql</application>'s
+        <command>\df+</command> output (Jon Erdman)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>psql</> command <command>\l</> to accept a database
+        Allow <application>psql</application> command <command>\l</command> to accept a database
         name pattern (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>, do not allow <command>\connect</> to
+        In <application>psql</application>, do not allow <command>\connect</command> to
         use defaults if there is no active connection (Bruce Momjian)
        </para>
 
@@ -11977,7 +12169,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Properly reset state after failure of a SQL command executed with
-        <application>psql</>'s <literal>\g</> <replaceable>file</>
+        <application>psql</application>'s <literal>\g</literal> <replaceable>file</replaceable>
         (Tom Lane)
        </para>
 
@@ -11998,8 +12190,8 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <literal>latex-longtable</> output format to
-        <application>psql</> (Bruce Momjian)
+        Add a <literal>latex-longtable</literal> output format to
+        <application>psql</application> (Bruce Momjian)
        </para>
 
        <para>
@@ -12009,21 +12201,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <literal>border=3</> output mode to the <application>psql</>
-        <literal>latex</> format (Bruce Momjian)
+        Add a <literal>border=3</literal> output mode to the <application>psql</application>
+        <literal>latex</literal> format (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>'s tuples-only and expanded output modes, no
-        longer emit <quote>(No rows)</> for zero rows (Peter Eisentraut)
+        In <application>psql</application>'s tuples-only and expanded output modes, no
+        longer emit <quote>(No rows)</quote> for zero rows (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>'s unaligned, expanded output mode, no longer
+        In <application>psql</application>'s unaligned, expanded output mode, no longer
         print an empty line for zero rows (Peter Eisentraut)
        </para>
       </listitem>
@@ -12035,34 +12227,34 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <application>pg_dump</> <option>--jobs</> option to dump tables in
+        Add <application>pg_dump</application> <option>--jobs</option> option to dump tables in
         parallel (Joachim Wieland)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_dump</> output functions in a more predictable
+        Make <application>pg_dump</application> output functions in a more predictable
         order (Joel Jacobson)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix tar files emitted by <application>pg_dump</>
-        to be <acronym>POSIX</> conformant (Brian Weaver, Tom Lane)
+        Fix tar files emitted by <application>pg_dump</application>
+        to be <acronym>POSIX</acronym> conformant (Brian Weaver, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--dbname</> option to <application>pg_dump</>, for
+        Add <option>--dbname</option> option to <application>pg_dump</application>, for
         consistency with other client commands (Heikki Linnakangas)
        </para>
 
@@ -12076,7 +12268,7 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-INITDB"><application>initdb</></link></title>
+     <title><link linkend="app-initdb"><application>initdb</application></link></title>
 
      <itemizedlist>
 
@@ -12087,19 +12279,19 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         This insures data integrity in event of a system crash shortly after
-        initdb.  This can be disabled by using <option>--nosync</>.
+        initdb.  This can be disabled by using <option>--nosync</option>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add initdb <option>--sync-only</> option to sync the data directory to durable
+        Add initdb <option>--sync-only</option> option to sync the data directory to durable
         storage (Bruce Momjian)
        </para>
 
        <para>
         This is used by <link
-        linkend="pgupgrade"><application>pg_upgrade</></link>.
+        linkend="pgupgrade"><application>pg_upgrade</application></link>.
        </para>
       </listitem>
 
@@ -12131,14 +12323,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Create a centralized timeout <acronym>API</> (Zolt&aacute;n
+        Create a centralized timeout <acronym>API</acronym> (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Create libpgcommon and move <function>pg_malloc()</> and other
+        Create libpgcommon and move <function>pg_malloc()</function> and other
         functions there (&Aacute;lvaro Herrera, Andres Freund)
        </para>
 
@@ -12155,15 +12347,15 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Use <literal>SA_RESTART</> for all signals,
-        including <literal>SIGALRM</> (Tom Lane)
+        Use <literal>SA_RESTART</literal> for all signals,
+        including <literal>SIGALRM</literal> (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Ensure that the correct text domain is used when
-        translating <function>errcontext()</> messages
+        translating <function>errcontext()</function> messages
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -12176,7 +12368,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Provide support for <quote>static assertions</> that will fail at
+        Provide support for <quote>static assertions</quote> that will fail at
         compile time if some compile-time-constant condition is not met
         (Andres Freund, Tom Lane)
        </para>
@@ -12184,14 +12376,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Support <function>Assert()</> in client-side code (Andrew Dunstan)
+        Support <function>Assert()</function> in client-side code (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add decoration to inform the C compiler that some <function>ereport()</>
-        and <function>elog()</> calls do not return (Peter Eisentraut,
+        Add decoration to inform the C compiler that some <function>ereport()</function>
+        and <function>elog()</function> calls do not return (Peter Eisentraut,
         Andres Freund, Tom Lane, Heikki Linnakangas)
        </para>
       </listitem>
@@ -12200,7 +12392,7 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         Allow options to be passed to the regression
         test output comparison utility via <link
-        linkend="regress-evaluation"><envar>PG_REGRESS_DIFF_OPTS</></link>
+        linkend="regress-evaluation"><envar>PG_REGRESS_DIFF_OPTS</envar></link>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12208,43 +12400,43 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add isolation tests for <link
-        linkend="SQL-CREATEINDEX"><command>CREATE INDEX
-        CONCURRENTLY</></link> (Abhijit Menon-Sen)
+        linkend="sql-createindex"><command>CREATE INDEX
+        CONCURRENTLY</command></link> (Abhijit Menon-Sen)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove typedefs for <type>int2</>/<type>int4</> as they are better
-        represented as <type>int16</>/<type>int32</> (Peter Eisentraut)
+        Remove typedefs for <type>int2</type>/<type>int4</type> as they are better
+        represented as <type>int16</type>/<type>int32</type> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix <link linkend="install">install-strip</link> on Mac <productname>OS
-        X</> (Peter Eisentraut)
+        X</productname> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Remove <link linkend="configure">configure</link> flag
-        <option>--disable-shared</>, as it is no longer supported
+        <option>--disable-shared</option>, as it is no longer supported
         (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Rewrite pgindent in <application>Perl</> (Andrew Dunstan)
+        Rewrite pgindent in <application>Perl</application> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Provide Emacs macro to set Perl formatting to
-        match <productname>PostgreSQL</>'s perltidy settings (Peter Eisentraut)
+        match <productname>PostgreSQL</productname>'s perltidy settings (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -12257,25 +12449,25 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change the way <literal>UESCAPE</> is lexed, to significantly reduce
+        Change the way <literal>UESCAPE</literal> is lexed, to significantly reduce
         the size of the lexer tables (Heikki Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Centralize <application>flex</> and <application>bison</>
-        <application>make</> rules (Peter Eisentraut)
+        Centralize <application>flex</application> and <application>bison</application>
+        <application>make</application> rules (Peter Eisentraut)
        </para>
 
        <para>
-        This is useful for <application>pgxs</> authors.
+        This is useful for <application>pgxs</application> authors.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change many internal backend functions to return object <type>OID</>s
+        Change many internal backend functions to return object <type>OID</type>s
         rather than void (Dimitri Fontaine)
        </para>
 
@@ -12299,7 +12491,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add function <link
-        linkend="functions-info-catalog-table"><function>pg_identify_object()</></link>
+        linkend="functions-info-catalog-table"><function>pg_identify_object()</function></link>
         to produce a machine-readable description of a database object
         (&Aacute;lvaro Herrera)
        </para>
@@ -12307,7 +12499,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add post-<command>ALTER</>-object server hooks (KaiGai Kohei)
+        Add post-<command>ALTER</command>-object server hooks (KaiGai Kohei)
        </para>
       </listitem>
 
@@ -12321,28 +12513,28 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Provide a tool to help detect timezone abbreviation changes when
-        updating the <filename>src/timezone/data</> files
+        updating the <filename>src/timezone/data</filename> files
         (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pkg-config</> support for <application>libpq</>
-        and <application>ecpg</> libraries (Peter Eisentraut)
+        Add <application>pkg-config</application> support for <application>libpq</application>
+        and <application>ecpg</application> libraries (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <filename>src/tools/backend</>, now that the content is on
-        the <productname>PostgreSQL</> wiki (Bruce Momjian)
+        Remove <filename>src/tools/backend</filename>, now that the content is on
+        the <productname>PostgreSQL</productname> wiki (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Split out <link linkend="wal"><acronym>WAL</></link> reading as
+        Split out <link linkend="wal"><acronym>WAL</acronym></link> reading as
         an independent facility (Heikki Linnakangas, Andres Freund)
        </para>
       </listitem>
@@ -12350,13 +12542,13 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Use a 64-bit integer to represent <link
-        linkend="wal"><acronym>WAL</></link> positions
-        (<structname>XLogRecPtr</>) instead of two 32-bit integers
+        linkend="wal"><acronym>WAL</acronym></link> positions
+        (<structname>XLogRecPtr</structname>) instead of two 32-bit integers
         (Heikki Linnakangas)
        </para>
 
        <para>
-        Generally, tools that need to read the <acronym>WAL</> format
+        Generally, tools that need to read the <acronym>WAL</acronym> format
         will need to be adjusted.
        </para>
       </listitem>
@@ -12371,7 +12563,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link linkend="plpython">PL/Python</link> on <productname>OS
-        X</> to build against custom versions of <application>Python</>
+        X</productname> to build against custom versions of <application>Python</application>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12387,9 +12579,9 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <link linkend="postgres-fdw"><productname>Postgres</> foreign
+        Add a <link linkend="postgres-fdw"><productname>Postgres</productname> foreign
         data wrapper</link> contrib module to allow access to
-        other <productname>Postgres</> servers (Shigeru Hanada)
+        other <productname>Postgres</productname> servers (Shigeru Hanada)
        </para>
 
        <para>
@@ -12399,7 +12591,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="pgwaldump"><application>pg_xlogdump</></link>
+        Add <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
         contrib program (Andres Freund)
        </para>
       </listitem>
@@ -12407,46 +12599,46 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add support for indexing of regular-expression searches in
-        <link linkend="pgtrgm"><productname>pg_trgm</></link>
+        <link linkend="pgtrgm"><productname>pg_trgm</productname></link>
         (Alexander Korotkov)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <link linkend="pgtrgm"><productname>pg_trgm</></link>'s
+        Improve <link linkend="pgtrgm"><productname>pg_trgm</productname></link>'s
         handling of multibyte characters (Tom Lane)
        </para>
 
        <para>
         On a platform that does not have the wcstombs() or towlower() library
         functions, this could result in an incompatible change in the contents
-        of <productname>pg_trgm</> indexes for non-ASCII data.  In such cases,
-        <command>REINDEX</> those indexes to ensure correct search results.
+        of <productname>pg_trgm</productname> indexes for non-ASCII data.  In such cases,
+        <command>REINDEX</command> those indexes to ensure correct search results.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link linkend="pgstattuple">pgstattuple</link> function to report
-        the size of the pending-insertions list of a <acronym>GIN</> index
+        the size of the pending-insertions list of a <acronym>GIN</acronym> index
         (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="oid2name"><application>oid2name</></link>,
-        <link linkend="pgbench"><application>pgbench</></link>, and
-        <link linkend="vacuumlo"><application>vacuumlo</></link> set
-        <varname>fallback_application_name</> (Amit Kapila)
+        Make <link linkend="oid2name"><application>oid2name</application></link>,
+        <link linkend="pgbench"><application>pgbench</application></link>, and
+        <link linkend="vacuumlo"><application>vacuumlo</application></link> set
+        <varname>fallback_application_name</varname> (Amit Kapila)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve output of <link
-        linkend="pgtesttiming"><application>pg_test_timing</></link>
+        linkend="pgtesttiming"><application>pg_test_timing</application></link>
         (Bruce Momjian)
        </para>
       </listitem>
@@ -12454,7 +12646,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve output of <link
-        linkend="pgtestfsync"><application>pg_test_fsync</></link>
+        linkend="pgtestfsync"><application>pg_test_fsync</application></link>
         (Peter Geoghegan)
        </para>
       </listitem>
@@ -12466,9 +12658,9 @@ ALTER EXTENSION hstore UPDATE;
        </para>
 
        <para>
-        When using this FDW to define the target of a <application>dblink</>
+        When using this FDW to define the target of a <application>dblink</application>
         connection, instead of using a hard-wired list of connection options,
-        the underlying <application>libpq</> library is consulted to see what
+        the underlying <application>libpq</application> library is consulted to see what
         connection options it supports.
        </para>
       </listitem>
@@ -12476,26 +12668,26 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="pgupgrade"><application>pg_upgrade</></link></title>
+     <title><link linkend="pgupgrade"><application>pg_upgrade</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to do dumps and restores in
+        Allow <application>pg_upgrade</application> to do dumps and restores in
         parallel (Bruce Momjian, Andrew Dunstan)
        </para>
 
        <para>
         This allows parallel schema dump/restore of databases, as well as
         parallel copy/link of data files per tablespace.  Use the
-        <option>--jobs</> option to specify the level of parallelism.
+        <option>--jobs</option> option to specify the level of parallelism.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> create Unix-domain sockets in
+        Make <application>pg_upgrade</application> create Unix-domain sockets in
         the current directory (Bruce Momjian, Tom Lane)
        </para>
 
@@ -12507,7 +12699,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> <option>--check</> mode properly
+        Make <application>pg_upgrade</application> <option>--check</option> mode properly
         detect the location of non-default socket directories (Bruce
         Momjian, Tom Lane)
        </para>
@@ -12515,21 +12707,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Improve performance of <application>pg_upgrade</> for databases
+        Improve performance of <application>pg_upgrade</application> for databases
         with many tables (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>pg_upgrade</>'s logs by showing
+        Improve <application>pg_upgrade</application>'s logs by showing
         executed commands (&Aacute;lvaro Herrera)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>pg_upgrade</>'s status display during
+        Improve <application>pg_upgrade</application>'s status display during
         copy/link (Bruce Momjian)
        </para>
       </listitem>
@@ -12539,33 +12731,33 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="pgbench"><application>pgbench</></link></title>
+     <title><link linkend="pgbench"><application>pgbench</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <option>--foreign-keys</> option to <application>pgbench</>
+        Add <option>--foreign-keys</option> option to <application>pgbench</application>
         (Jeff Janes)
        </para>
 
        <para>
         This adds foreign key constraints to the standard tables created by
-        <application>pgbench</>, for use in foreign key performance testing.
+        <application>pgbench</application>, for use in foreign key performance testing.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgbench</> to aggregate performance statistics
-        and produce output every <option>--aggregate-interval</>
+        Allow <application>pgbench</application> to aggregate performance statistics
+        and produce output every <option>--aggregate-interval</option>
         seconds (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> <option>--sampling-rate</> option
+        Add <application>pgbench</application> <option>--sampling-rate</option> option
         to control the percentage of transactions logged (Tomas Vondra)
        </para>
       </listitem>
@@ -12573,29 +12765,29 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Reduce and improve the status message output of
-        <application>pgbench</>'s initialization mode (Robert Haas,
+        <application>pgbench</application>'s initialization mode (Robert Haas,
         Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> <option>-q</> mode to print one output
+        Add <application>pgbench</application> <option>-q</option> mode to print one output
         line every five seconds (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Output <application>pgbench</> elapsed and estimated remaining
+        Output <application>pgbench</application> elapsed and estimated remaining
         time during initialization (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgbench</> to use much larger scale factors,
-        by changing relevant columns from <type>integer</> to <type>bigint</>
+        Allow <application>pgbench</application> to use much larger scale factors,
+        by changing relevant columns from <type>integer</type> to <type>bigint</type>
         when the requested scale factor exceeds 20000
         (Greg Smith)
        </para>
@@ -12614,21 +12806,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <productname>EPUB</>-format documentation to be created
+        Allow <productname>EPUB</productname>-format documentation to be created
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Update <productname>FreeBSD</> kernel configuration documentation
+        Update <productname>FreeBSD</productname> kernel configuration documentation
         (Brad Davis)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <link linkend="tutorial-window"><literal>WINDOW</>
+        Improve <link linkend="tutorial-window"><literal>WINDOW</literal>
         function</link> documentation (Bruce Momjian, Florian Pflug)
        </para>
       </listitem>
@@ -12636,7 +12828,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link linkend="docguide-toolsets">instructions</link> for setting
-        up the documentation tool chain on <productname>macOS</>
+        up the documentation tool chain on <productname>macOS</productname>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12644,7 +12836,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         documentation (Peter Geoghegan)
        </para>
       </listitem>
diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml
index c665f90ca10cd812246a5c94b02dab975122bcfc..ab47dc50dddcdb6c0804a28961d6c6fa56b0d8a2 100644
--- a/doc/src/sgml/release-9.4.sgml
+++ b/doc/src/sgml/release-9.4.sgml
@@ -1,6 +1,242 @@
 <!-- doc/src/sgml/release-9.4.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-4-15">
+  <title>Release 9.4.15</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.14.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.15</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.13,
+    see <xref linkend="release-9-4-13">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-4-14">
   <title>Release 9.4.14</title>
 
@@ -53,20 +289,20 @@ Branch: REL9_4_STABLE [b51c8efc6] 2017-08-24 15:21:32 -0700
     <listitem>
      <para>
       Show foreign tables
-      in <structname>information_schema</>.<structname>table_privileges</>
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
       view (Peter Eisentraut)
      </para>
 
      <para>
-      All other relevant <structname>information_schema</> views include
+      All other relevant <structname>information_schema</structname> views include
       foreign tables, but this one ignored them.
      </para>
 
      <para>
-      Since this view definition is installed by <application>initdb</>,
+      Since this view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can, as a superuser, do this
-      in <application>psql</>:
+      in <application>psql</application>:
 <programlisting>
 SET search_path TO information_schema;
 CREATE OR REPLACE VIEW table_privileges AS
@@ -105,21 +341,21 @@ CREATE OR REPLACE VIEW table_privileges AS
                OR grantee.rolname = 'PUBLIC');
 </programlisting>
       This must be repeated in each database to be fixed,
-      including <literal>template0</>.
+      including <literal>template0</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Clean up handling of a fatal exit (e.g., due to receipt
-      of <systemitem>SIGTERM</>) that occurs while trying to execute
-      a <command>ROLLBACK</> of a failed transaction (Tom Lane)
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
      </para>
 
      <para>
       This situation could result in an assertion failure.  In production
       builds, the exit would still occur, but it would log an unexpected
-      message about <quote>cannot drop active portal</>.
+      message about <quote>cannot drop active portal</quote>.
      </para>
     </listitem>
 
@@ -136,7 +372,7 @@ CREATE OR REPLACE VIEW table_privileges AS
      </para>
 
      <para>
-      Certain <command>ALTER</> commands that change the definition of a
+      Certain <command>ALTER</command> commands that change the definition of a
       composite type or domain type are supposed to fail if there are any
       stored values of that type in the database, because they lack the
       infrastructure needed to update or check such values.  Previously,
@@ -148,7 +384,7 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Fix crash in <application>pg_restore</> when using parallel mode and
+      Fix crash in <application>pg_restore</application> when using parallel mode and
       using a list file to select a subset of items to restore
       (Fabr&iacute;zio de Royes Mello)
      </para>
@@ -156,13 +392,13 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Change <application>ecpg</>'s parser to allow <literal>RETURNING</>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
       clauses without attached C variables (Michael Meskes)
      </para>
 
      <para>
-      This allows <application>ecpg</> programs to contain SQL constructs
-      that use <literal>RETURNING</> internally (for example, inside a CTE)
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
       rather than using it to define values to be returned to the client.
      </para>
     </listitem>
@@ -174,12 +410,12 @@ CREATE OR REPLACE VIEW table_privileges AS
 
      <para>
       This fix avoids possible crashes of PL/Perl due to inconsistent
-      assumptions about the width of <type>time_t</> values.
+      assumptions about the width of <type>time_t</type> values.
       A side-effect that may be visible to extension developers is
-      that <literal>_USE_32BIT_TIME_T</> is no longer defined globally
-      in <productname>PostgreSQL</> Windows builds.  This is not expected
-      to cause problems, because type <type>time_t</> is not used
-      in any <productname>PostgreSQL</> API definitions.
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
      </para>
     </listitem>
 
@@ -228,7 +464,7 @@ CREATE OR REPLACE VIEW table_privileges AS
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -236,11 +472,11 @@ CREATE OR REPLACE VIEW table_privileges AS
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -255,15 +491,15 @@ CREATE OR REPLACE VIEW table_privileges AS
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -294,15 +530,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -316,7 +552,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -330,16 +566,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -347,13 +583,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -460,21 +696,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -488,7 +724,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -505,7 +741,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       Logical decoding crashed on tuples that are wider than 64KB (after
       compression, but with all data in-line).  The case arises only
-      when <literal>REPLICA IDENTITY FULL</> is enabled for a table
+      when <literal>REPLICA IDENTITY FULL</literal> is enabled for a table
       containing such tuples.
      </para>
     </listitem>
@@ -553,7 +789,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -561,7 +797,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -569,56 +805,56 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -629,20 +865,20 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -655,9 +891,9 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -668,8 +904,8 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -680,15 +916,15 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -701,14 +937,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -719,14 +955,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -734,13 +970,13 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -748,7 +984,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -760,8 +996,8 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -773,9 +1009,9 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -786,7 +1022,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -798,14 +1034,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -825,34 +1061,34 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -889,7 +1125,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
@@ -906,18 +1142,18 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -941,7 +1177,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -955,17 +1191,17 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -996,7 +1232,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -1009,7 +1245,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -1017,21 +1253,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -1052,19 +1288,19 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -1072,27 +1308,27 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -1106,12 +1342,12 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -1120,21 +1356,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -1146,7 +1382,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -1160,13 +1396,13 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -1184,21 +1420,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -1213,20 +1449,20 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -1238,26 +1474,26 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -1270,7 +1506,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -1320,7 +1556,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -1334,9 +1570,9 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -1349,15 +1585,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
       other zone file (see <xref linkend="datatype-timezones">).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
@@ -1410,15 +1646,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1435,19 +1671,19 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
       Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1513,7 +1749,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
@@ -1528,7 +1764,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -1544,15 +1780,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1565,7 +1801,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -1578,7 +1814,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1608,13 +1844,13 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1622,12 +1858,12 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1642,15 +1878,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1661,33 +1897,33 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1699,8 +1935,8 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1712,15 +1948,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1733,28 +1969,28 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -1767,15 +2003,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1794,21 +2030,21 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1820,23 +2056,23 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1847,22 +2083,22 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -1888,7 +2124,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1951,7 +2187,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -1959,7 +2195,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -1970,20 +2206,20 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      </para>
 
      <para>
-      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      The typical symptom was <quote>unexpected GIN leaf action</quote> errors
       during WAL replay.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -2017,79 +2253,79 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
-      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</command> on a table
+      with a <literal>PRIMARY KEY</literal> or <literal>REPLICA IDENTITY</literal> index
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
+      Fix <command>EXPLAIN</command> to emit valid XML when
       <xref linkend="guc-track-io-timing"> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -2134,7 +2370,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -2153,7 +2389,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       This failure to reset all of the fields of the slot could
-      prevent <command>VACUUM</> from removing dead tuples.
+      prevent <command>VACUUM</command> from removing dead tuples.
      </para>
     </listitem>
 
@@ -2164,7 +2400,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -2178,7 +2414,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       Previously, the same value would be chosen every time, because it was
-      derived from <function>random()</> but <function>srandom()</> had not
+      derived from <function>random()</function> but <function>srandom()</function> had not
       yet been called.  While relatively harmless, this was not the intended
       behavior.
      </para>
@@ -2191,8 +2427,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
-      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</literal> rather
+      than <literal>ERROR_ALREADY_EXISTS</literal> when there is an existing
       segment.  This led to postmaster startup failure due to believing that
       the former was an unrecoverable error.
      </para>
@@ -2201,7 +2437,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -2212,30 +2448,30 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</>'s calculation of average latency
+      Fix <application>pgbench</application>'s calculation of average latency
       (Fabien Coelho)
      </para>
 
      <para>
-      The calculation was incorrect when there were <literal>\sleep</>
+      The calculation was incorrect when there were <literal>\sleep</literal>
       commands in the script, or when the test duration was specified in
       number of transactions rather than total time.
      </para>
@@ -2243,12 +2479,12 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -2256,8 +2492,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -2268,7 +2504,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -2276,15 +2512,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_buffercache</> to work
-      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+      Fix <filename>contrib/pg_buffercache</filename> to work
+      when <varname>shared_buffers</varname> exceeds 256GB (KaiGai Kohei)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -2296,17 +2532,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      When <productname>PostgreSQL</> has been configured
-      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      When <productname>PostgreSQL</productname> has been configured
+      with <option>--enable-tap-tests</option>, <quote>make install</quote> will now
       install the Perl support files for TAP testing where PGXS can find
       them.  This allows non-core extensions to
-      use <literal>$(prove_check)</> without extra tests.
+      use <literal>$(prove_check)</literal> without extra tests.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, include <application>pg_recvlogical</> in a
+      In MSVC builds, include <application>pg_recvlogical</application> in a
       client-only installation (MauMau)
      </para>
     </listitem>
@@ -2327,17 +2563,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -2350,15 +2586,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -2403,17 +2639,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -2427,7 +2663,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -2436,22 +2672,22 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -2461,40 +2697,40 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -2505,19 +2741,19 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -2527,8 +2763,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -2542,7 +2778,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -2568,15 +2804,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -2619,12 +2855,12 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -2640,12 +2876,12 @@ Branch: REL9_2_STABLE [294509ea9] 2016-05-25 19:39:49 -0400
 Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 -->
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -2660,15 +2896,15 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -2680,7 +2916,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -2713,7 +2949,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      </para>
 
      <para>
-      This mistake prevented <command>VACUUM</> from completing in some
+      This mistake prevented <command>VACUUM</command> from completing in some
       cases involving corrupt b-tree indexes.
      </para>
     </listitem>
@@ -2727,8 +2963,8 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -2741,53 +2977,53 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -2795,8 +3031,8 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -2808,7 +3044,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -2820,7 +3056,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -2841,13 +3077,13 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -2867,7 +3103,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -2879,7 +3115,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -2934,7 +3170,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -2943,7 +3179,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -2957,10 +3193,10 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -2981,14 +3217,14 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       The memory leak would typically not amount to much in simple queries,
       but it could be very substantial during a large GIN index build with
-      high <varname>maintenance_work_mem</>.
+      high <varname>maintenance_work_mem</varname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -3000,29 +3236,29 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      Disallow newlines in <command>ALTER SYSTEM</command> parameter values
       (Tom Lane)
      </para>
 
      <para>
       The configuration-file parser doesn't support embedded newlines in
       string literals, so we mustn't allow them in values to be inserted
-      by <command>ALTER SYSTEM</>.
+      by <command>ALTER SYSTEM</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</command> to
       work properly if an index on OID is selected (David Rowley)
      </para>
     </listitem>
@@ -3048,19 +3284,19 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -3068,20 +3304,20 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -3092,22 +3328,22 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -3120,19 +3356,19 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -3140,9 +3376,9 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -3188,29 +3424,29 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug in <function>json_to_record()</> when a field of its input
+      Fix bug in <function>json_to_record()</function> when a field of its input
       object contains a sub-object with a field name matching one of the
       requested output column names (Tom Lane)
      </para>
@@ -3219,7 +3455,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix misformatting of negative time zone offsets
-      by <function>to_char()</>'s <literal>OF</> format code
+      by <function>to_char()</function>'s <literal>OF</literal> format code
       (Thomas Munro, Tom Lane)
      </para>
     </listitem>
@@ -3232,7 +3468,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       Previously, standby servers would delay application of WAL records in
-      response to <varname>recovery_min_apply_delay</> even while replaying
+      response to <varname>recovery_min_apply_delay</varname> even while replaying
       the initial portion of WAL needed to make their database state valid.
       Since the standby is useless until it's reached a consistent database
       state, this was deemed unhelpful.
@@ -3241,7 +3477,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
@@ -3253,44 +3489,44 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       Trouble cases included tuples larger than one page when replica
-      identity is <literal>FULL</>, <command>UPDATE</>s that change a
+      identity is <literal>FULL</literal>, <command>UPDATE</command>s that change a
       primary key within a transaction large enough to be spooled to disk,
       incorrect reports of <quote>subxact logged without previous toplevel
-      record</>, and incorrect reporting of a transaction's commit time.
+      record</quote>, and incorrect reporting of a transaction's commit time.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix planner error with nested security barrier views when the outer
-      view has a <literal>WHERE</> clause containing a correlated subquery
+      view has a <literal>WHERE</literal> clause containing a correlated subquery
       (Dean Rasheed)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -3316,27 +3552,27 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -3350,26 +3586,26 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -3397,21 +3633,21 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -3447,7 +3683,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
    <para>
     However, if you are upgrading an installation that contains any GIN
-    indexes that use the (non-default) <literal>jsonb_path_ops</> operator
+    indexes that use the (non-default) <literal>jsonb_path_ops</literal> operator
     class, see the first changelog entry below.
    </para>
 
@@ -3471,19 +3707,19 @@ Branch: REL9_4_STABLE [788e35ac0] 2015-11-05 18:15:48 -0500
 
     <listitem>
      <para>
-      Fix inconsistent hash calculations in <literal>jsonb_path_ops</> GIN
+      Fix inconsistent hash calculations in <literal>jsonb_path_ops</literal> GIN
       indexes (Tom Lane)
      </para>
 
      <para>
-      When processing <type>jsonb</> values that contain both scalars and
+      When processing <type>jsonb</type> values that contain both scalars and
       sub-objects at the same nesting level, for example an array containing
       both scalars and sub-arrays, key hash values could be calculated
       differently than they would be for the same key in a different context.
       This could result in queries not finding entries that they should find.
       Fixing this means that existing indexes may now be inconsistent with the
       new hash calculation code.  Users
-      should <command>REINDEX</> <literal>jsonb_path_ops</> GIN indexes after
+      should <command>REINDEX</command> <literal>jsonb_path_ops</literal> GIN indexes after
       installing this update to make sure that all searches work as expected.
      </para>
     </listitem>
@@ -3513,18 +3749,18 @@ Branch: REL9_1_STABLE [dea6da132] 2015-10-06 17:15:27 -0400
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
@@ -3541,7 +3777,7 @@ Branch: REL9_1_STABLE [08322daed] 2015-10-31 14:36:58 -0500
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -3560,7 +3796,7 @@ Branch: REL9_1_STABLE [5f9a86b35] 2015-12-12 14:19:29 +0100
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -3614,7 +3850,7 @@ Branch: REL9_1_STABLE [60ba32cb5] 2015-11-20 14:55:29 -0500
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
@@ -3629,7 +3865,7 @@ Branch: REL9_1_STABLE [7e29e7f55] 2015-12-21 19:49:15 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3644,7 +3880,7 @@ Branch: REL9_1_STABLE [ab14c1383] 2015-12-21 19:16:15 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -3663,7 +3899,7 @@ Branch: REL9_1_STABLE [f44c5203b] 2015-12-11 18:39:09 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3697,13 +3933,13 @@ Branch: REL9_3_STABLE [0a34ff7e9] 2015-12-07 17:41:45 -0500
 
     <listitem>
      <para>
-      Fix planner's handling of <literal>LATERAL</> references (Tom
+      Fix planner's handling of <literal>LATERAL</literal> references (Tom
       Lane)
      </para>
 
      <para>
       This fixes some corner cases that led to <quote>failed to build any
-      N-way joins</> or <quote>could not devise a query plan</> planner
+      N-way joins</quote> or <quote>could not devise a query plan</quote> planner
       failures.
      </para>
     </listitem>
@@ -3753,9 +3989,9 @@ Branch: REL9_3_STABLE [faf18a905] 2015-11-16 13:45:17 -0500
 
     <listitem>
      <para>
-      Speed up generation of unique table aliases in <command>EXPLAIN</> and
+      Speed up generation of unique table aliases in <command>EXPLAIN</command> and
       rule dumping, and ensure that generated aliases do not
-      exceed <literal>NAMEDATALEN</> (Tom Lane)
+      exceed <literal>NAMEDATALEN</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -3771,8 +4007,8 @@ Branch: REL9_1_STABLE [7b21d1bca] 2015-11-15 14:41:09 -0500
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
@@ -3785,8 +4021,8 @@ Branch: REL9_4_STABLE [4f33572ee] 2015-10-20 11:06:24 -0700
 
     <listitem>
      <para>
-      Translation of minus-infinity dates and timestamps to <type>json</>
-      or <type>jsonb</> incorrectly rendered them as plus-infinity (Tom Lane)
+      Translation of minus-infinity dates and timestamps to <type>json</type>
+      or <type>jsonb</type> incorrectly rendered them as plus-infinity (Tom Lane)
      </para>
     </listitem>
 
@@ -3802,7 +4038,7 @@ Branch: REL9_1_STABLE [728a2ac21] 2015-11-17 15:47:12 -0500
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3894,7 +4130,7 @@ Branch: REL9_1_STABLE [b94c2b6a6] 2015-10-16 15:36:17 -0400
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -3929,14 +4165,14 @@ Branch: REL9_1_STABLE [b00c79b5b] 2015-10-16 14:43:18 -0400
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -3959,7 +4195,7 @@ Branch: REL9_1_STABLE [b0d858359] 2015-10-13 11:21:33 -0400
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -4009,13 +4245,13 @@ Branch: REL9_1_STABLE [db462a44e] 2015-12-17 16:55:51 -0500
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -4023,8 +4259,8 @@ Branch: REL9_1_STABLE [db462a44e] 2015-12-17 16:55:51 -0500
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
@@ -4041,7 +4277,7 @@ Branch: REL9_1_STABLE [6430a11fa] 2015-11-25 17:31:54 -0500
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -4059,21 +4295,21 @@ Branch: REL9_1_STABLE [c869a7d5b] 2015-10-12 18:30:37 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -4091,23 +4327,23 @@ Branch: REL9_1_STABLE [87deb55a4] 2015-11-08 17:31:24 -0500
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -4127,18 +4363,18 @@ Branch: REL9_1_STABLE [6df62ef43] 2015-11-23 00:32:01 -0500
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -4148,16 +4384,16 @@ Branch: REL9_1_STABLE [6df62ef43] 2015-11-23 00:32:01 -0500
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
@@ -4180,14 +4416,14 @@ Branch: REL9_1_STABLE [e4959fb5c] 2016-01-02 19:04:45 -0500
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
@@ -4202,7 +4438,7 @@ Branch: REL9_3_STABLE [534a4159c] 2015-12-23 14:25:31 -0500
 
     <listitem>
      <para>
-      Avoid repeated password prompts during parallel <application>pg_dump</>
+      Avoid repeated password prompts during parallel <application>pg_dump</application>
       (Zeus Kronion)
      </para>
     </listitem>
@@ -4225,14 +4461,14 @@ Branch: REL9_1_STABLE [c36064e43] 2015-11-24 17:18:27 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -4250,22 +4486,22 @@ Branch: REL9_2_STABLE [4fb9e6109] 2015-12-28 10:50:35 -0300
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -4273,7 +4509,7 @@ Branch: REL9_2_STABLE [4fb9e6109] 2015-12-28 10:50:35 -0300
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
@@ -4288,29 +4524,29 @@ Branch: REL9_3_STABLE [db6e8e162] 2015-11-12 13:03:53 -0500
 
     <listitem>
      <para>
-      Fix premature clearing of <application>libpq</>'s input buffer when
+      Fix premature clearing of <application>libpq</application>'s input buffer when
       socket EOF is seen (Tom Lane)
      </para>
 
      <para>
-      This mistake caused <application>libpq</> to sometimes not report the
+      This mistake caused <application>libpq</application> to sometimes not report the
       backend's final error message before reporting <quote>server closed the
-      connection unexpectedly</>.
+      connection unexpectedly</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
@@ -4326,7 +4562,7 @@ Branch: REL9_1_STABLE [4b58ded74] 2015-12-14 18:48:49 +0200
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -4343,7 +4579,7 @@ Branch: REL9_1_STABLE [a9bcd8370] 2015-10-18 10:17:12 +0200
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
@@ -4360,29 +4596,29 @@ Branch: REL9_1_STABLE [84387496f] 2015-12-01 11:42:52 -0500
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -4403,15 +4639,15 @@ Branch: REL9_1_STABLE [1b6102eb7] 2015-12-27 13:03:19 -0300
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>, fix bugs triggered by use
-      of <literal>tableoid</> in data-modifying commands (Etsuro Fujita,
+      In <filename>contrib/postgres_fdw</filename>, fix bugs triggered by use
+      of <literal>tableoid</literal> in data-modifying commands (Etsuro Fujita,
       Robert Haas)
      </para>
     </listitem>
@@ -4433,7 +4669,7 @@ Branch: REL9_2_STABLE [7f94a5c10] 2015-12-10 10:19:31 -0500
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -4467,19 +4703,19 @@ Branch: REL9_1_STABLE [2a37a103b] 2015-12-11 16:14:48 -0500
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -4497,11 +4733,11 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -4510,7 +4746,7 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -4563,13 +4799,13 @@ Branch: REL9_3_STABLE [f8862172e] 2015-10-05 10:06:34 -0400
 
     <listitem>
      <para>
-      Guard against stack overflows in <type>json</> parsing
+      Guard against stack overflows in <type>json</type> parsing
       (Oskari Saarenmaa)
      </para>
 
      <para>
-      If an application constructs PostgreSQL <type>json</>
-      or <type>jsonb</> values from arbitrary user input, the application's
+      If an application constructs PostgreSQL <type>json</type>
+      or <type>jsonb</type> values from arbitrary user input, the application's
       users can reliably crash the PostgreSQL server, causing momentary
       denial of service.  (CVE-2015-5289)
      </para>
@@ -4588,8 +4824,8 @@ Branch: REL9_0_STABLE [188e081ef] 2015-10-05 10:06:36 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -4634,7 +4870,7 @@ Branch: REL9_4_STABLE [bab959906] 2015-08-02 20:09:05 +0300
     <listitem>
      <para>
       Fix possible deadlock during WAL insertion
-      when <varname>commit_delay</> is set (Heikki Linnakangas)
+      when <varname>commit_delay</varname> is set (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -4665,13 +4901,13 @@ Branch: REL9_0_STABLE [45c69178b] 2015-06-25 14:39:06 -0400
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -4711,7 +4947,7 @@ Branch: REL9_0_STABLE [2d4336cf8] 2015-09-30 23:32:23 -0400
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -4731,7 +4967,7 @@ Branch: REL9_3_STABLE [1bcc9e60a] 2015-09-25 13:16:31 -0400
      </para>
 
      <para>
-      This was seen primarily when restoring <application>pg_dump</> output
+      This was seen primarily when restoring <application>pg_dump</application> output
       for databases with many thousands of tables.
      </para>
     </listitem>
@@ -4755,7 +4991,7 @@ Branch: REL9_0_STABLE [444b2ebee] 2015-07-28 22:06:32 +0200
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
@@ -4779,7 +5015,7 @@ Branch: REL9_0_STABLE [eeb0b7830] 2015-10-05 11:57:25 +0200
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -4802,7 +5038,7 @@ Branch: REL9_0_STABLE [b09446ed7] 2015-08-04 13:12:03 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
@@ -4816,8 +5052,8 @@ Branch: REL9_3_STABLE [5a56c2545] 2015-06-28 18:38:06 -0400
     <listitem>
      <para>
       Avoid logging complaints when a parameter that can only be set at
-      server start appears multiple times in <filename>postgresql.conf</>,
-      and fix counting of line numbers after an <literal>include_dir</>
+      server start appears multiple times in <filename>postgresql.conf</filename>,
+      and fix counting of line numbers after an <literal>include_dir</literal>
       directive (Tom Lane)
      </para>
     </listitem>
@@ -4835,7 +5071,7 @@ Branch: REL9_0_STABLE [a89781e34] 2015-09-21 12:12:16 -0400
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -4862,8 +5098,8 @@ Branch: REL9_2_STABLE [8dacb29ca] 2015-10-05 10:06:35 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
@@ -4887,14 +5123,14 @@ Branch: REL9_0_STABLE [92d956f51] 2015-09-07 20:47:06 +0100
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -4936,7 +5172,7 @@ Branch: REL9_0_STABLE [b875ca09f] 2015-10-02 15:00:52 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -5052,8 +5288,8 @@ Branch: REL9_0_STABLE [bd327627f] 2015-08-04 18:18:47 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
@@ -5071,7 +5307,7 @@ Branch: REL9_0_STABLE [36522d627] 2015-07-16 22:57:46 -0400
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
@@ -5093,8 +5329,8 @@ Branch: REL9_0_STABLE [d637a899c] 2015-10-04 15:55:07 -0400
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -5172,9 +5408,9 @@ Branch: REL9_0_STABLE [7b4b57fc4] 2015-08-12 21:19:10 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -5190,7 +5426,7 @@ Branch: REL9_2_STABLE [e538e510e] 2015-06-22 18:53:27 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -5232,12 +5468,12 @@ Branch: REL9_0_STABLE [8b53c087d] 2015-08-02 14:54:44 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -5311,7 +5547,7 @@ Branch: REL9_0_STABLE [f527c0a2a] 2015-07-28 17:34:00 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -5389,7 +5625,7 @@ Branch: REL9_2_STABLE [f4297f8c5] 2015-07-27 12:32:48 +0300
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -5408,7 +5644,7 @@ Branch: REL9_0_STABLE [40ad78220] 2015-07-23 01:30:19 +0300
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
@@ -5426,8 +5662,8 @@ Branch: REL9_0_STABLE [e41718fa1] 2015-08-18 19:22:38 -0400
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
@@ -5444,7 +5680,7 @@ Branch: REL9_1_STABLE [ca6c2f863] 2015-09-29 10:52:22 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
@@ -5467,8 +5703,8 @@ Branch: REL9_1_STABLE [1d190d095] 2015-08-21 12:21:37 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
@@ -5485,8 +5721,8 @@ Branch: REL9_0_STABLE [4c11967e7] 2015-07-20 14:18:08 +0200
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
@@ -5503,7 +5739,7 @@ Branch: REL9_1_STABLE [2d19a0e97] 2015-08-02 22:12:51 +0300
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -5522,7 +5758,7 @@ Branch: REL9_4_STABLE [93840f96c] 2015-10-04 17:58:30 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/pg_stat_statements</>' handling of
+      Improve <filename>contrib/pg_stat_statements</filename>' handling of
       query-text garbage collection (Peter Geoghegan)
      </para>
 
@@ -5543,13 +5779,13 @@ Branch: REL9_3_STABLE [b7dcb2dd4] 2015-09-24 12:47:30 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/postgres_fdw</>'s handling of
+      Improve <filename>contrib/postgres_fdw</filename>'s handling of
       collation-related decisions (Tom Lane)
      </para>
 
      <para>
       The main user-visible effect is expected to be that comparisons
-      involving <type>varchar</> columns will be sent to the remote server
+      involving <type>varchar</type> columns will be sent to the remote server
       for execution in more cases than before.
      </para>
     </listitem>
@@ -5567,7 +5803,7 @@ Branch: REL9_0_STABLE [2b189c7ec] 2015-07-07 18:45:31 +0300
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -5603,7 +5839,7 @@ Branch: REL9_0_STABLE [d278ff3b2] 2015-06-15 14:27:39 +0200
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
@@ -5634,15 +5870,15 @@ Branch: REL9_0_STABLE [98d8c75f9] 2015-09-25 12:20:46 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
@@ -5659,7 +5895,7 @@ Branch: REL9_0_STABLE [6087bf1a1] 2015-07-08 20:44:27 -0400
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
@@ -5675,7 +5911,7 @@ Branch: REL9_2_STABLE [3756c65a0] 2015-10-01 16:19:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
@@ -5692,8 +5928,8 @@ Branch: REL9_1_STABLE [af225551e] 2015-07-25 17:16:39 -0400
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -5710,8 +5946,8 @@ Branch: REL9_0_STABLE [24aed2124] 2015-09-20 20:44:34 -0400
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
@@ -5729,8 +5965,8 @@ Branch: REL9_0_STABLE [52b07779d] 2015-09-11 15:51:10 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
@@ -5748,7 +5984,7 @@ Branch: REL9_0_STABLE [298d1f808] 2015-08-10 20:10:16 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -5756,11 +5992,11 @@ Branch: REL9_0_STABLE [298d1f808] 2015-08-10 20:10:16 -0400
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -5780,12 +6016,12 @@ Branch: REL9_0_STABLE [5d175be17] 2015-08-04 19:34:12 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
@@ -5801,7 +6037,7 @@ Branch: REL9_1_STABLE [e9a859b54] 2015-07-12 16:25:52 -0400
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -5815,8 +6051,8 @@ Branch: REL9_4_STABLE [9d6352aaa] 2015-07-03 11:15:27 +0300
 
     <listitem>
      <para>
-      Fix <application>pgbench</>'s progress-report behavior when a query,
-      or <application>pgbench</> itself, gets stuck (Fabien Coelho)
+      Fix <application>pgbench</application>'s progress-report behavior when a query,
+      or <application>pgbench</application> itself, gets stuck (Fabien Coelho)
      </para>
     </listitem>
 
@@ -5845,11 +6081,11 @@ Branch: REL9_0_STABLE [b5a22d8bb] 2015-08-29 16:09:25 -0400
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -5868,7 +6104,7 @@ Branch: REL9_0_STABLE [cdf596b1c] 2015-07-17 03:02:46 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
@@ -5886,7 +6122,7 @@ Branch: REL9_0_STABLE [7803d5720] 2015-07-15 21:00:31 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -5909,7 +6145,7 @@ Branch: REL9_0_STABLE [2d8c136e7] 2015-07-29 22:54:08 -0400
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
@@ -5925,7 +6161,7 @@ Branch: REL9_0_STABLE [b185c42c1] 2015-06-30 14:20:37 -0300
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
@@ -5939,7 +6175,7 @@ Branch: REL9_4_STABLE [a0104e080] 2015-08-14 20:23:42 -0400
 
     <listitem>
      <para>
-      Translate encoding <literal>UHC</> as Windows code page 949
+      Translate encoding <literal>UHC</literal> as Windows code page 949
       (Noah Misch)
      </para>
 
@@ -5972,12 +6208,12 @@ Branch: REL9_4_STABLE [b2ed1682d] 2015-06-20 12:10:56 -0400
     <listitem>
      <para>
       Fix postmaster startup failure due to not
-      copying <function>setlocale()</>'s return value (Noah Misch)
+      copying <function>setlocale()</function>'s return value (Noah Misch)
      </para>
 
      <para>
       This has been reported on Windows systems with the ANSI code page set
-      to CP936 (<quote>Chinese (Simplified, PRC)</>), and may occur with
+      to CP936 (<quote>Chinese (Simplified, PRC)</quote>), and may occur with
       other multibyte code pages.
      </para>
     </listitem>
@@ -5995,7 +6231,7 @@ Branch: REL9_0_STABLE [341b877d3] 2015-07-07 16:39:25 +0300
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
@@ -6013,9 +6249,9 @@ Branch: REL9_0_STABLE [29ff43adf] 2015-07-05 12:01:02 -0400
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
@@ -6032,10 +6268,10 @@ Branch: REL9_0_STABLE [47ac95f37] 2015-10-02 19:16:37 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -6067,7 +6303,7 @@ Branch: REL9_0_STABLE [47ac95f37] 2015-10-02 19:16:37 -0400
 
    <para>
     However, if you are upgrading an installation that was previously
-    upgraded using a <application>pg_upgrade</> version between 9.3.0 and
+    upgraded using a <application>pg_upgrade</application> version between 9.3.0 and
     9.3.4 inclusive, see the first changelog entry below.
    </para>
 
@@ -6096,46 +6332,46 @@ Branch: REL9_3_STABLE [2a9b01928] 2015-06-05 09:34:15 -0400
      </para>
 
      <para>
-      Recent <productname>PostgreSQL</> releases introduced mechanisms to
+      Recent <productname>PostgreSQL</productname> releases introduced mechanisms to
       protect against multixact wraparound, but some of that code did not
       account for the possibility that it would need to run during crash
       recovery, when the database may not be in a consistent state.  This
       could result in failure to restart after a crash, or failure to start
       up a secondary server.  The lingering effects of a previously-fixed
-      bug in <application>pg_upgrade</> could also cause such a failure, in
-      installations that had used <application>pg_upgrade</> versions
+      bug in <application>pg_upgrade</application> could also cause such a failure, in
+      installations that had used <application>pg_upgrade</application> versions
       between 9.3.0 and 9.3.4.
      </para>
 
      <para>
-      The <application>pg_upgrade</> bug in question was that it would
-      set <literal>oldestMultiXid</> to 1 in <filename>pg_control</> even
+      The <application>pg_upgrade</application> bug in question was that it would
+      set <literal>oldestMultiXid</literal> to 1 in <filename>pg_control</filename> even
       if the true value should be higher.  With the fixes introduced in
       this release, such a situation will result in immediate emergency
-      autovacuuming until a correct <literal>oldestMultiXid</> value can
+      autovacuuming until a correct <literal>oldestMultiXid</literal> value can
       be determined.  If that would pose a hardship, users can avoid it by
-      doing manual vacuuming <emphasis>before</> upgrading to this release.
+      doing manual vacuuming <emphasis>before</emphasis> upgrading to this release.
       In detail:
 
       <orderedlist>
        <listitem>
         <para>
-         Check whether <application>pg_controldata</> reports <quote>Latest
-         checkpoint's oldestMultiXid</> to be 1.  If not, there's nothing
+         Check whether <application>pg_controldata</application> reports <quote>Latest
+         checkpoint's oldestMultiXid</quote> to be 1.  If not, there's nothing
          to do.
         </para>
        </listitem>
        <listitem>
         <para>
-         Look in <filename>PGDATA/pg_multixact/offsets</> to see if there's a
-         file named <filename>0000</>.  If there is, there's nothing to do.
+         Look in <filename>PGDATA/pg_multixact/offsets</filename> to see if there's a
+         file named <filename>0000</filename>.  If there is, there's nothing to do.
         </para>
        </listitem>
        <listitem>
         <para>
          Otherwise, for each table that has
-         <structname>pg_class</>.<structfield>relminmxid</> equal to 1,
-         <command>VACUUM</> that table with
+         <structname>pg_class</structname>.<structfield>relminmxid</structfield> equal to 1,
+         <command>VACUUM</command> that table with
          both <xref linkend="guc-vacuum-multixact-freeze-min-age">
          and <xref linkend="guc-vacuum-multixact-freeze-table-age"> set to
          zero.  (You can use the vacuum cost delay parameters described
@@ -6164,7 +6400,7 @@ Branch: REL9_0_STABLE [2fe1939b0] 2015-06-07 15:32:09 -0400
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -6185,13 +6421,13 @@ Branch: REL9_0_STABLE [dbd99c7f0] 2015-06-05 13:22:27 -0400
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -6284,12 +6520,12 @@ Branch: REL9_3_STABLE [c2b68b1f7] 2015-05-29 17:02:58 -0400
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -6301,7 +6537,7 @@ Branch: REL9_3_STABLE [c2b68b1f7] 2015-05-29 17:02:58 -0400
      </para>
 
      <para>
-      Also apply the same rules in <literal>initdb --sync-only</>.
+      Also apply the same rules in <literal>initdb --sync-only</literal>.
       This case is less critical but it should act similarly.
      </para>
     </listitem>
@@ -6316,8 +6552,8 @@ Branch: REL9_2_STABLE [f3c67aad4] 2015-05-28 11:24:37 -0400
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
@@ -6329,7 +6565,7 @@ Branch: REL9_4_STABLE [9b74f32cd] 2015-05-22 10:31:29 -0400
 
     <listitem>
      <para>
-      Fix <function>pushJsonbValue()</> to unpack <type>jbvBinary</>
+      Fix <function>pushJsonbValue()</function> to unpack <type>jbvBinary</type>
       objects (Andrew Dunstan)
      </para>
 
@@ -6351,14 +6587,14 @@ Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
@@ -6390,8 +6626,8 @@ Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
@@ -6469,7 +6705,7 @@ Branch: REL9_0_STABLE [cf893530a] 2015-05-19 18:18:56 -0400
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -6479,7 +6715,7 @@ Branch: REL9_0_STABLE [cf893530a] 2015-05-19 18:18:56 -0400
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -6499,15 +6735,15 @@ Branch: REL9_0_STABLE [b84e5c017] 2015-05-18 10:02:39 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -6557,7 +6793,7 @@ Branch: REL9_3_STABLE [ddebd2119] 2015-05-11 12:16:51 -0400
 
      <para>
       Under certain usage patterns, the existing defenses against this might
-      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      be insufficient, allowing <filename>pg_multixact/members</filename> files to be
       removed too early, resulting in data loss.
       The fix for this includes modifying the server to fail transactions
       that would result in overwriting old multixact member ID data, and
@@ -6578,16 +6814,16 @@ Branch: REL9_1_STABLE [801e250a8] 2015-05-05 15:50:53 -0400
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -6595,16 +6831,16 @@ Branch: REL9_1_STABLE [801e250a8] 2015-05-05 15:50:53 -0400
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -6616,8 +6852,8 @@ Branch: REL9_4_STABLE [79afe6e66] 2015-02-26 12:34:43 -0500
 
     <listitem>
      <para>
-      Render infinite dates and timestamps as <literal>infinity</> when
-      converting to <type>json</>, rather than throwing an error
+      Render infinite dates and timestamps as <literal>infinity</literal> when
+      converting to <type>json</type>, rather than throwing an error
       (Andrew Dunstan)
      </para>
     </listitem>
@@ -6630,8 +6866,8 @@ Branch: REL9_4_STABLE [997066f44] 2015-05-04 12:43:16 -0400
 
     <listitem>
      <para>
-      Fix <type>json</>/<type>jsonb</>'s <function>populate_record()</>
-      and <function>to_record()</> functions to handle empty input properly
+      Fix <type>json</type>/<type>jsonb</type>'s <function>populate_record()</function>
+      and <function>to_record()</function> functions to handle empty input properly
       (Andrew Dunstan)
      </para>
     </listitem>
@@ -6671,7 +6907,7 @@ Branch: REL9_4_STABLE [79edb2981] 2015-05-03 11:30:24 -0400
     <listitem>
      <para>
       Fix behavior when changing foreign key constraint deferrability status
-      with <literal>ALTER TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      with <literal>ALTER TABLE ... ALTER CONSTRAINT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -6720,7 +6956,7 @@ Branch: REL9_0_STABLE [985da346e] 2015-04-25 16:44:27 -0400
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -6768,7 +7004,7 @@ Branch: REL9_0_STABLE [72bbca27e] 2015-02-10 20:37:31 -0500
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -6782,7 +7018,7 @@ Branch: REL9_4_STABLE [f16270ade] 2015-02-25 21:36:40 -0500
     <listitem>
      <para>
       Ensure that row locking occurs properly when the target of
-      an <command>UPDATE</> or <command>DELETE</> is a security-barrier view
+      an <command>UPDATE</command> or <command>DELETE</command> is a security-barrier view
       (Stephen Frost)
      </para>
     </listitem>
@@ -6801,7 +7037,7 @@ Branch: REL9_4_STABLE [fd3dfc236] 2015-04-28 00:18:04 +0200
 
      <para>
       On some platforms, the previous coding could result in errors like
-      <quote>could not fsync file "pg_replslot/...": Bad file descriptor</>.
+      <quote>could not fsync file "pg_replslot/...": Bad file descriptor</quote>.
      </para>
     </listitem>
 
@@ -6818,7 +7054,7 @@ Branch: REL9_0_STABLE [223a94680] 2015-04-23 21:37:09 +0300
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -6859,7 +7095,7 @@ Branch: REL9_0_STABLE [262fbcb9d] 2015-05-05 09:30:07 -0400
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -6901,7 +7137,7 @@ Branch: REL9_4_STABLE [ee0d06c0b] 2015-04-03 00:07:29 -0400
 
      <para>
       This oversight could result in failures in sessions that start
-      concurrently with a <command>VACUUM FULL</> on a system catalog.
+      concurrently with a <command>VACUUM FULL</command> on a system catalog.
      </para>
     </listitem>
 
@@ -6913,7 +7149,7 @@ Branch: REL9_4_STABLE [2897e069c] 2015-03-30 13:05:35 -0400
 
     <listitem>
      <para>
-      Fix crash in <function>BackendIdGetTransactionIds()</> when trying
+      Fix crash in <function>BackendIdGetTransactionIds()</function> when trying
       to get status for a backend process that just exited (Tom Lane)
      </para>
     </listitem>
@@ -6930,13 +7166,13 @@ Branch: REL9_0_STABLE [87b7fcc87] 2015-02-23 16:14:16 +0100
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
@@ -6950,7 +7186,7 @@ Branch: REL9_2_STABLE [effcaa4c2] 2015-02-15 23:26:46 -0500
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -6995,7 +7231,7 @@ Branch: REL9_4_STABLE [16be9737c] 2015-03-23 16:52:17 +0100
 
     <listitem>
      <para>
-      Avoid busy-waiting with short <literal>recovery_min_apply_delay</>
+      Avoid busy-waiting with short <literal>recovery_min_apply_delay</literal>
       values (Andres Freund)
      </para>
     </listitem>
@@ -7061,9 +7297,9 @@ Branch: REL9_0_STABLE [152c94632] 2015-03-29 15:04:38 -0400
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
@@ -7078,10 +7314,10 @@ Branch: REL9_1_STABLE [4a4fd2b0c] 2015-03-12 13:38:49 -0400
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -7127,14 +7363,14 @@ Branch: REL9_0_STABLE [c981e5999] 2015-05-08 19:40:15 -0400
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
@@ -7157,7 +7393,7 @@ Branch: REL9_0_STABLE [e48ce4f33] 2015-02-17 12:49:18 -0500
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -7170,7 +7406,7 @@ Branch: REL9_0_STABLE [e48ce4f33] 2015-02-17 12:49:18 -0500
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
@@ -7197,7 +7433,7 @@ Branch: REL9_4_STABLE [a1f4ade01] 2015-04-02 14:39:18 -0400
     <listitem>
      <para>
       After a database crash, don't restart background workers that are
-      marked <literal>BGW_NEVER_RESTART</> (Amit Khandekar)
+      marked <literal>BGW_NEVER_RESTART</literal> (Amit Khandekar)
      </para>
     </listitem>
 
@@ -7212,13 +7448,13 @@ Branch: REL9_1_STABLE [0d36d9f2b] 2015-02-06 11:32:42 +0200
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -7236,7 +7472,7 @@ Branch: REL9_0_STABLE [78ce2dc8e] 2015-05-07 15:10:01 +0200
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
@@ -7253,7 +7489,7 @@ Branch: REL9_0_STABLE [8878eaaa8] 2015-02-23 13:32:53 +0200
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -7262,12 +7498,12 @@ Branch: REL9_0_STABLE [8878eaaa8] 2015-02-23 13:32:53 +0200
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
@@ -7281,7 +7517,7 @@ Branch: REL9_2_STABLE [83c3115dd] 2015-02-21 12:59:43 -0500
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
@@ -7298,7 +7534,7 @@ Branch: REL9_0_STABLE [ce2fcc58e] 2015-02-11 11:30:11 +0100
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
@@ -7314,8 +7550,8 @@ Branch: REL9_0_STABLE [557fcfae3] 2015-04-01 20:00:07 -0300
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -7338,17 +7574,17 @@ Branch: REL9_0_STABLE [396ef6fd8] 2015-03-14 13:43:26 -0400
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
@@ -7364,7 +7600,7 @@ Branch: REL9_0_STABLE [8e70f3c40] 2015-02-10 22:38:29 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
@@ -7380,8 +7616,8 @@ Branch: REL9_1_STABLE [b0d53b2e3] 2015-02-18 11:43:00 -0500
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
@@ -7397,7 +7633,7 @@ Branch: REL9_1_STABLE [dcb467b8e] 2015-03-02 14:12:43 -0500
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -7417,7 +7653,7 @@ Branch: REL9_3_STABLE [d645273cf] 2015-03-06 13:27:46 -0500
 
     <listitem>
      <para>
-      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      Avoid possible <application>pg_dump</application> failure when concurrent sessions
       are creating and dropping temporary functions (Tom Lane)
      </para>
     </listitem>
@@ -7434,7 +7670,7 @@ Branch: REL9_0_STABLE [7a501bcbf] 2015-02-25 12:01:12 -0500
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
@@ -7448,7 +7684,7 @@ Branch: REL9_4_STABLE [70fac4844] 2015-05-01 13:03:23 -0400
     <listitem>
      <para>
       Ensure that a view's replication identity is correctly set
-      to <literal>nothing</> during dump/restore (Marko Tiikkaja)
+      to <literal>nothing</literal> during dump/restore (Marko Tiikkaja)
      </para>
 
      <para>
@@ -7472,7 +7708,7 @@ Branch: REL9_3_STABLE [4e9935979] 2015-05-16 15:16:28 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -7494,7 +7730,7 @@ Branch: REL9_0_STABLE [2194aa92b] 2015-05-16 00:10:03 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -7512,8 +7748,8 @@ Branch: REL9_0_STABLE [4ae178f60] 2015-02-11 22:06:04 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
@@ -7530,14 +7766,14 @@ Branch: REL9_0_STABLE [85dac37ee] 2015-02-11 21:02:06 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
@@ -7553,7 +7789,7 @@ Branch: REL9_0_STABLE [bf22a8e58] 2015-03-30 17:18:10 -0400
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -7571,8 +7807,8 @@ Branch: REL9_1_STABLE [d7d294f59] 2015-02-17 11:08:40 -0500
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
@@ -7589,7 +7825,7 @@ Branch: REL9_0_STABLE [40b0c10b7] 2015-03-15 23:22:03 -0400
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -7637,7 +7873,7 @@ Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -7672,12 +7908,12 @@ Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</>
-    or <quote>norwegian-bokmal</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote>
+    or <quote>norwegian-bokmal</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
   </sect2>
 
@@ -7705,15 +7941,15 @@ Branch: REL9_0_STABLE [56b970f2e] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -7733,27 +7969,27 @@ Branch: REL9_0_STABLE [9e05c5063] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -7778,12 +8014,12 @@ Branch: REL9_0_STABLE [0a3ee8a5f] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -7844,7 +8080,7 @@ Branch: REL9_0_STABLE [3a2063369] 2015-01-28 12:33:29 -0500
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -7893,20 +8129,20 @@ Branch: REL9_2_STABLE [6bf343c6e] 2015-01-16 13:10:23 +0200
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
 
      <para>
-      9.4.0 mapped the troublesome name to <quote>norwegian-bokmal</>,
+      9.4.0 mapped the troublesome name to <quote>norwegian-bokmal</quote>,
       but that turns out not to work on all Windows configurations.
-      <quote>Norwegian_Norway</> is now recommended instead.
+      <quote>Norwegian_Norway</quote> is now recommended instead.
      </para>
     </listitem>
 
@@ -7927,7 +8163,7 @@ Branch: REL9_0_STABLE [5308e085b] 2015-01-15 18:52:38 -0500
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
@@ -7956,8 +8192,8 @@ Branch: REL9_3_STABLE [54a8abc2b] 2015-01-04 15:48:29 -0300
     <listitem>
      <para>
       Fix failure to wait when a transaction tries to acquire a <literal>FOR
-      NO KEY EXCLUSIVE</> tuple lock, while multiple other transactions
-      currently hold <literal>FOR SHARE</> locks (&Aacute;lvaro Herrera)
+      NO KEY EXCLUSIVE</literal> tuple lock, while multiple other transactions
+      currently hold <literal>FOR SHARE</literal> locks (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -7970,7 +8206,7 @@ Branch: REL9_3_STABLE [939f0fb67] 2015-01-15 13:18:19 -0500
 
     <listitem>
      <para>
-      Improve performance of <command>EXPLAIN</> with large range tables
+      Improve performance of <command>EXPLAIN</command> with large range tables
       (Tom Lane)
      </para>
     </listitem>
@@ -7983,41 +8219,41 @@ Branch: REL9_4_STABLE [4cbf390d5] 2015-01-30 14:44:49 -0500
 
     <listitem>
      <para>
-      Fix <type>jsonb</> Unicode escape processing, and in consequence
-      disallow <literal>\u0000</> (Tom Lane)
+      Fix <type>jsonb</type> Unicode escape processing, and in consequence
+      disallow <literal>\u0000</literal> (Tom Lane)
      </para>
 
      <para>
-      Previously, the JSON Unicode escape <literal>\u0000</> was accepted
+      Previously, the JSON Unicode escape <literal>\u0000</literal> was accepted
       and was stored as those six characters; but that is indistinguishable
-      from what is stored for the input <literal>\\u0000</>, resulting in
+      from what is stored for the input <literal>\\u0000</literal>, resulting in
       ambiguity.  Moreover, in cases where de-escaped textual output is
-      expected, such as the <literal>-&gt;&gt;</> operator, the sequence was
-      printed as <literal>\u0000</>, which does not meet the expectation
+      expected, such as the <literal>-&gt;&gt;</literal> operator, the sequence was
+      printed as <literal>\u0000</literal>, which does not meet the expectation
       that JSON escaping would be removed.  (Consistent behavior would
-      require emitting a zero byte, but <productname>PostgreSQL</> does not
+      require emitting a zero byte, but <productname>PostgreSQL</productname> does not
       support zero bytes embedded in text strings.)  9.4.0 included an
       ill-advised attempt to improve this situation by adjusting JSON output
       conversion rules; but of course that could not fix the fundamental
       ambiguity, and it turned out to break other usages of Unicode escape
       sequences.  Revert that, and to avoid the core problem,
-      reject <literal>\u0000</> in <type>jsonb</> input.
+      reject <literal>\u0000</literal> in <type>jsonb</type> input.
      </para>
 
      <para>
-      If a <type>jsonb</> column contains a <literal>\u0000</> value stored
+      If a <type>jsonb</type> column contains a <literal>\u0000</literal> value stored
       with 9.4.0, it will henceforth read out as though it
-      were <literal>\\u0000</>, which is the other valid interpretation of
+      were <literal>\\u0000</literal>, which is the other valid interpretation of
       the data stored by 9.4.0 for this case.
      </para>
 
      <para>
-      The <type>json</> type did not have the storage-ambiguity problem, but
+      The <type>json</type> type did not have the storage-ambiguity problem, but
       it did have the problem of inconsistent de-escaped textual output.
-      Therefore <literal>\u0000</> will now also be rejected
-      in <type>json</> values when conversion to de-escaped form is
+      Therefore <literal>\u0000</literal> will now also be rejected
+      in <type>json</type> values when conversion to de-escaped form is
       required.  This change does not break the ability to
-      store <literal>\u0000</> in <type>json</> columns so long as no
+      store <literal>\u0000</literal> in <type>json</type> columns so long as no
       processing is done on the values.  This is exactly parallel to the
       cases in which non-ASCII Unicode escapes are allowed when the database
       encoding is not UTF8.
@@ -8036,14 +8272,14 @@ Branch: REL9_0_STABLE [cebb3f032] 2015-01-17 22:37:32 -0500
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -8063,7 +8299,7 @@ Branch: REL9_3_STABLE [527ff8baf] 2015-01-30 12:30:43 -0500
      </para>
 
      <para>
-      This patch fixes corner-case <quote>unexpected operator NNNN</> planner
+      This patch fixes corner-case <quote>unexpected operator NNNN</quote> planner
       errors, and improves the selectivity estimates for some other cases.
      </para>
     </listitem>
@@ -8081,7 +8317,7 @@ Branch: REL9_4_STABLE [4e241f7cd] 2014-12-30 14:53:03 +0200
      </para>
 
      <para>
-      9.4.0 could fail with <quote>index row size exceeds maximum</> errors
+      9.4.0 could fail with <quote>index row size exceeds maximum</quote> errors
       for data that previous versions would accept.
      </para>
     </listitem>
@@ -8111,7 +8347,7 @@ Branch: REL9_1_STABLE [37e0f13f2] 2015-01-29 19:37:22 +0200
     <listitem>
      <para>
       Fix possible crash when using
-      nonzero <varname>gin_fuzzy_search_limit</> (Heikki Linnakangas)
+      nonzero <varname>gin_fuzzy_search_limit</varname> (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -8139,7 +8375,7 @@ Branch: REL9_4_STABLE [b337d9657] 2015-01-15 20:52:18 +0200
     <listitem>
      <para>
       Fix incorrect replay of WAL parameter change records that report
-      changes in the <varname>wal_log_hints</> setting (Petr Jelinek)
+      changes in the <varname>wal_log_hints</varname> setting (Petr Jelinek)
      </para>
     </listitem>
 
@@ -8155,7 +8391,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -8164,7 +8400,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -8180,7 +8416,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -8193,18 +8429,18 @@ Branch: REL9_4_STABLE [733728ff3] 2015-01-11 12:35:47 -0500
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s behavior when <filename>/etc/passwd</>
+      Fix <application>libpq</application>'s behavior when <filename>/etc/passwd</filename>
       isn't readable (Tom Lane)
      </para>
 
      <para>
-      While doing <function>PQsetdbLogin()</>, <application>libpq</>
+      While doing <function>PQsetdbLogin()</function>, <application>libpq</application>
       attempts to ascertain the user's operating system name, which on most
-      Unix platforms involves reading <filename>/etc/passwd</>.  As of 9.4,
+      Unix platforms involves reading <filename>/etc/passwd</filename>.  As of 9.4,
       failure to do that was treated as a hard error.  Restore the previous
       behavior, which was to fail only if the application does not provide a
       database role name to connect as.  This supports operation in chroot
-      environments that lack an <filename>/etc/passwd</> file.
+      environments that lack an <filename>/etc/passwd</filename> file.
      </para>
     </listitem>
 
@@ -8220,17 +8456,17 @@ Branch: REL9_0_STABLE [2600e4436] 2014-12-31 12:17:12 -0500
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -8245,7 +8481,7 @@ Branch: REL9_3_STABLE [bb1e2426b] 2015-01-05 19:27:09 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle comments on event triggers
+      Fix <application>pg_dump</application> to handle comments on event triggers
       without failing (Tom Lane)
      </para>
     </listitem>
@@ -8259,8 +8495,8 @@ Branch: REL9_3_STABLE [cc609c46f] 2015-01-30 09:01:36 -0600
 
     <listitem>
      <para>
-      Allow parallel <application>pg_dump</> to
-      use <option>--serializable-deferrable</> (Kevin Grittner)
+      Allow parallel <application>pg_dump</application> to
+      use <option>--serializable-deferrable</option> (Kevin Grittner)
      </para>
     </listitem>
 
@@ -8275,7 +8511,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
@@ -8293,12 +8529,12 @@ Branch: REL9_0_STABLE [dc9a506e6] 2015-01-29 20:18:46 -0500
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
@@ -8392,14 +8628,14 @@ Branch: REL9_4_STABLE [adb355106] 2015-01-14 11:08:17 -0500
 
     <listitem>
      <para>
-      Allow <varname>CFLAGS</> from <application>configure</>'s environment
-      to override automatically-supplied <varname>CFLAGS</> (Tom Lane)
+      Allow <varname>CFLAGS</varname> from <application>configure</application>'s environment
+      to override automatically-supplied <varname>CFLAGS</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <application>configure</> would add any switches that it
+      Previously, <application>configure</application> would add any switches that it
       chose of its own accord to the end of the
-      user-specified <varname>CFLAGS</> string.  Since most compilers
+      user-specified <varname>CFLAGS</varname> string.  Since most compilers
       process switches left-to-right, this meant that configure's choices
       would override the user-specified flags in case of conflicts.  That
       should work the other way around, so adjust the logic to put the
@@ -8419,13 +8655,13 @@ Branch: REL9_0_STABLE [338ff75fc] 2015-01-19 23:44:33 -0500
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -8451,7 +8687,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a
+      Update time zone data files to <application>tzdata</application> release 2015a
       for DST law changes in Chile and Mexico, plus historical changes in
       Iceland.
      </para>
@@ -8474,7 +8710,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.4 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.4 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -8483,35 +8719,35 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-       Add <link linkend="datatype-json"><type>jsonb</></link>, a more
-       capable and efficient data type for storing <acronym>JSON</> data
+       Add <link linkend="datatype-json"><type>jsonb</type></link>, a more
+       capable and efficient data type for storing <acronym>JSON</acronym> data
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new <acronym>SQL</> command <xref linkend="SQL-ALTERSYSTEM">
-       for changing <filename>postgresql.conf</> configuration file entries
+       Add new <acronym>SQL</acronym> command <xref linkend="sql-altersystem">
+       for changing <filename>postgresql.conf</filename> configuration file entries
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Reduce lock strength for some <xref linkend="SQL-ALTERTABLE">
+       Reduce lock strength for some <xref linkend="sql-altertable">
        commands
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <link linkend="rules-materializedviews">materialized views</>
+       Allow <link linkend="rules-materializedviews">materialized views</link>
        to be refreshed without blocking concurrent reads
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <link linkend="logicaldecoding">logical decoding</>
+       Add support for <link linkend="logicaldecoding">logical decoding</link>
        of WAL data, to allow database changes to be streamed out in a
        customizable format
       </para>
@@ -8519,7 +8755,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-        Allow <link linkend="bgworker">background worker processes</>
+        Allow <link linkend="bgworker">background worker processes</link>
         to be dynamically registered, started and terminated
       </para>
      </listitem>
@@ -8558,14 +8794,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       Previously, an input array string that started with a single-element
       sub-array could later contain multi-element sub-arrays,
-      e.g. <literal>'{{1}, {2,3}}'::int[]</> would be accepted.
+      e.g. <literal>'{{1}, {2,3}}'::int[]</literal> would be accepted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When converting values of type <type>date</>, <type>timestamp</>
-      or <type>timestamptz</>
+      When converting values of type <type>date</type>, <type>timestamp</type>
+      or <type>timestamptz</type>
       to <link linkend="datatype-json"><type>JSON</type></link>, render the
       values in a format compliant with ISO 8601 (Andrew Dunstan)
      </para>
@@ -8575,7 +8811,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <xref linkend="guc-datestyle"> setting; but many JSON processors
       require timestamps to be in ISO 8601 format.  If necessary, the
       previous behavior can be obtained by explicitly casting the datetime
-      value to <type>text</> before passing it to the JSON conversion
+      value to <type>text</type> before passing it to the JSON conversion
       function.
      </para>
     </listitem>
@@ -8583,15 +8819,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       The <link linkend="functions-json-op-table"><type>json</type>
-      <literal>#&gt;</> <type>text[]</></link> path extraction operator now
+      <literal>#&gt;</literal> <type>text[]</type></link> path extraction operator now
       returns its lefthand input, not NULL, if the array is empty (Tom Lane)
      </para>
 
      <para>
       This is consistent with the notion that this represents zero
       applications of the simple field/element extraction
-      operator <literal>-&gt;</>.  Similarly, <type>json</type>
-      <literal>#&gt;&gt;</> <type>text[]</> with an empty array merely
+      operator <literal>-&gt;</literal>.  Similarly, <type>json</type>
+      <literal>#&gt;&gt;</literal> <type>text[]</type> with an empty array merely
       coerces its lefthand input to text.
      </para>
     </listitem>
@@ -8616,26 +8852,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Cause consecutive whitespace in <link
-      linkend="functions-formatting-table"><function>to_timestamp()</></link>
-      and <function>to_date()</> format strings to consume a corresponding
+      linkend="functions-formatting-table"><function>to_timestamp()</function></link>
+      and <function>to_date()</function> format strings to consume a corresponding
       number of characters in the input string (whitespace or not), then
-      conditionally consume adjacent whitespace, if not in <literal>FX</>
+      conditionally consume adjacent whitespace, if not in <literal>FX</literal>
       mode (Jeevan Chalke)
      </para>
 
      <para>
-      Previously, consecutive whitespace characters in a non-<literal>FX</>
+      Previously, consecutive whitespace characters in a non-<literal>FX</literal>
       format string behaved like a single whitespace character and consumed
       all adjacent whitespace in the input string.  For example, previously
       a format string of three spaces would consume only the first space in
-      <literal>' 12'</>, but it will now consume all three characters.
+      <literal>' 12'</literal>, but it will now consume all three characters.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix <link
-      linkend="textsearch-functions-table"><function>ts_rank_cd()</></link>
+      linkend="textsearch-functions-table"><function>ts_rank_cd()</function></link>
       to ignore stripped lexemes (Alex Hill)
      </para>
 
@@ -8649,15 +8885,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       For functions declared to
       take <link linkend="xfunc-sql-variadic-functions"><literal>VARIADIC
-      "any"</></link>, an actual parameter marked as <literal>VARIADIC</>
+      "any"</literal></link>, an actual parameter marked as <literal>VARIADIC</literal>
       must be of a determinable array type (Pavel Stehule)
      </para>
 
      <para>
       Such parameters can no longer be written as an undecorated string
-      literal or <literal>NULL</>; a cast to an appropriate array data type
+      literal or <literal>NULL</literal>; a cast to an appropriate array data type
       will now be required.  Note that this does not affect parameters not
-      marked <literal>VARIADIC</>.
+      marked <literal>VARIADIC</literal>.
      </para>
     </listitem>
 
@@ -8669,8 +8905,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </para>
 
      <para>
-      Constructs like <literal>row_to_json(tab.*)</> now always emit column
-      names that match the column aliases visible for table <literal>tab</>
+      Constructs like <literal>row_to_json(tab.*)</literal> now always emit column
+      names that match the column aliases visible for table <literal>tab</literal>
       at the point of the call.  In previous releases the emitted column
       names would sometimes be the table's actual column names regardless
       of any aliases assigned in the query.
@@ -8686,8 +8922,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      Rename <link linkend="SQL-EXPLAIN"><command>EXPLAIN
-      ANALYZE</></link>'s <quote>total runtime</quote> output
+      Rename <link linkend="sql-explain"><command>EXPLAIN
+      ANALYZE</command></link>'s <quote>total runtime</quote> output
       to <quote>execution time</quote> (Tom Lane)
      </para>
 
@@ -8699,15 +8935,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      <link linkend="SQL-SHOW"><command>SHOW TIME ZONE</></link> now
-      outputs simple numeric UTC offsets in <acronym>POSIX</> timezone
+      <link linkend="sql-show"><command>SHOW TIME ZONE</command></link> now
+      outputs simple numeric UTC offsets in <acronym>POSIX</acronym> timezone
       format (Tom Lane)
      </para>
 
      <para>
       Previously, such timezone settings were displayed as <link
-      linkend="datatype-interval-output"><type>interval</></link> values.
-      The new output is properly interpreted by <command>SET TIME ZONE</>
+      linkend="datatype-interval-output"><type>interval</type></link> values.
+      The new output is properly interpreted by <command>SET TIME ZONE</command>
       when passed as a simple string, whereas the old output required
       special treatment to be re-parsed correctly.
      </para>
@@ -8716,25 +8952,25 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Foreign data wrappers that support updating foreign tables must
-      consider the possible presence of <literal>AFTER ROW</> triggers
+      consider the possible presence of <literal>AFTER ROW</literal> triggers
       (Noah Misch)
      </para>
 
      <para>
-      When an <literal>AFTER ROW</> trigger is present, all columns of the
+      When an <literal>AFTER ROW</literal> trigger is present, all columns of the
       table must be returned by updating actions, since the trigger might
       inspect any or all of them.  Previously, foreign tables never had
       triggers, so the FDW might optimize away fetching columns not mentioned
-      in the <literal>RETURNING</> clause (if any).
+      in the <literal>RETURNING</literal> clause (if any).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Prevent <link
-      linkend="ddl-constraints-check-constraints"><literal>CHECK</></link>
+      linkend="ddl-constraints-check-constraints"><literal>CHECK</literal></link>
       constraints from referencing system columns, except
-      <structfield>tableoid</> (Amit Kapila)
+      <structfield>tableoid</structfield> (Amit Kapila)
      </para>
 
      <para>
@@ -8752,7 +8988,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <para>
       Previously, there was an undocumented precedence order among
-      the <literal>recovery_target_<replaceable>xxx</></literal> parameters.
+      the <literal>recovery_target_<replaceable>xxx</replaceable></literal> parameters.
      </para>
     </listitem>
 
@@ -8766,14 +9002,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       User commands that did their own quote preservation might need
       adjustment.  This is likely to be an issue for commands used in
       <xref linkend="guc-archive-command">, <xref linkend="restore-command">,
-      and <link linkend="sql-copy"><command>COPY TO/FROM PROGRAM</></link>.
+      and <link linkend="sql-copy"><command>COPY TO/FROM PROGRAM</command></link>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove catalog column <link
-      linkend="catalog-pg-class"><structfield>pg_class.reltoastidxid</></link>
+      linkend="catalog-pg-class"><structfield>pg_class.reltoastidxid</structfield></link>
       (Michael Paquier)
      </para>
     </listitem>
@@ -8781,33 +9017,33 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Remove catalog column <link
-      linkend="catalog-pg-rewrite"><structfield>pg_rewrite.ev_attr</></link>
+      linkend="catalog-pg-rewrite"><structfield>pg_rewrite.ev_attr</structfield></link>
       (Kevin Grittner)
      </para>
 
      <para>
       Per-column rules have not been supported since
-      <application>PostgreSQL</> 7.3.
+      <application>PostgreSQL</application> 7.3.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove native support for <application>Kerberos</> authentication
-      (<option>--with-krb5</>, etc)
+      Remove native support for <application>Kerberos</application> authentication
+      (<option>--with-krb5</option>, etc)
       (Magnus Hagander)
      </para>
 
      <para>
-      The supported way to use <application>Kerberos</> authentication is
-      with <acronym>GSSAPI</>.  The native code has been deprecated since
-      <productname>PostgreSQL</> 8.3.
+      The supported way to use <application>Kerberos</application> authentication is
+      with <acronym>GSSAPI</acronym>.  The native code has been deprecated since
+      <productname>PostgreSQL</productname> 8.3.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>PL/Python</>, handle domains over arrays like the
+      In <application>PL/Python</application>, handle domains over arrays like the
       underlying array type (Rodolfo Campero)
      </para>
 
@@ -8819,9 +9055,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Make libpq's <link
-      linkend="libpq-pqconnectdbparams"><function>PQconnectdbParams()</></link>
+      linkend="libpq-pqconnectdbparams"><function>PQconnectdbParams()</function></link>
       and <link
-      linkend="libpq-pqpingparams"><function>PQpingParams()</></link>
+      linkend="libpq-pqpingparams"><function>PQpingParams()</function></link>
       functions process zero-length strings as defaults (Adrian
       Vondendriesch)
      </para>
@@ -8841,20 +9077,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       Previously, empty arrays were returned as zero-length one-dimensional
       arrays, whose text representation looked the same as zero-dimensional
-      arrays (<literal>{}</>), but they acted differently in array
-      operations.  <application>intarray</>'s behavior in this area now
+      arrays (<literal>{}</literal>), but they acted differently in array
+      operations.  <application>intarray</application>'s behavior in this area now
       matches the built-in array operators.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <xref linkend="pgupgrade"> now uses <option>-U</>
-      or <option>--username</> to specify the user name (Bruce Momjian)
+      <xref linkend="pgupgrade"> now uses <option>-U</option>
+      or <option>--username</option> to specify the user name (Bruce Momjian)
      </para>
 
      <para>
-      Previously this option was spelled <option>-u</> or <option>--user</>,
+      Previously this option was spelled <option>-u</option> or <option>--user</option>,
       but that was inconsistent with other tools.
      </para>
     </listitem>
@@ -8884,7 +9120,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        The new <filename>worker_spi</> module shows an example of use
+        The new <filename>worker_spi</filename> module shows an example of use
         of this feature.
        </para>
       </listitem>
@@ -8904,7 +9140,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         During crash recovery or immediate shutdown, send uncatchable
-        termination signals (<systemitem>SIGKILL</>) to child processes
+        termination signals (<systemitem>SIGKILL</systemitem>) to child processes
         that do not shut down promptly (MauMau, &Aacute;lvaro Herrera)
        </para>
 
@@ -8912,7 +9148,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
         This reduces the likelihood of leaving orphaned child processes
         behind after <xref linkend="app-postmaster"> shutdown, as well
         as ensuring that crash recovery can proceed if some child processes
-        have become <quote>stuck</>.
+        have become <quote>stuck</quote>.
        </para>
       </listitem>
 
@@ -8924,7 +9160,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <xref linkend="SQL-VACUUM"> properly report dead but
+        Make <xref linkend="sql-vacuum"> properly report dead but
         not-yet-removable rows to the statistics collector (Hari Babu)
        </para>
 
@@ -8942,14 +9178,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Reduce <link linkend="GIN"><acronym>GIN</></link> index size
+        Reduce <link linkend="gin"><acronym>GIN</acronym></link> index size
         (Alexander Korotkov, Heikki Linnakangas)
        </para>
 
        <para>
         Indexes upgraded via <xref linkend="pgupgrade"> will work fine
-        but will still be in the old, larger <acronym>GIN</> format.
-        Use <xref linkend="SQL-REINDEX"> to recreate old GIN indexes in the
+        but will still be in the old, larger <acronym>GIN</acronym> format.
+        Use <xref linkend="sql-reindex"> to recreate old GIN indexes in the
         new format.
        </para>
       </listitem>
@@ -8957,16 +9193,16 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of multi-key <link
-        linkend="GIN"><acronym>GIN</></link> lookups (Alexander Korotkov,
+        linkend="gin"><acronym>GIN</acronym></link> lookups (Alexander Korotkov,
         Heikki Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="GiST"><acronym>GiST</></link> index support
-        for <link linkend="datatype-inet"><type>inet</></link> and
-        <link linkend="datatype-cidr"><type>cidr</></link> data types
+        Add <link linkend="gist"><acronym>GiST</acronym></link> index support
+        for <link linkend="datatype-inet"><type>inet</type></link> and
+        <link linkend="datatype-cidr"><type>cidr</type></link> data types
         (Emre Hasegeli)
        </para>
 
@@ -9002,7 +9238,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow multiple backends to insert
-        into <link linkend="wal"><acronym>WAL</></link> buffers
+        into <link linkend="wal"><acronym>WAL</acronym></link> buffers
         concurrently (Heikki Linnakangas)
        </para>
 
@@ -9014,7 +9250,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Conditionally write only the modified portion of updated rows to
-        <link linkend="wal"><acronym>WAL</></link> (Amit Kapila)
+        <link linkend="wal"><acronym>WAL</acronym></link> (Amit Kapila)
        </para>
       </listitem>
 
@@ -9029,7 +9265,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of aggregates that
-        use <link linkend="datatype-numeric"><type>numeric</></link> state
+        use <link linkend="datatype-numeric"><type>numeric</type></link> state
         values (Hadi Moshayedi)
        </para>
       </listitem>
@@ -9038,8 +9274,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Attempt to <link linkend="vacuum-for-wraparound">freeze</link>
         tuples when tables are rewritten with <xref
-        linkend="SQL-CLUSTER"> or <link
-        linkend="SQL-VACUUM"><command>VACUUM FULL</></link> (Robert Haas,
+        linkend="sql-cluster"> or <link
+        linkend="sql-vacuum"><command>VACUUM FULL</command></link> (Robert Haas,
         Andres Freund)
        </para>
 
@@ -9050,8 +9286,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve speed of <xref linkend="SQL-COPY"> with default <link
-        linkend="functions-sequence-table"><function>nextval()</></link>
+        Improve speed of <xref linkend="sql-copy"> with default <link
+        linkend="functions-sequence-table"><function>nextval()</function></link>
         columns (Simon Riggs)
        </para>
       </listitem>
@@ -9059,7 +9295,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of accessing many different <link
-        linkend="SQL-CREATESEQUENCE">sequences</link> in the same session
+        linkend="sql-createsequence">sequences</link> in the same session
         (David Rowley)
        </para>
       </listitem>
@@ -9073,26 +9309,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Reduce memory allocated by <application>PL/pgSQL</>
-        <xref linkend="SQL-DO"> blocks (Tom Lane)
+        Reduce memory allocated by <application>PL/pgSQL</application>
+        <xref linkend="sql-do"> blocks (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make the planner more aggressive about extracting restriction clauses
-        from mixed <literal>AND</>/<literal>OR</> clauses (Tom Lane)
+        from mixed <literal>AND</literal>/<literal>OR</literal> clauses (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Disallow pushing volatile <literal>WHERE</> clauses down
-        into <literal>DISTINCT</> subqueries (Tom Lane)
+        Disallow pushing volatile <literal>WHERE</literal> clauses down
+        into <literal>DISTINCT</literal> subqueries (Tom Lane)
        </para>
 
        <para>
-        Pushing down a <literal>WHERE</> clause can produce a more
+        Pushing down a <literal>WHERE</literal> clause can produce a more
         efficient plan overall, but at the cost of evaluating the clause
         more often than is implied by the text of the query; so don't do it
         if the clause contains any volatile functions.
@@ -9122,14 +9358,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <xref linkend="pg-stat-archiver-view"> system view to
-        report <link linkend="wal"><acronym>WAL</></link> archiver activity
+        report <link linkend="wal"><acronym>WAL</acronym></link> archiver activity
         (Gabriele Bartolini)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <structfield>n_mod_since_analyze</> columns to
+        Add <structfield>n_mod_since_analyze</structfield> columns to
         <xref linkend="pg-stat-all-tables-view"> and related system views
         (Mark Kirkwood)
        </para>
@@ -9143,9 +9379,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <structfield>backend_xid</> and <structfield>backend_xmin</>
+        Add <structfield>backend_xid</structfield> and <structfield>backend_xmin</structfield>
         columns to the system view <xref linkend="pg-stat-activity-view">,
-        and a <structfield>backend_xmin</> column to
+        and a <structfield>backend_xmin</structfield> column to
         <xref linkend="pg-stat-replication-view"> (Christian Kruse)
        </para>
       </listitem>
@@ -9155,22 +9391,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><acronym>SSL</></title>
+     <title><acronym>SSL</acronym></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add support for <acronym>SSL</> <acronym>ECDH</> key exchange
+        Add support for <acronym>SSL</acronym> <acronym>ECDH</acronym> key exchange
         (Marko Kreen)
        </para>
 
        <para>
         This allows use of Elliptic Curve keys for server authentication.
-        Such keys are faster and have better security than <acronym>RSA</>
+        Such keys are faster and have better security than <acronym>RSA</acronym>
         keys. The new configuration parameter
         <xref linkend="guc-ssl-ecdh-curve">
-        controls which curve is used for <acronym>ECDH</>.
+        controls which curve is used for <acronym>ECDH</acronym>.
        </para>
       </listitem>
 
@@ -9184,14 +9420,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         By default, the server not the client now controls the preference
-        order of <acronym>SSL</> ciphers
+        order of <acronym>SSL</acronym> ciphers
         (Marko Kreen)
        </para>
 
        <para>
         Previously, the order specified by <xref linkend="guc-ssl-ciphers">
         was usually ignored in favor of client-side defaults, which are not
-        configurable in most <productname>PostgreSQL</> clients.  If
+        configurable in most <productname>PostgreSQL</productname> clients.  If
         desired, the old behavior can be restored via the new configuration
         parameter <xref linkend="guc-ssl-prefer-server-ciphers">.
        </para>
@@ -9199,14 +9435,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <xref linkend="guc-log-connections"> show <acronym>SSL</>
+        Make <xref linkend="guc-log-connections"> show <acronym>SSL</acronym>
         encryption information (Andreas Kunert)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <acronym>SSL</> renegotiation handling (&Aacute;lvaro
+        Improve <acronym>SSL</acronym> renegotiation handling (&Aacute;lvaro
         Herrera)
        </para>
       </listitem>
@@ -9222,14 +9458,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add new <acronym>SQL</> command <xref linkend="SQL-ALTERSYSTEM">
-        for changing <filename>postgresql.conf</> configuration file entries
+        Add new <acronym>SQL</acronym> command <xref linkend="sql-altersystem">
+        for changing <filename>postgresql.conf</filename> configuration file entries
         (Amit Kapila)
        </para>
 
        <para>
         Previously such settings could only be changed by manually
-        editing <filename>postgresql.conf</>.
+        editing <filename>postgresql.conf</filename>.
        </para>
       </listitem>
 
@@ -9274,7 +9510,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         In contrast to <xref linkend="guc-local-preload-libraries">, this
         parameter can load any shared library, not just those in
-        the <filename>$libdir/plugins</> directory.
+        the <filename>$libdir/plugins</filename> directory.
        </para>
       </listitem>
 
@@ -9287,7 +9523,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Hint bit changes are not normally logged, except when checksums are
         enabled.  This is useful for external tools
-        like <application>pg_rewind</>.
+        like <application>pg_rewind</application>.
        </para>
       </listitem>
 
@@ -9320,14 +9556,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow terabyte units (<literal>TB</>) to be used when specifying
+        Allow terabyte units (<literal>TB</literal>) to be used when specifying
         configuration variable values (Simon Riggs)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show <acronym>PID</>s of lock holders and waiters and improve
+        Show <acronym>PID</acronym>s of lock holders and waiters and improve
         information about relations in <xref linkend="guc-log-lock-waits">
         log messages (Christian Kruse)
        </para>
@@ -9340,14 +9576,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        The previous level was <literal>LOG</>, which was too verbose
+        The previous level was <literal>LOG</literal>, which was too verbose
         for libraries loaded per-session.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        On Windows, make <literal>SQL_ASCII</>-encoded databases and server
+        On Windows, make <literal>SQL_ASCII</literal>-encoded databases and server
         processes (e.g., <xref linkend="app-postmaster">) emit messages in
         the character encoding of the server's Windows user locale
         (Alexander Law, Noah Misch)
@@ -9355,7 +9591,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         Previously these messages were output in the Windows
-        <acronym>ANSI</> code page.
+        <acronym>ANSI</acronym> code page.
        </para>
       </listitem>
 
@@ -9379,7 +9615,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         Replication slots allow preservation of resources like
-        <acronym>WAL</> files on the primary until they are no longer
+        <acronym>WAL</acronym> files on the primary until they are no longer
         needed by standby servers.
        </para>
       </listitem>
@@ -9400,8 +9636,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <xref linkend="recovery-target">
-        option <option>immediate</> to stop <link
-        linkend="wal"><acronym>WAL</></link> recovery as soon as a
+        option <option>immediate</option> to stop <link
+        linkend="wal"><acronym>WAL</acronym></link> recovery as soon as a
         consistent state is reached (MauMau, Heikki Linnakangas)
        </para>
       </listitem>
@@ -9413,7 +9649,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         The timestamp reported
-        by <link linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</></link>
+        by <link linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</function></link>
         now reflects already-committed records, not transactions about to
         be committed. Recovering to a restore point now replays the restore
         point, rather than stopping just before the restore point.
@@ -9423,34 +9659,34 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         <link
-        linkend="functions-admin-backup-table"><function>pg_switch_xlog()</></link>
-        now clears any unused trailing space in the old <acronym>WAL</> file
+        linkend="functions-admin-backup-table"><function>pg_switch_xlog()</function></link>
+        now clears any unused trailing space in the old <acronym>WAL</acronym> file
         (Heikki Linnakangas)
        </para>
 
        <para>
-        This improves the compression ratio for <acronym>WAL</> files.
+        This improves the compression ratio for <acronym>WAL</acronym> files.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Report failure return codes from <link
-        linkend="archive-recovery-settings">external recovery commands</>
+        linkend="archive-recovery-settings">external recovery commands</link>
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Reduce spinlock contention during <acronym>WAL</> replay (Heikki
+        Reduce spinlock contention during <acronym>WAL</acronym> replay (Heikki
         Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Write <acronym>WAL</> records of running transactions more
+        Write <acronym>WAL</acronym> records of running transactions more
         frequently (Andres Freund)
        </para>
 
@@ -9463,12 +9699,12 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </itemizedlist>
 
      <sect4>
-      <title><link linkend="logicaldecoding">Logical Decoding</></title>
+      <title><link linkend="logicaldecoding">Logical Decoding</link></title>
 
       <para>
        Logical decoding allows database changes to be streamed in a
        configurable format. The data is read from
-       the <link linkend="wal"><acronym>WAL</></link> and transformed into the
+       the <link linkend="wal"><acronym>WAL</acronym></link> and transformed into the
        desired target format. To implement this feature, the following changes
        were made:
       </para>
@@ -9477,7 +9713,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Add support for <link linkend="logicaldecoding">logical decoding</>
+         Add support for <link linkend="logicaldecoding">logical decoding</link>
          of WAL data, to allow database changes to be streamed out in a
          customizable format
          (Andres Freund)
@@ -9486,8 +9722,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Add new <xref linkend="guc-wal-level"> setting <option>logical</>
-         to enable logical change-set encoding in <acronym>WAL</> (Andres
+         Add new <xref linkend="guc-wal-level"> setting <option>logical</option>
+         to enable logical change-set encoding in <acronym>WAL</acronym> (Andres
          Freund)
         </para>
        </listitem>
@@ -9495,7 +9731,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <listitem>
         <para>
          Add table-level parameter <link
-         linkend="catalog-pg-class"><literal>REPLICA IDENTITY</></link>
+         linkend="catalog-pg-class"><literal>REPLICA IDENTITY</literal></link>
          to control logical replication (Andres Freund)
         </para>
        </listitem>
@@ -9503,7 +9739,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <listitem>
         <para>
          Add relation option <link
-         linkend="SQL-CREATETABLE-storage-parameters"><option>user_catalog_table</></link>
+         linkend="sql-createtable-storage-parameters"><option>user_catalog_table</option></link>
          to identify user-created tables involved in logical change-set
          encoding (Andres Freund)
         </para>
@@ -9519,7 +9755,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <listitem>
         <para>
          Add <xref linkend="test-decoding"> module to illustrate logical
-         decoding at the <acronym>SQL</> level (Andres Freund)
+         decoding at the <acronym>SQL</acronym> level (Andres Freund)
         </para>
        </listitem>
 
@@ -9537,28 +9773,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link linkend="queries-tablefunctions"><literal>WITH
-        ORDINALITY</></link> syntax to number the rows returned from a
-        set-returning function in the <literal>FROM</> clause
+        ORDINALITY</literal></link> syntax to number the rows returned from a
+        set-returning function in the <literal>FROM</literal> clause
         (Andrew Gierth, David Fetter)
        </para>
 
        <para>
         This is particularly useful for functions like
-        <function>unnest()</>.
+        <function>unnest()</function>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add <link linkend="queries-tablefunctions"><literal>ROWS
-        FROM()</></link> syntax to allow horizontal concatenation of
-        set-returning functions in the <literal>FROM</> clause (Andrew Gierth)
+        FROM()</literal></link> syntax to allow horizontal concatenation of
+        set-returning functions in the <literal>FROM</literal> clause (Andrew Gierth)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <xref linkend="SQL-SELECT"> to have
+        Allow <xref linkend="sql-select"> to have
         an empty target list (Tom Lane)
        </para>
 
@@ -9570,8 +9806,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Ensure that <link linkend="SQL-SELECT"><literal>SELECT ... FOR UPDATE
-        NOWAIT</></link> does not wait in corner cases involving
+        Ensure that <link linkend="sql-select"><literal>SELECT ... FOR UPDATE
+        NOWAIT</literal></link> does not wait in corner cases involving
         already-concurrently-updated tuples (Craig Ringer and Thomas Munro)
        </para>
       </listitem>
@@ -9587,22 +9823,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <link linkend="SQL-DISCARD"><command>DISCARD
-        SEQUENCES</></link> command to discard cached sequence-related state
+        Add <link linkend="sql-discard"><command>DISCARD
+        SEQUENCES</command></link> command to discard cached sequence-related state
         (Fabr&iacute;zio de Royes Mello, Robert Haas)
        </para>
 
        <para>
-        <command>DISCARD ALL</> will now also discard such information.
+        <command>DISCARD ALL</command> will now also discard such information.
        </para>
       </listitem>
 
        <listitem>
         <para>
-         Add <literal>FORCE NULL</> option
-         to <link linkend="SQL-COPY"><command>COPY FROM</></link>, which
+         Add <literal>FORCE NULL</literal> option
+         to <link linkend="sql-copy"><command>COPY FROM</command></link>, which
          causes quoted strings matching the specified null string to be
-         converted to NULLs in <literal>CSV</> mode (Ian Barwick, Michael
+         converted to NULLs in <literal>CSV</literal> mode (Ian Barwick, Michael
          Paquier)
         </para>
 
@@ -9620,35 +9856,35 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         New warnings are issued for <command>SET
-        LOCAL</>, <command>SET CONSTRAINTS</>, <command>SET TRANSACTION</> and
-        <command>ABORT</> when used outside a transaction block.
+        LOCAL</command>, <command>SET CONSTRAINTS</command>, <command>SET TRANSACTION</command> and
+        <command>ABORT</command> when used outside a transaction block.
        </para>
       </listitem>
 
      </itemizedlist>
 
      <sect4>
-      <title><xref linkend="SQL-EXPLAIN"></title>
+      <title><xref linkend="sql-explain"></title>
 
       <itemizedlist>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN ANALYZE</> show planning time (Andreas
+         Make <command>EXPLAIN ANALYZE</command> show planning time (Andreas
          Karlsson)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN</> show the grouping columns in Agg and
+         Make <command>EXPLAIN</command> show the grouping columns in Agg and
          Group nodes (Tom Lane)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN ANALYZE</> show exact and lossy
+         Make <command>EXPLAIN ANALYZE</command> show exact and lossy
          block counts in bitmap heap scans (Etsuro Fujita)
         </para>
        </listitem>
@@ -9664,22 +9900,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow a <link linkend="rules-materializedviews">materialized view</>
+        Allow a <link linkend="rules-materializedviews">materialized view</link>
         to be refreshed without blocking other sessions from reading the view
         meanwhile (Kevin Grittner)
        </para>
 
        <para>
         This is done with <link
-        linkend="SQL-REFRESHMATERIALIZEDVIEW"><command>REFRESH MATERIALIZED
-        VIEW CONCURRENTLY</></link>.
+        linkend="sql-refreshmaterializedview"><command>REFRESH MATERIALIZED
+        VIEW CONCURRENTLY</command></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow views to be <link
-        linkend="SQL-CREATEVIEW-updatable-views">automatically
+        linkend="sql-createview-updatable-views">automatically
         updated</link> even if they contain some non-updatable columns
         (Dean Rasheed)
        </para>
@@ -9687,28 +9923,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Previously the presence of non-updatable output columns such as
         expressions, literals, and function calls prevented automatic
-        updates.  Now <command>INSERT</>s, <command>UPDATE</>s and
-        <command>DELETE</>s are supported, provided that they do not
+        updates.  Now <command>INSERT</command>s, <command>UPDATE</command>s and
+        <command>DELETE</command>s are supported, provided that they do not
         attempt to assign new values to any of the non-updatable columns.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow control over whether <command>INSERT</>s and
-        <command>UPDATE</>s can add rows to an auto-updatable view that
+        Allow control over whether <command>INSERT</command>s and
+        <command>UPDATE</command>s can add rows to an auto-updatable view that
         would not appear in the view (Dean Rasheed)
        </para>
 
        <para>
-        This is controlled with the new <xref linkend="SQL-CREATEVIEW">
-        clause <literal>WITH CHECK OPTION</>.
+        This is controlled with the new <xref linkend="sql-createview">
+        clause <literal>WITH CHECK OPTION</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="rules-privileges">security barrier views</>
+        Allow <link linkend="rules-privileges">security barrier views</link>
         to be automatically updatable (Dean Rasheed)
        </para>
       </listitem>
@@ -9726,60 +9962,60 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Support triggers on <link linkend="SQL-CREATEFOREIGNTABLE">foreign
-        tables</> (Ronan Dunklau)
+        Support triggers on <link linkend="sql-createforeigntable">foreign
+        tables</link> (Ronan Dunklau)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow moving groups of objects from one tablespace to another
-        using the <literal>ALL IN TABLESPACE ... SET TABLESPACE</> form of
-        <xref linkend="SQL-ALTERTABLE">, <xref linkend="SQL-ALTERINDEX">, or
-        <xref linkend="SQL-ALTERMATERIALIZEDVIEW"> (Stephen Frost)
+        using the <literal>ALL IN TABLESPACE ... SET TABLESPACE</literal> form of
+        <xref linkend="sql-altertable">, <xref linkend="sql-alterindex">, or
+        <xref linkend="sql-altermaterializedview"> (Stephen Frost)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow changing foreign key constraint deferrability
-        via <xref linkend="SQL-ALTERTABLE"> ... <literal>ALTER
-        CONSTRAINT</> (Simon Riggs)
+        via <xref linkend="sql-altertable"> ... <literal>ALTER
+        CONSTRAINT</literal> (Simon Riggs)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Reduce lock strength for some <xref linkend="SQL-ALTERTABLE">
+        Reduce lock strength for some <xref linkend="sql-altertable">
         commands
         (Simon Riggs, Noah Misch, Robert Haas)
        </para>
 
        <para>
-        Specifically, <literal>VALIDATE CONSTRAINT</>, <literal>CLUSTER
-        ON</>, <literal>SET WITHOUT CLUSTER</>, <literal>ALTER COLUMN
-        SET STATISTICS</>, <literal>ALTER COLUMN</> <literal>SET</>
-        <option>(attribute_option)</>, <literal>ALTER COLUMN RESET</>
-        <option>(attribute_option)</> no longer require <literal>ACCESS
-        EXCLUSIVE</> locks.
+        Specifically, <literal>VALIDATE CONSTRAINT</literal>, <literal>CLUSTER
+        ON</literal>, <literal>SET WITHOUT CLUSTER</literal>, <literal>ALTER COLUMN
+        SET STATISTICS</literal>, <literal>ALTER COLUMN</literal> <literal>SET</literal>
+        <option>(attribute_option)</option>, <literal>ALTER COLUMN RESET</literal>
+        <option>(attribute_option)</option> no longer require <literal>ACCESS
+        EXCLUSIVE</literal> locks.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow tablespace options to be set
-        in <xref linkend="SQL-CREATETABLESPACE"> (Vik Fearing)
+        in <xref linkend="sql-createtablespace"> (Vik Fearing)
        </para>
 
        <para>
         Formerly these options could only be set
-        via <xref linkend="SQL-ALTERTABLESPACE">.
+        via <xref linkend="sql-altertablespace">.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <xref linkend="SQL-CREATEAGGREGATE"> to define the estimated
+        Allow <xref linkend="sql-createaggregate"> to define the estimated
         size of the aggregate's transition state data (Hadi Moshayedi)
        </para>
 
@@ -9791,7 +10027,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Fix <command>DROP IF EXISTS</> to avoid errors for non-existent
+        Fix <command>DROP IF EXISTS</command> to avoid errors for non-existent
         objects in more cases (Pavel Stehule, Dean Rasheed)
        </para>
       </listitem>
@@ -9803,7 +10039,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        Previously, relations once moved into the <literal>pg_catalog</>
+        Previously, relations once moved into the <literal>pg_catalog</literal>
         schema could no longer be modified or dropped.
        </para>
       </listitem>
@@ -9820,14 +10056,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Fully implement the <link
-        linkend="datatype-line"><type>line</></link> data type (Peter
+        linkend="datatype-line"><type>line</type></link> data type (Peter
         Eisentraut)
        </para>
 
        <para>
-        The line <emphasis>segment</> data type (<link
-        linkend="datatype-lseg"><type>lseg</></link>) has always been
-        fully supported.  The previous <type>line</> data type (which was
+        The line <emphasis>segment</emphasis> data type (<link
+        linkend="datatype-lseg"><type>lseg</type></link>) has always been
+        fully supported.  The previous <type>line</type> data type (which was
         enabled only via a compile-time option) is not binary or
         dump-compatible with the new implementation.
        </para>
@@ -9835,17 +10071,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <link linkend="datatype-pg-lsn"><type>pg_lsn</></link>
-        data type to represent a <acronym>WAL</> log sequence number
-        (<acronym>LSN</>) (Robert Haas, Michael Paquier)
+        Add <link linkend="datatype-pg-lsn"><type>pg_lsn</type></link>
+        data type to represent a <acronym>WAL</acronym> log sequence number
+        (<acronym>LSN</acronym>) (Robert Haas, Michael Paquier)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow single-point <link
-        linkend="datatype-polygon"><type>polygon</></link>s to be converted
-        to <link linkend="datatype-circle"><type>circle</></link>s
+        linkend="datatype-polygon"><type>polygon</type></link>s to be converted
+        to <link linkend="datatype-circle"><type>circle</type></link>s
         (Bruce Momjian)
        </para>
       </listitem>
@@ -9857,31 +10093,31 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        Previously, <productname>PostgreSQL</> assumed that the UTC offset
-        associated with a time zone abbreviation (such as <literal>EST</>)
+        Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+        associated with a time zone abbreviation (such as <literal>EST</literal>)
         never changes in the usage of any particular locale.  However this
         assumption fails in the real world, so introduce the ability for a
         zone abbreviation to represent a UTC offset that sometimes changes.
         Update the zone abbreviation definition files to make use of this
         feature in timezone locales that have changed the UTC offset of their
         abbreviations since 1970 (according to the IANA timezone database).
-        In such timezones, <productname>PostgreSQL</> will now associate the
+        In such timezones, <productname>PostgreSQL</productname> will now associate the
         correct UTC offset with the abbreviation depending on the given date.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow 5+ digit years for non-<acronym>ISO</> <link
-        linkend="datatype-datetime"><type>timestamp</></link> and
-        <type>date</> strings, where appropriate (Bruce Momjian)
+        Allow 5+ digit years for non-<acronym>ISO</acronym> <link
+        linkend="datatype-datetime"><type>timestamp</type></link> and
+        <type>date</type> strings, where appropriate (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add checks for overflow/underflow of <link
-        linkend="datatype-datetime"><type>interval</></link> values
+        linkend="datatype-datetime"><type>interval</type></link> values
         (Bruce Momjian)
        </para>
       </listitem>
@@ -9889,14 +10125,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="datatype-json"><acronym>JSON</></link></title>
+     <title><link linkend="datatype-json"><acronym>JSON</acronym></link></title>
 
      <itemizedlist>
 
        <listitem>
         <para>
-         Add <link linkend="datatype-json"><type>jsonb</></link>, a more
-         capable and efficient data type for storing <acronym>JSON</> data
+         Add <link linkend="datatype-json"><type>jsonb</type></link>, a more
+         capable and efficient data type for storing <acronym>JSON</acronym> data
          (Oleg Bartunov, Teodor Sigaev, Alexander
          Korotkov, Peter Geoghegan, Andrew Dunstan)
         </para>
@@ -9904,9 +10140,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
         <para>
          This new type allows faster access to values within a JSON
          document, and faster and more useful indexing of JSON columns.
-         Scalar values in <type>jsonb</> documents are stored as appropriate
+         Scalar values in <type>jsonb</type> documents are stored as appropriate
          scalar SQL types, and the JSON document structure is pre-parsed
-         rather than being stored as text as in the original <type>json</>
+         rather than being stored as text as in the original <type>json</type>
          data type.
         </para>
        </listitem>
@@ -9919,18 +10155,18 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
         <para>
          New functions include <link
-         linkend="functions-json-processing-table"><function>json_array_elements_text()</></link>,
-         <function>json_build_array()</>, <function>json_object()</>,
-         <function>json_object_agg()</>, <function>json_to_record()</>,
-         and <function>json_to_recordset()</>.
+         linkend="functions-json-processing-table"><function>json_array_elements_text()</function></link>,
+         <function>json_build_array()</function>, <function>json_object()</function>,
+         <function>json_object_agg()</function>, <function>json_to_record()</function>,
+         and <function>json_to_recordset()</function>.
         </para>
        </listitem>
 
        <listitem>
         <para>
          Add <link
-         linkend="functions-json-processing-table"><function>json_typeof()</></link>
-         to return the data type of a <type>json</> value (Andrew Tipton)
+         linkend="functions-json-processing-table"><function>json_typeof()</function></link>
+         to return the data type of a <type>json</type> value (Andrew Tipton)
         </para>
        </listitem>
 
@@ -9948,13 +10184,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link
-        linkend="functions-datetime-delay"><function>pg_sleep_for(interval)</></link>
-        and <function>pg_sleep_until(timestamp)</> to specify
+        linkend="functions-datetime-delay"><function>pg_sleep_for(interval)</function></link>
+        and <function>pg_sleep_until(timestamp)</function> to specify
         delays more flexibly (Vik Fearing, Julien Rouhaud)
        </para>
 
        <para>
-        The existing <function>pg_sleep()</> function only supports delays
+        The existing <function>pg_sleep()</function> function only supports delays
         specified in seconds.
        </para>
       </listitem>
@@ -9962,7 +10198,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link
-        linkend="array-functions-table"><function>cardinality()</></link>
+        linkend="array-functions-table"><function>cardinality()</function></link>
         function for arrays (Marko Tiikkaja)
        </para>
 
@@ -9974,7 +10210,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <acronym>SQL</> functions to allow <link linkend="lo-funcs">large
+        Add <acronym>SQL</acronym> functions to allow <link linkend="lo-funcs">large
         object reads/writes</link> at arbitrary offsets (Pavel Stehule)
        </para>
       </listitem>
@@ -9982,7 +10218,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow <link
-        linkend="array-functions-table"><function>unnest()</></link>
+        linkend="array-functions-table"><function>unnest()</function></link>
         to take multiple arguments, which are individually unnested then
         horizontally concatenated (Andrew Gierth)
        </para>
@@ -9990,36 +10226,36 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add functions to construct <type>time</>s, <type>date</>s,
-        <type>timestamp</>s, <type>timestamptz</>s, and <type>interval</>s
+        Add functions to construct <type>time</type>s, <type>date</type>s,
+        <type>timestamp</type>s, <type>timestamptz</type>s, and <type>interval</type>s
         from individual values, rather than strings (Pavel Stehule)
        </para>
 
        <para>
-        These functions' names are prefixed with <literal>make_</>,
-        e.g. <link linkend="functions-datetime-table"><function>make_date()</></link>.
+        These functions' names are prefixed with <literal>make_</literal>,
+        e.g. <link linkend="functions-datetime-table"><function>make_date()</function></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_char()</></link>'s
-        <literal>TZ</> format specifier return a useful value for simple
+        linkend="functions-formatting-table"><function>to_char()</function></link>'s
+        <literal>TZ</literal> format specifier return a useful value for simple
         numeric time zone offsets (Tom Lane)
        </para>
 
        <para>
-        Previously, <literal>to_char(CURRENT_TIMESTAMP, 'TZ')</> returned
-        an empty string if the <literal>timezone</> was set to a constant
-        like <literal>-4</>.
+        Previously, <literal>to_char(CURRENT_TIMESTAMP, 'TZ')</literal> returned
+        an empty string if the <literal>timezone</literal> was set to a constant
+        like <literal>-4</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add timezone offset format specifier <literal>OF</> to <link
-        linkend="functions-formatting-table"><function>to_char()</></link>
+        Add timezone offset format specifier <literal>OF</literal> to <link
+        linkend="functions-formatting-table"><function>to_char()</function></link>
         (Bruce Momjian)
        </para>
       </listitem>
@@ -10027,7 +10263,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve the random seed used for <link
-        linkend="functions-math-random-table"><function>random()</></link>
+        linkend="functions-math-random-table"><function>random()</function></link>
         (Honza Horak)
        </para>
       </listitem>
@@ -10035,7 +10271,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Tighten validity checking for Unicode code points in <link
-        linkend="functions-string-other"><function>chr(int)</></link>
+        linkend="functions-string-other"><function>chr(int)</function></link>
         (Tom Lane)
        </para>
 
@@ -10054,18 +10290,18 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add functions for looking up objects in <structname>pg_class</>,
-        <structname>pg_proc</>, <structname>pg_type</>, and
-        <structname>pg_operator</> that do not generate errors for
+        Add functions for looking up objects in <structname>pg_class</structname>,
+        <structname>pg_proc</structname>, <structname>pg_type</structname>, and
+        <structname>pg_operator</structname> that do not generate errors for
         non-existent objects (Yugo Nagata, Nozomi Anzai,
         Robert Haas)
        </para>
 
        <para>
         For example, <link
-        linkend="functions-info-catalog-table"><function>to_regclass()</></link>
-        does a lookup in <structname>pg_class</> similarly to
-        the <type>regclass</> input function, but it returns NULL for a
+        linkend="functions-info-catalog-table"><function>to_regclass()</function></link>
+        does a lookup in <structname>pg_class</structname> similarly to
+        the <type>regclass</type> input function, but it returns NULL for a
         non-existent object instead of failing.
        </para>
       </listitem>
@@ -10073,7 +10309,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add function <link
-        linkend="functions-admin-dblocation"><function>pg_filenode_relation()</></link>
+        linkend="functions-admin-dblocation"><function>pg_filenode_relation()</function></link>
         to allow for more efficient lookup of relation names from filenodes
         (Andres Freund)
        </para>
@@ -10081,8 +10317,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <structfield>parameter_default</> column to <link
-        linkend="infoschema-parameters"><structname>information_schema.parameters</></link>
+        Add <structfield>parameter_default</structfield> column to <link
+        linkend="infoschema-parameters"><structname>information_schema.parameters</structname></link>
         view (Peter Eisentraut)
        </para>
       </listitem>
@@ -10090,7 +10326,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Make <link
-        linkend="infoschema-schemata"><structname>information_schema.schemata</></link>
+        linkend="infoschema-schemata"><structname>information_schema.schemata</structname></link>
         show all accessible schemas (Peter Eisentraut)
        </para>
 
@@ -10112,7 +10348,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Add control over which rows are passed
         into aggregate functions via the <link
-        linkend="syntax-aggregates"><literal>FILTER</></link> clause
+        linkend="syntax-aggregates"><literal>FILTER</literal></link> clause
         (David Fetter)
        </para>
       </listitem>
@@ -10120,7 +10356,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Support ordered-set (<link
-        linkend="syntax-aggregates"><literal>WITHIN GROUP</></link>)
+        linkend="syntax-aggregates"><literal>WITHIN GROUP</literal></link>)
         aggregates (Atri Sharma, Andrew Gierth, Tom Lane)
        </para>
       </listitem>
@@ -10128,11 +10364,11 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add standard ordered-set aggregates <link
-        linkend="functions-orderedset-table"><function>percentile_cont()</></link>,
-        <function>percentile_disc()</>, <function>mode()</>, <link
-        linkend="functions-hypothetical-table"><function>rank()</></link>,
-        <function>dense_rank()</>, <function>percent_rank()</>, and
-        <function>cume_dist()</>
+        linkend="functions-orderedset-table"><function>percentile_cont()</function></link>,
+        <function>percentile_disc()</function>, <function>mode()</function>, <link
+        linkend="functions-hypothetical-table"><function>rank()</function></link>,
+        <function>dense_rank()</function>, <function>percent_rank()</function>, and
+        <function>cume_dist()</function>
         (Atri Sharma, Andrew Gierth)
        </para>
       </listitem>
@@ -10140,7 +10376,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Support <link
-        linkend="xfunc-sql-variadic-functions"><literal>VARIADIC</></link>
+        linkend="xfunc-sql-variadic-functions"><literal>VARIADIC</literal></link>
         aggregate functions (Tom Lane)
        </para>
       </listitem>
@@ -10152,7 +10388,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
        <para>
         This allows proper declaration in SQL of aggregates like the built-in
-        aggregate <function>array_agg()</>.
+        aggregate <function>array_agg()</function>.
        </para>
       </listitem>
 
@@ -10169,20 +10405,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-       Add event trigger support to <link linkend="plperl">PL/Perl</>
-       and <link linkend="pltcl">PL/Tcl</> (Dimitri Fontaine)
+       Add event trigger support to <link linkend="plperl">PL/Perl</link>
+       and <link linkend="pltcl">PL/Tcl</link> (Dimitri Fontaine)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Convert <link linkend="datatype-numeric"><type>numeric</></link>
-       values to <type>decimal</> in <link linkend="plpython">PL/Python</link>
+       Convert <link linkend="datatype-numeric"><type>numeric</type></link>
+       values to <type>decimal</type> in <link linkend="plpython">PL/Python</link>
        (Szymon Guz, Ronan Dunklau)
       </para>
 
       <para>
-       Previously such values were converted to Python <type>float</> values,
+       Previously such values were converted to Python <type>float</type> values,
        risking loss of precision.
       </para>
      </listitem>
@@ -10198,7 +10434,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Add ability to retrieve the current PL/pgSQL call stack
         using <link linkend="plpgsql-call-stack"><command>GET
-        DIAGNOSTICS</></link>
+        DIAGNOSTICS</command></link>
         (Pavel Stehule, Stephen Frost)
        </para>
       </listitem>
@@ -10206,17 +10442,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add option <link
-        linkend="plpgsql-statements-sql-onerow"><option>print_strict_params</></link>
+        linkend="plpgsql-statements-sql-onerow"><option>print_strict_params</option></link>
         to display the parameters passed to a query that violated a
-        <literal>STRICT</> constraint (Marko Tiikkaja)
+        <literal>STRICT</literal> constraint (Marko Tiikkaja)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add variables <link
-        linkend="plpgsql-extra-checks"><varname>plpgsql.extra_warnings</></link>
-        and <varname>plpgsql.extra_errors</> to enable additional PL/pgSQL
+        linkend="plpgsql-extra-checks"><varname>plpgsql.extra_warnings</varname></link>
+        and <varname>plpgsql.extra_errors</varname> to enable additional PL/pgSQL
         warnings and errors (Marko Tiikkaja, Petr Jelinek)
        </para>
 
@@ -10232,13 +10468,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
    </sect3>
 
    <sect3>
-    <title><link linkend="libpq"><application>libpq</></link></title>
+    <title><link linkend="libpq"><application>libpq</application></link></title>
      <itemizedlist>
 
       <listitem>
        <para>
         Make libpq's <link
-        linkend="libpq-pqconndefaults"><function>PQconndefaults()</></link>
+        linkend="libpq-pqconndefaults"><function>PQconndefaults()</function></link>
         function ignore invalid service files (Steve Singer, Bruce Momjian)
        </para>
 
@@ -10250,7 +10486,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Accept <acronym>TLS</> protocol versions beyond <literal>TLSv1</>
+        Accept <acronym>TLS</acronym> protocol versions beyond <literal>TLSv1</literal>
         in libpq (Marko Kreen)
        </para>
       </listitem>
@@ -10266,15 +10502,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="APP-CREATEUSER"> option <option>-g</>
+        Add <xref linkend="app-createuser"> option <option>-g</option>
         to specify role membership (Christopher Browne)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <xref linkend="APP-VACUUMDB">
-        option <option>--analyze-in-stages</> to analyze in stages of
+        Add <xref linkend="app-vacuumdb">
+        option <option>--analyze-in-stages</option> to analyze in stages of
         increasing granularity (Peter Eisentraut)
        </para>
 
@@ -10285,8 +10521,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <link linkend="app-pgresetwal"><application>pg_resetxlog</></>
-        with option <option>-n</> output current and potentially changed
+        Make <link linkend="app-pgresetwal"><application>pg_resetxlog</application></link>
+        with option <option>-n</option> output current and potentially changed
         values (Rajeev Rastogi)
        </para>
       </listitem>
@@ -10301,19 +10537,19 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <xref linkend="app-pg-ctl"> return exit code <literal>4</> for
+        Make <xref linkend="app-pg-ctl"> return exit code <literal>4</literal> for
         an inaccessible data directory (Amit Kapila, Bruce Momjian)
        </para>
 
        <para>
         This behavior more closely matches the Linux Standard Base
-        (<acronym>LSB</>) Core Specification.
+        (<acronym>LSB</acronym>) Core Specification.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        On Windows, ensure that a non-absolute <option>-D</> path
+        On Windows, ensure that a non-absolute <option>-D</option> path
         specification is interpreted relative
         to <xref linkend="app-pg-ctl">'s current directory
         (Kumar Rajeev Rastogi)
@@ -10327,7 +10563,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow <function>sizeof()</> in <link linkend="ecpg">ECPG</link>
+        Allow <function>sizeof()</function> in <link linkend="ecpg">ECPG</link>
         C array definitions (Michael Meskes)
        </para>
       </listitem>
@@ -10335,7 +10571,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Make <link linkend="ecpg">ECPG</link> properly handle nesting
-        of C-style comments in both C and <acronym>SQL</> text
+        of C-style comments in both C and <acronym>SQL</acronym> text
         (Michael Meskes)
        </para>
       </listitem>
@@ -10343,21 +10579,21 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </itemizedlist>
 
     <sect4>
-     <title><xref linkend="APP-PSQL"></title>
+     <title><xref linkend="app-psql"></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Suppress <quote>No rows</quote> output in <application>psql</> <link
-        linkend="APP-PSQL-meta-commands"><option>expanded</></link>
+        Suppress <quote>No rows</quote> output in <application>psql</application> <link
+        linkend="app-psql-meta-commands"><option>expanded</option></link>
         mode when the footer is disabled (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow Control-C to abort <application>psql</> when it's hung at
+        Allow Control-C to abort <application>psql</application> when it's hung at
         connection startup (Peter Eisentraut)
        </para>
       </listitem>
@@ -10365,28 +10601,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </itemizedlist>
 
      <sect5>
-      <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+      <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
       <itemizedlist>
 
        <listitem>
         <para>
-         Make <application>psql</>'s <command>\db+</> show tablespace options
+         Make <application>psql</application>'s <command>\db+</command> show tablespace options
          (Magnus Hagander)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\do+</> display the functions
+         Make <command>\do+</command> display the functions
          that implement the operators (Marko Tiikkaja)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\d+</> output an
-         <literal>OID</> line only if an <literal>oid</literal> column
+         Make <command>\d+</command> output an
+         <literal>OID</literal> line only if an <literal>oid</literal> column
          exists in the table (Bruce Momjian)
         </para>
 
@@ -10398,7 +10634,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Make <command>\d</> show disabled system triggers (Bruce
+         Make <command>\d</command> show disabled system triggers (Bruce
          Momjian)
         </para>
 
@@ -10410,55 +10646,55 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Fix <command>\copy</> to no longer require
-         a space between <literal>stdin</> and a semicolon (Etsuro Fujita)
+         Fix <command>\copy</command> to no longer require
+         a space between <literal>stdin</literal> and a semicolon (Etsuro Fujita)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Output the row count at the end of <command>\copy</>, just
-         like <command>COPY</> already did (Kumar Rajeev Rastogi)
+         Output the row count at the end of <command>\copy</command>, just
+         like <command>COPY</command> already did (Kumar Rajeev Rastogi)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Fix <command>\conninfo</> to display the
-         server's <acronym>IP</> address for connections using
-         <literal>hostaddr</> (Fujii Masao)
+         Fix <command>\conninfo</command> to display the
+         server's <acronym>IP</acronym> address for connections using
+         <literal>hostaddr</literal> (Fujii Masao)
         </para>
 
         <para>
-         Previously <command>\conninfo</> could not display the server's
-         <acronym>IP</> address in such cases.
+         Previously <command>\conninfo</command> could not display the server's
+         <acronym>IP</acronym> address in such cases.
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Show the <acronym>SSL</> protocol version in
-         <command>\conninfo</> (Marko Kreen)
+         Show the <acronym>SSL</acronym> protocol version in
+         <command>\conninfo</command> (Marko Kreen)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Add tab completion for <command>\pset</>
+         Add tab completion for <command>\pset</command>
          (Pavel Stehule)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Allow <command>\pset</> with no arguments
+         Allow <command>\pset</command> with no arguments
          to show all settings (Gilles Darold)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\s</> display the name of the history file it wrote
+         Make <command>\s</command> display the name of the history file it wrote
          without converting it to an absolute path (Tom Lane)
         </para>
 
@@ -10475,14 +10711,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><xref linkend="APP-PGDUMP"></title>
+     <title><xref linkend="app-pgdump"></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <xref linkend="APP-PGRESTORE"> options
-        <option>-I</>, <option>-P</>, <option>-T</> and <option>-n</>
+        Allow <xref linkend="app-pgrestore"> options
+        <option>-I</option>, <option>-P</option>, <option>-T</option> and <option>-n</option>
         to be specified multiple times (Heikki Linnakangas)
        </para>
 
@@ -10493,17 +10729,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Optionally add <literal>IF EXISTS</> clauses to the <command>DROP</>
+        Optionally add <literal>IF EXISTS</literal> clauses to the <command>DROP</command>
         commands emitted when removing old objects during a restore (Pavel
         Stehule)
        </para>
 
        <para>
         This change prevents unnecessary errors when removing old objects.
-        The new <option>--if-exists</> option
-        for <xref linkend="APP-PGDUMP">, <xref linkend="APP-PG-DUMPALL">,
-        and <xref linkend="APP-PGRESTORE"> is only available
-        when <option>--clean</> is also specified.
+        The new <option>--if-exists</option> option
+        for <xref linkend="app-pgdump">, <xref linkend="app-pg-dumpall">,
+        and <xref linkend="app-pgrestore"> is only available
+        when <option>--clean</option> is also specified.
        </para>
       </listitem>
 
@@ -10518,20 +10754,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <application>pg_basebackup</> option <option>--xlogdir</>
-        to specify the <filename>pg_xlog</> directory location (Haribabu
+        Add <application>pg_basebackup</application> option <option>--xlogdir</option>
+        to specify the <filename>pg_xlog</filename> directory location (Haribabu
         Kommi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_basebackup</> to relocate tablespaces in
+        Allow <application>pg_basebackup</application> to relocate tablespaces in
         the backup copy (Steeve Lennmark)
        </para>
 
        <para>
-        This is particularly useful for using <application>pg_basebackup</>
+        This is particularly useful for using <application>pg_basebackup</application>
         on the same machine as the primary.
        </para>
       </listitem>
@@ -10542,8 +10778,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        This can be controlled with the <application>pg_basebackup</>
-        <option>--max-rate</> parameter.
+        This can be controlled with the <application>pg_basebackup</application>
+        <option>--max-rate</option> parameter.
        </para>
       </listitem>
 
@@ -10574,13 +10810,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         No longer require function prototypes for functions marked with the
-        <link linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</></link>
+        <link linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</function></link>
         macro (Peter Eisentraut)
        </para>
 
        <para>
         This change eliminates the need to write boilerplate prototypes.
-        Note that the <function>PG_FUNCTION_INFO_V1</> macro must appear
+        Note that the <function>PG_FUNCTION_INFO_V1</function> macro must appear
         before the corresponding function definition to avoid compiler
         warnings.
        </para>
@@ -10588,41 +10824,41 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Remove <varname>SnapshotNow</> and
-        <function>HeapTupleSatisfiesNow()</> (Robert Haas)
+        Remove <varname>SnapshotNow</varname> and
+        <function>HeapTupleSatisfiesNow()</function> (Robert Haas)
        </para>
 
        <para>
         All existing uses have been switched to more appropriate snapshot
-        types.  Catalog scans now use <acronym>MVCC</> snapshots.
+        types.  Catalog scans now use <acronym>MVCC</acronym> snapshots.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add an <acronym>API</> to allow memory allocations over one gigabyte
+        Add an <acronym>API</acronym> to allow memory allocations over one gigabyte
         (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>psprintf()</> to simplify memory allocation during
+        Add <function>psprintf()</function> to simplify memory allocation during
         string composition (Peter Eisentraut, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <function>printf()</> size modifier <literal>z</> to
-        print <type>size_t</> values (Andres Freund)
+        Support <function>printf()</function> size modifier <literal>z</literal> to
+        print <type>size_t</type> values (Andres Freund)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <acronym>API</> of <function>appendStringInfoVA()</>
-        to better use <function>vsnprintf()</> (David Rowley, Tom Lane)
+        Change <acronym>API</acronym> of <function>appendStringInfoVA()</function>
+        to better use <function>vsnprintf()</function> (David Rowley, Tom Lane)
        </para>
       </listitem>
 
@@ -10642,7 +10878,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve spinlock speed on x86_64 <acronym>CPU</>s (Heikki
+        Improve spinlock speed on x86_64 <acronym>CPU</acronym>s (Heikki
         Linnakangas)
        </para>
       </listitem>
@@ -10650,56 +10886,56 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Remove spinlock support for unsupported platforms
-        <productname>SINIX</>, <productname>Sun3</>, and
-        <productname>NS32K</> (Robert Haas)
+        <productname>SINIX</productname>, <productname>Sun3</productname>, and
+        <productname>NS32K</productname> (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <acronym>IRIX</> port (Robert Haas)
+        Remove <acronym>IRIX</acronym> port (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Reduce the number of semaphores required by
-        <option>--disable-spinlocks</> builds (Robert Haas)
+        <option>--disable-spinlocks</option> builds (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Rewrite <application>duplicate_oids</> Unix shell script in
-        <application>Perl</> (Andrew Dunstan)
+        Rewrite <application>duplicate_oids</application> Unix shell script in
+        <application>Perl</application> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add Test Anything Protocol (<acronym>TAP</>) tests for client
+        Add Test Anything Protocol (<acronym>TAP</acronym>) tests for client
         programs (Peter Eisentraut)
        </para>
 
        <para>
-        Currently, these tests are run by <literal>make check-world</>
-        only if the <option>--enable-tap-tests</> option was given
-        to <application>configure</>.
+        Currently, these tests are run by <literal>make check-world</literal>
+        only if the <option>--enable-tap-tests</option> option was given
+        to <application>configure</application>.
         This might become the default behavior in some future release.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add make targets <option>check-tests</> and
-        <option>installcheck-tests</>, which allow selection of individual
+        Add make targets <option>check-tests</option> and
+        <option>installcheck-tests</option>, which allow selection of individual
         tests to be run (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <option>maintainer-check</> makefile rule (Peter Eisentraut)
+        Remove <option>maintainer-check</option> makefile rule (Peter Eisentraut)
        </para>
 
        <para>
@@ -10709,7 +10945,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve support for <envar>VPATH</> builds of <acronym>PGXS</>
+        Improve support for <envar>VPATH</envar> builds of <acronym>PGXS</acronym>
         modules  (C&eacute;dric Villemain, Andrew Dunstan, Peter Eisentraut)
        </para>
       </listitem>
@@ -10722,8 +10958,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add a <application>configure</> flag that appends custom text to the
-        <envar>PG_VERSION</> string (Oskari Saarenmaa)
+        Add a <application>configure</application> flag that appends custom text to the
+        <envar>PG_VERSION</envar> string (Oskari Saarenmaa)
        </para>
 
        <para>
@@ -10733,46 +10969,46 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve DocBook <acronym>XML</> validity (Peter Eisentraut)
+        Improve DocBook <acronym>XML</acronym> validity (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix various minor security and sanity issues reported by the
-        <productname>Coverity</> scanner (Stephen Frost)
+        <productname>Coverity</productname> scanner (Stephen Frost)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve detection of invalid memory usage when testing
-        <productname>PostgreSQL</> with <application>Valgrind</>
+        <productname>PostgreSQL</productname> with <application>Valgrind</application>
         (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve sample <application>Emacs</> configuration file
-        <filename>emacs.samples</> (Peter Eisentraut)
+        Improve sample <application>Emacs</application> configuration file
+        <filename>emacs.samples</filename> (Peter Eisentraut)
        </para>
 
        <para>
-        Also add <filename>.dir-locals.el</> to the top of the source tree.
+        Also add <filename>.dir-locals.el</filename> to the top of the source tree.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgindent</> to accept a command-line list
+        Allow <application>pgindent</application> to accept a command-line list
         of typedefs (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pgindent</> smarter about blank lines
+        Make <application>pgindent</application> smarter about blank lines
         around preprocessor conditionals (Bruce Momjian)
        </para>
       </listitem>
@@ -10780,14 +11016,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Avoid most uses of <command>dlltool</command>
-        in <productname>Cygwin</> and
-        <productname>Mingw</> builds (Marco Atzeri, Hiroshi Inoue)
+        in <productname>Cygwin</productname> and
+        <productname>Mingw</productname> builds (Marco Atzeri, Hiroshi Inoue)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support client-only installs in <acronym>MSVC</> (Windows) builds
+        Support client-only installs in <acronym>MSVC</acronym> (Windows) builds
         (MauMau)
        </para>
       </listitem>
@@ -10814,13 +11050,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <acronym>UUID</> random number generator
-        <function>gen_random_uuid()</> to <xref linkend="pgcrypto">
+        Add <acronym>UUID</acronym> random number generator
+        <function>gen_random_uuid()</function> to <xref linkend="pgcrypto">
         (Oskari Saarenmaa)
        </para>
 
        <para>
-        This allows creation of version 4 <acronym>UUID</>s without
+        This allows creation of version 4 <acronym>UUID</acronym>s without
         requiring installation of <xref linkend="uuid-ossp">.
        </para>
       </listitem>
@@ -10828,12 +11064,12 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow <xref linkend="uuid-ossp"> to work with
-        the <systemitem>BSD</> or <systemitem>e2fsprogs</> UUID libraries,
-        not only the <systemitem>OSSP</> UUID library (Matteo Beccati)
+        the <systemitem>BSD</systemitem> or <systemitem>e2fsprogs</systemitem> UUID libraries,
+        not only the <systemitem>OSSP</systemitem> UUID library (Matteo Beccati)
        </para>
 
        <para>
-        This improves the <application>uuid-ossp</> module's portability
+        This improves the <application>uuid-ossp</application> module's portability
         since it no longer has to have the increasingly-obsolete OSSP
         library.  The module's name is now rather a misnomer, but we won't
         change it.
@@ -10887,8 +11123,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow <link linkend="pgwaldump"><application>pg_xlogdump</></>
-        to report a live log stream with <option>--follow</>
+        Allow <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
+        to report a live log stream with <option>--follow</option>
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -10920,7 +11156,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Pass <xref linkend="pgupgrade">'s user name (<option>-U</>) option to
+        Pass <xref linkend="pgupgrade">'s user name (<option>-U</option>) option to
         generated analyze scripts (Bruce Momjian)
        </para>
       </listitem>
@@ -10934,31 +11170,31 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Remove line length limit for <application>pgbench</> scripts (Sawada
+        Remove line length limit for <application>pgbench</application> scripts (Sawada
         Masahiko)
        </para>
 
        <para>
-        The previous line limit was <envar>BUFSIZ</>.
+        The previous line limit was <envar>BUFSIZ</envar>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add long option names to <application>pgbench</> (Fabien Coelho)
+        Add long option names to <application>pgbench</application> (Fabien Coelho)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> option <option>--rate</> to control
+        Add <application>pgbench</application> option <option>--rate</option> to control
         the transaction rate (Fabien Coelho)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> option <option>--progress</> to
+        Add <application>pgbench</application> option <option>--progress</option> to
         print periodic progress reports
         (Fabien Coelho)
        </para>
@@ -10975,7 +11211,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <application>pg_stat_statements</> use a file, rather than
+        Make <application>pg_stat_statements</application> use a file, rather than
         shared memory, for query text storage (Peter Geoghegan)
        </para>
 
@@ -10987,7 +11223,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow reporting of <application>pg_stat_statements</>'s internal
+        Allow reporting of <application>pg_stat_statements</application>'s internal
         query hash identifier (Daniel Farina, Sameer Thakur, Peter
         Geoghegan)
        </para>
@@ -10995,7 +11231,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add the ability to retrieve all <application>pg_stat_statements</>
+        Add the ability to retrieve all <application>pg_stat_statements</application>
         information except the query text (Peter Geoghegan)
        </para>
 
@@ -11008,20 +11244,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <application>pg_stat_statements</> ignore <command>DEALLOCATE</>
+        Make <application>pg_stat_statements</application> ignore <command>DEALLOCATE</command>
         commands (Fabien Coelho)
        </para>
 
        <para>
-        It already ignored <command>PREPARE</>, as well as planning time in
+        It already ignored <command>PREPARE</command>, as well as planning time in
         general, so this seems more consistent.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Save the statistics file into <filename>$PGDATA/pg_stat</> at server
-        shutdown, rather than <filename>$PGDATA/global</> (Fujii Masao)
+        Save the statistics file into <filename>$PGDATA/pg_stat</filename> at server
+        shutdown, rather than <filename>$PGDATA/global</filename> (Fujii Masao)
        </para>
       </listitem>
 
diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index 0f700dd5d3151f4e498bfca3669eaa7cd7a5d77d..3ab5df7a5f492ee441dc23529f5b261b0be0220a 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -1,6 +1,294 @@
 <!-- doc/src/sgml/release-9.5.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-5-10">
+  <title>Release 9.5.10</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.9.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.10</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.8,
+    see <xref linkend="release-9-5-8">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when determining relation distinctness (David Rowley)
+     </para>
+
+     <para>
+      This allows the intended optimization to occur when a subquery has
+      a result column of type <type>varchar</type>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-5-9">
   <title>Release 9.5.9</title>
 
@@ -36,20 +324,20 @@
     <listitem>
      <para>
       Show foreign tables
-      in <structname>information_schema</>.<structname>table_privileges</>
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
       view (Peter Eisentraut)
      </para>
 
      <para>
-      All other relevant <structname>information_schema</> views include
+      All other relevant <structname>information_schema</structname> views include
       foreign tables, but this one ignored them.
      </para>
 
      <para>
-      Since this view definition is installed by <application>initdb</>,
+      Since this view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can, as a superuser, do this
-      in <application>psql</>:
+      in <application>psql</application>:
 <programlisting>
 SET search_path TO information_schema;
 CREATE OR REPLACE VIEW table_privileges AS
@@ -88,21 +376,21 @@ CREATE OR REPLACE VIEW table_privileges AS
                OR grantee.rolname = 'PUBLIC');
 </programlisting>
       This must be repeated in each database to be fixed,
-      including <literal>template0</>.
+      including <literal>template0</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Clean up handling of a fatal exit (e.g., due to receipt
-      of <systemitem>SIGTERM</>) that occurs while trying to execute
-      a <command>ROLLBACK</> of a failed transaction (Tom Lane)
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
      </para>
 
      <para>
       This situation could result in an assertion failure.  In production
       builds, the exit would still occur, but it would log an unexpected
-      message about <quote>cannot drop active portal</>.
+      message about <quote>cannot drop active portal</quote>.
      </para>
     </listitem>
 
@@ -119,7 +407,7 @@ CREATE OR REPLACE VIEW table_privileges AS
      </para>
 
      <para>
-      Certain <command>ALTER</> commands that change the definition of a
+      Certain <command>ALTER</command> commands that change the definition of a
       composite type or domain type are supposed to fail if there are any
       stored values of that type in the database, because they lack the
       infrastructure needed to update or check such values.  Previously,
@@ -131,7 +419,7 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Fix crash in <application>pg_restore</> when using parallel mode and
+      Fix crash in <application>pg_restore</application> when using parallel mode and
       using a list file to select a subset of items to restore
       (Fabr&iacute;zio de Royes Mello)
      </para>
@@ -139,13 +427,13 @@ CREATE OR REPLACE VIEW table_privileges AS
 
     <listitem>
      <para>
-      Change <application>ecpg</>'s parser to allow <literal>RETURNING</>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
       clauses without attached C variables (Michael Meskes)
      </para>
 
      <para>
-      This allows <application>ecpg</> programs to contain SQL constructs
-      that use <literal>RETURNING</> internally (for example, inside a CTE)
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
       rather than using it to define values to be returned to the client.
      </para>
     </listitem>
@@ -157,18 +445,18 @@ CREATE OR REPLACE VIEW table_privileges AS
 
      <para>
       This fix avoids possible crashes of PL/Perl due to inconsistent
-      assumptions about the width of <type>time_t</> values.
+      assumptions about the width of <type>time_t</type> values.
       A side-effect that may be visible to extension developers is
-      that <literal>_USE_32BIT_TIME_T</> is no longer defined globally
-      in <productname>PostgreSQL</> Windows builds.  This is not expected
-      to cause problems, because type <type>time_t</> is not used
-      in any <productname>PostgreSQL</> API definitions.
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>make check</> to behave correctly when invoked via a
+      Fix <literal>make check</literal> to behave correctly when invoked via a
       non-GNU make program (Thomas Munro)
      </para>
     </listitem>
@@ -218,7 +506,7 @@ CREATE OR REPLACE VIEW table_privileges AS
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -226,11 +514,11 @@ CREATE OR REPLACE VIEW table_privileges AS
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -245,15 +533,15 @@ CREATE OR REPLACE VIEW table_privileges AS
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -284,15 +572,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -306,7 +594,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -320,16 +608,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -337,13 +625,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -352,12 +640,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Correct the documentation about the process for upgrading standby
-      servers with <application>pg_upgrade</> (Bruce Momjian)
+      servers with <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
       The previous documentation instructed users to start/stop the primary
-      server after running <application>pg_upgrade</> but before syncing
+      server after running <application>pg_upgrade</application> but before syncing
       the standby servers.  This sequence is unsafe.
      </para>
     </listitem>
@@ -463,21 +751,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -491,7 +779,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -539,7 +827,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -547,7 +835,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -555,19 +843,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dangling pointer in <command>ALTER TABLE</> when there is a
+      Fix dangling pointer in <command>ALTER TABLE</command> when there is a
       comment on a constraint belonging to the table (David Rowley)
      </para>
 
@@ -579,44 +867,44 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -627,20 +915,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -653,9 +941,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -666,8 +954,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -678,15 +966,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -699,14 +987,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -717,14 +1005,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -732,13 +1020,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -746,7 +1034,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -758,20 +1046,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_rewind</> to correctly handle files exceeding 2GB
+      Fix <application>pg_rewind</application> to correctly handle files exceeding 2GB
       (Kuntal Ghosh, Michael Paquier)
      </para>
 
      <para>
-      Ordinarily such files won't appear in <productname>PostgreSQL</> data
+      Ordinarily such files won't appear in <productname>PostgreSQL</productname> data
       directories, but they could be present in some cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -783,16 +1071,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</>'s computation of WAL record length
+      Fix <application>pg_xlogdump</application>'s computation of WAL record length
       (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -803,7 +1091,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -815,14 +1103,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -849,34 +1137,34 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -913,7 +1201,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
@@ -930,18 +1218,18 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -965,7 +1253,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -979,17 +1267,17 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -1020,7 +1308,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -1033,7 +1321,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -1041,14 +1329,14 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
@@ -1062,7 +1350,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -1079,14 +1367,14 @@ Author: Andrew Gierth <rhodiumtoad@postgresql.org>
 Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 -->
      <para>
-      Fix crash or wrong answers when a <literal>GROUPING SETS</> column's
+      Fix crash or wrong answers when a <literal>GROUPING SETS</literal> column's
       data type is hashable but not sortable (Pavan Deolasee)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid applying <quote>physical targetlist</> optimization to custom
+      Avoid applying <quote>physical targetlist</quote> optimization to custom
       scans (Dmitry Ivanov, Tom Lane)
      </para>
 
@@ -1099,13 +1387,13 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Use the correct sub-expression when applying a <literal>FOR ALL</>
+      Use the correct sub-expression when applying a <literal>FOR ALL</literal>
       row-level-security policy (Stephen Frost)
      </para>
 
      <para>
-      In some cases the <literal>WITH CHECK</> restriction would be applied
-      when the <literal>USING</> restriction is more appropriate.
+      In some cases the <literal>WITH CHECK</literal> restriction would be applied
+      when the <literal>USING</literal> restriction is more appropriate.
      </para>
     </listitem>
 
@@ -1119,19 +1407,19 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -1139,20 +1427,20 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dangling pointer in <command>COPY ... TO</> when row-level
+      Avoid dangling pointer in <command>COPY ... TO</command> when row-level
       security is active for the source table (Tom Lane)
      </para>
 
@@ -1164,8 +1452,8 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Avoid accessing an already-closed relcache entry in <command>CLUSTER</>
-      and <command>VACUUM FULL</> (Tom Lane)
+      Avoid accessing an already-closed relcache entry in <command>CLUSTER</command>
+      and <command>VACUUM FULL</command> (Tom Lane)
      </para>
 
      <para>
@@ -1176,14 +1464,14 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -1197,12 +1485,12 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -1211,21 +1499,21 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -1237,14 +1525,14 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <function>pg_get_object_address()</> to handle members of operator
+      Fix <function>pg_get_object_address()</function> to handle members of operator
       families correctly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -1258,13 +1546,13 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -1282,21 +1570,21 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -1311,20 +1599,20 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -1336,26 +1624,26 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -1374,7 +1662,7 @@ Branch: REL9_4_STABLE [f14bf0a8f] 2017-05-06 22:19:56 -0400
 Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 -->
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -1405,7 +1693,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -1419,9 +1707,9 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -1434,15 +1722,15 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
       other zone file (see <xref linkend="datatype-timezones">).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
@@ -1495,15 +1783,15 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1520,7 +1808,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
@@ -1530,7 +1818,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
      </para>
 
      <para>
-      The WAL record emitted for a BRIN <quote>revmap</> page when moving an
+      The WAL record emitted for a BRIN <quote>revmap</quote> page when moving an
       index tuple to a different page was incorrect.  Replay would make the
       related portion of the index useless, forcing it to be recomputed.
      </para>
@@ -1538,13 +1826,13 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
       Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1615,7 +1903,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
@@ -1630,7 +1918,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -1646,29 +1934,29 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</> when child
+      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</command> when child
       table has different column ordering than the parent
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      Failure to adjust the column numbering in the <literal>USING</>
+      Failure to adjust the column numbering in the <literal>USING</literal>
       expression led to errors,
-      typically <quote>attribute <replaceable>N</> has wrong type</quote>.
+      typically <quote>attribute <replaceable>N</replaceable> has wrong type</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1681,7 +1969,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
 
     <listitem>
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -1694,7 +1982,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1706,8 +1994,8 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
     <listitem>
      <para>
       Fix commit timestamp mechanism to not fail when queried about
-      the special XIDs <literal>FrozenTransactionId</>
-      and <literal>BootstrapTransactionId</> (Craig Ringer)
+      the special XIDs <literal>FrozenTransactionId</literal>
+      and <literal>BootstrapTransactionId</literal> (Craig Ringer)
      </para>
     </listitem>
 
@@ -1745,28 +2033,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
      <para>
       The symptom was spurious <quote>ON CONFLICT is not supported on table
-      ... used as a catalog table</> errors when the target
-      of <command>INSERT ... ON CONFLICT</> is a view with cascade option.
+      ... used as a catalog table</quote> errors when the target
+      of <command>INSERT ... ON CONFLICT</command> is a view with cascade option.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect <quote>target lists can have at most <replaceable>N</>
-      entries</quote> complaint when using <literal>ON CONFLICT</> with
+      Fix incorrect <quote>target lists can have at most <replaceable>N</replaceable>
+      entries</quote> complaint when using <literal>ON CONFLICT</literal> with
       wide tables (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1774,12 +2062,12 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1794,15 +2082,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1813,20 +2101,20 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
@@ -1834,27 +2122,27 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Improve speed of user-defined aggregates that
-      use <function>array_append()</> as transition function (Tom Lane)
+      use <function>array_append()</function> as transition function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <function>array_position()</>
-      or <function>array_positions()</> when processing arrays of records
+      Fix possible crash in <function>array_position()</function>
+      or <function>array_positions()</function> when processing arrays of records
       (Junseok Yang)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1866,8 +2154,8 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1880,7 +2168,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Disable transform that attempted to remove no-op <literal>AT TIME
-      ZONE</> conversions (Tom Lane)
+      ZONE</literal> conversions (Tom Lane)
      </para>
 
      <para>
@@ -1891,15 +2179,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1919,28 +2207,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -1953,15 +2241,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1969,7 +2257,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Fix possible mishandling of expanded arrays in domain check
-      constraints and <literal>CASE</> execution (Tom Lane)
+      constraints and <literal>CASE</literal> execution (Tom Lane)
      </para>
 
      <para>
@@ -2001,21 +2289,21 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -2027,23 +2315,23 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -2054,28 +2342,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix portability problems in <filename>contrib/pageinspect</>'s
+      Fix portability problems in <filename>contrib/pageinspect</filename>'s
       functions for GIN indexes (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -2102,7 +2390,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -2165,7 +2453,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -2173,7 +2461,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -2191,7 +2479,7 @@ Branch: REL9_4_STABLE [a69443564] 2016-09-03 13:28:53 -0400
      </para>
 
      <para>
-      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      The typical symptom was <quote>unexpected GIN leaf action</quote> errors
       during WAL replay.
      </para>
     </listitem>
@@ -2206,13 +2494,13 @@ Branch: REL9_4_STABLE [8778da2af] 2016-09-09 15:54:29 -0300
 Branch: REL9_3_STABLE [dfe7121df] 2016-09-09 15:54:29 -0300
 -->
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -2248,13 +2536,13 @@ Branch: REL9_5_STABLE [94bc30725] 2016-08-17 17:03:36 -0700
 -->
      <para>
       Fix deletion of speculatively inserted TOAST tuples when backing out
-      of <command>INSERT ... ON CONFLICT</> (Oskari Saarenmaa)
+      of <command>INSERT ... ON CONFLICT</command> (Oskari Saarenmaa)
      </para>
 
      <para>
       In the race condition where two transactions try to insert conflicting
       tuples at about the same time, the loser would fail with
-      an <quote>attempted to delete invisible tuple</> error if its
+      an <quote>attempted to delete invisible tuple</quote> error if its
       insertion included any TOAST'ed fields.
      </para>
     </listitem>
@@ -2262,7 +2550,7 @@ Branch: REL9_5_STABLE [94bc30725] 2016-08-17 17:03:36 -0700
     <listitem>
      <para>
       Don't throw serialization errors for self-conflicting insertions
-      in <command>INSERT ... ON CONFLICT</> (Thomas Munro, Peter Geoghegan)
+      in <command>INSERT ... ON CONFLICT</command> (Thomas Munro, Peter Geoghegan)
      </para>
     </listitem>
 
@@ -2300,29 +2588,29 @@ Branch: REL9_5_STABLE [46bd14a10] 2016-08-24 22:20:01 -0400
 Branch: REL9_4_STABLE [566afa15c] 2016-08-24 22:20:01 -0400
 -->
      <para>
-      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
-      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</command> on a table
+      with a <literal>PRIMARY KEY</literal> or <literal>REPLICA IDENTITY</literal> index
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>COPY</> with a column name list from a table that has
+      Fix <command>COPY</command> with a column name list from a table that has
       row-level security enabled (Adam Brightwell)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
+      Fix <command>EXPLAIN</command> to emit valid XML when
       <xref linkend="guc-track-io-timing"> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
@@ -2337,20 +2625,20 @@ Branch: REL9_2_STABLE [ceb005319] 2016-08-12 12:13:04 -0400
 -->
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix statistics update for <command>TRUNCATE</> in a prepared
+      Fix statistics update for <command>TRUNCATE</command> in a prepared
       transaction (Stas Kelvich)
      </para>
     </listitem>
@@ -2367,37 +2655,37 @@ Branch: REL9_2_STABLE [eaf6fe7fa] 2016-09-09 11:45:40 +0100
 Branch: REL9_1_STABLE [3ed7f54bc] 2016-09-09 11:46:03 +0100
 -->
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Show a sensible value
-      in <structname>pg_settings</>.<structfield>unit</>
-      for <varname>min_wal_size</> and <varname>max_wal_size</> (Tom Lane)
+      in <structname>pg_settings</structname>.<structfield>unit</structfield>
+      for <varname>min_wal_size</varname> and <varname>max_wal_size</varname> (Tom Lane)
      </para>
     </listitem>
 
@@ -2413,15 +2701,15 @@ Branch: REL9_1_STABLE [7e01c8ef3] 2016-08-14 15:06:02 -0400
 -->
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -2467,7 +2755,7 @@ Branch: REL9_5_STABLE [da9659f87] 2016-08-22 15:30:37 -0400
 
      <para>
       In the worst case, this could result in a corrupt btree index, which
-      would need to be rebuilt using <command>REINDEX</>.  However, the
+      would need to be rebuilt using <command>REINDEX</command>.  However, the
       situation is believed to be rare.
      </para>
     </listitem>
@@ -2501,7 +2789,7 @@ Branch: REL9_2_STABLE [823df401d] 2016-08-31 08:52:13 -0400
 Branch: REL9_1_STABLE [e3439a455] 2016-08-31 08:52:13 -0400
 -->
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -2527,7 +2815,7 @@ Branch: REL9_4_STABLE [690a2fb90] 2016-08-17 13:15:04 -0700
 
      <para>
       This failure to reset all of the fields of the slot could
-      prevent <command>VACUUM</> from removing dead tuples.
+      prevent <command>VACUUM</command> from removing dead tuples.
      </para>
     </listitem>
 
@@ -2538,7 +2826,7 @@ Branch: REL9_4_STABLE [690a2fb90] 2016-08-17 13:15:04 -0700
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -2564,7 +2852,7 @@ Branch: REL9_4_STABLE [32cdf680f] 2016-09-23 09:54:11 -0400
 
      <para>
       Previously, the same value would be chosen every time, because it was
-      derived from <function>random()</> but <function>srandom()</> had not
+      derived from <function>random()</function> but <function>srandom()</function> had not
       yet been called.  While relatively harmless, this was not the intended
       behavior.
      </para>
@@ -2584,8 +2872,8 @@ Branch: REL9_4_STABLE [c23b2523d] 2016-09-20 12:12:36 -0400
      </para>
 
      <para>
-      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
-      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</literal> rather
+      than <literal>ERROR_ALREADY_EXISTS</literal> when there is an existing
       segment.  This led to postmaster startup failure due to believing that
       the former was an unrecoverable error.
      </para>
@@ -2599,8 +2887,8 @@ Branch: REL9_6_STABLE Release: REL9_6_0 [c81c71d88] 2016-08-18 14:48:51 -0400
 Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
 -->
      <para>
-      Fix <application>PL/pgSQL</> to not misbehave with parameters and
-      local variables of type <type>int2vector</> or <type>oidvector</>
+      Fix <application>PL/pgSQL</application> to not misbehave with parameters and
+      local variables of type <type>int2vector</type> or <type>oidvector</type>
       (Tom Lane)
      </para>
     </listitem>
@@ -2608,7 +2896,7 @@ Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -2619,12 +2907,12 @@ Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
@@ -2640,7 +2928,7 @@ Branch: REL9_2_STABLE [a4a3fac16] 2016-09-18 14:00:13 +0300
 Branch: REL9_1_STABLE [ed29d2de2] 2016-09-18 14:07:30 +0300
 -->
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
@@ -2658,12 +2946,12 @@ Branch: REL9_5_STABLE [b93d37474] 2016-09-21 13:16:20 +0300
 Branch: REL9_4_STABLE [f16d4a241] 2016-09-21 13:16:24 +0300
 -->
      <para>
-      Fix <application>pgbench</>'s calculation of average latency
+      Fix <application>pgbench</application>'s calculation of average latency
       (Fabien Coelho)
      </para>
 
      <para>
-      The calculation was incorrect when there were <literal>\sleep</>
+      The calculation was incorrect when there were <literal>\sleep</literal>
       commands in the script, or when the test duration was specified in
       number of transactions rather than total time.
      </para>
@@ -2671,7 +2959,7 @@ Branch: REL9_4_STABLE [f16d4a241] 2016-09-21 13:16:24 +0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check library loadability in name order
+      In <application>pg_upgrade</application>, check library loadability in name order
       (Tom Lane)
      </para>
 
@@ -2693,12 +2981,12 @@ Branch: REL9_3_STABLE [f39bb487d] 2016-09-23 13:49:27 -0400
 Branch: REL9_2_STABLE [53b29d986] 2016-09-23 13:49:27 -0400
 -->
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -2712,9 +3000,9 @@ Branch: REL9_6_STABLE Release: REL9_6_0 [a88cee90f] 2016-09-08 10:48:03 -0400
 Branch: REL9_5_STABLE [142a110b3] 2016-09-08 10:48:03 -0400
 -->
      <para>
-      In <application>pg_dump</> with <option>-C</>,
-      suppress <literal>TABLESPACE</> clause of <command>CREATE DATABASE</>
-      if <option>--no-tablespaces</> is specified (Tom Lane)
+      In <application>pg_dump</application> with <option>-C</option>,
+      suppress <literal>TABLESPACE</literal> clause of <command>CREATE DATABASE</command>
+      if <option>--no-tablespaces</option> is specified (Tom Lane)
      </para>
     </listitem>
 
@@ -2727,27 +3015,27 @@ Branch: REL9_5_STABLE [9050e5c89] 2016-08-29 12:18:57 +0100
 Branch: REL9_5_STABLE [3aa233f82] 2016-08-29 18:12:04 -0300
 -->
      <para>
-      Make <application>pg_receivexlog</> work correctly
-      with <option>--synchronous</> without slots (Gabriele Bartolini)
+      Make <application>pg_receivexlog</application> work correctly
+      with <option>--synchronous</option> without slots (Gabriele Bartolini)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow specifying both <option>--source-server</>
-      and <option>--source-target</> options to <application>pg_rewind</>
+      Disallow specifying both <option>--source-server</option>
+      and <option>--source-target</option> options to <application>pg_rewind</application>
       (Michael Banck)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_rewind</> turn off <varname>synchronous_commit</>
+      Make <application>pg_rewind</application> turn off <varname>synchronous_commit</varname>
       in its session on the source server (Michael Banck, Michael Paquier)
      </para>
 
      <para>
-      This allows <application>pg_rewind</> to work even when the source
+      This allows <application>pg_rewind</application> to work even when the source
       server is using synchronous replication that is not working for some
       reason.
      </para>
@@ -2755,8 +3043,8 @@ Branch: REL9_5_STABLE [3aa233f82] 2016-08-29 18:12:04 -0300
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -2775,7 +3063,7 @@ Branch: REL9_4_STABLE [314a25fb3] 2016-08-29 14:38:17 +0900
 Branch: REL9_3_STABLE [5833306dd] 2016-08-29 15:51:30 +0900
 -->
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -2790,8 +3078,8 @@ Branch: REL9_5_STABLE [60b6d99da] 2016-09-15 09:30:36 -0400
 Branch: REL9_4_STABLE [1336bd986] 2016-09-15 09:22:52 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_buffercache</> to work
-      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+      Fix <filename>contrib/pg_buffercache</filename> to work
+      when <varname>shared_buffers</varname> exceeds 256GB (KaiGai Kohei)
      </para>
     </listitem>
 
@@ -2807,8 +3095,8 @@ Branch: REL9_2_STABLE [60bb1bb12] 2016-08-17 15:51:11 -0400
 Branch: REL9_1_STABLE [9942376a5] 2016-08-17 15:51:11 -0400
 -->
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -2842,11 +3130,11 @@ Branch: REL9_4_STABLE [5d41f27a9] 2016-09-23 15:50:00 -0400
      </para>
 
      <para>
-      When <productname>PostgreSQL</> has been configured
-      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      When <productname>PostgreSQL</productname> has been configured
+      with <option>--enable-tap-tests</option>, <quote>make install</quote> will now
       install the Perl support files for TAP testing where PGXS can find
       them.  This allows non-core extensions to
-      use <literal>$(prove_check)</> without extra tests.
+      use <literal>$(prove_check)</literal> without extra tests.
      </para>
     </listitem>
 
@@ -2859,7 +3147,7 @@ Branch: REL9_5_STABLE [52acf020a] 2016-09-19 14:27:08 -0400
 Branch: REL9_4_STABLE [ca93b816f] 2016-09-19 14:27:13 -0400
 -->
      <para>
-      In MSVC builds, include <application>pg_recvlogical</> in a
+      In MSVC builds, include <application>pg_recvlogical</application> in a
       client-only installation (MauMau)
      </para>
     </listitem>
@@ -2899,17 +3187,17 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -2922,15 +3210,15 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -2984,17 +3272,17 @@ Branch: REL9_1_STABLE [5327b764a] 2016-08-08 10:33:47 -0400
 -->
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -3055,7 +3343,7 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -3064,22 +3352,22 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -3089,7 +3377,7 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
@@ -3111,18 +3399,18 @@ Branch: REL9_2_STABLE [7b8526e5d] 2016-07-28 16:09:15 -0400
 Branch: REL9_1_STABLE [c0e5096fc] 2016-07-28 16:09:15 -0400
 -->
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
@@ -3134,8 +3422,8 @@ Branch: master [eae1ad9b6] 2016-05-23 19:23:36 -0400
 Branch: REL9_5_STABLE [e504d915b] 2016-05-23 19:23:36 -0400
 -->
      <para>
-      Fix <quote>unrecognized node type</> error for <command>INSERT ... ON
-      CONFLICT</> within a recursive CTE (a <literal>WITH</> item) (Peter
+      Fix <quote>unrecognized node type</quote> error for <command>INSERT ... ON
+      CONFLICT</command> within a recursive CTE (a <literal>WITH</literal> item) (Peter
       Geoghegan)
      </para>
     </listitem>
@@ -3147,7 +3435,7 @@ Branch: master [26e66184d] 2016-05-11 16:20:23 -0400
 Branch: REL9_5_STABLE [58d802410] 2016-05-11 16:20:03 -0400
 -->
      <para>
-      Fix <command>INSERT ... ON CONFLICT</> to successfully match index
+      Fix <command>INSERT ... ON CONFLICT</command> to successfully match index
       expressions or index predicates that are simplified during the
       planner's expression preprocessing phase (Tom Lane)
      </para>
@@ -3161,7 +3449,7 @@ Branch: REL9_5_STABLE [31ce32ade] 2016-07-04 16:09:11 -0400
 -->
      <para>
       Correctly handle violations of exclusion constraints that apply to
-      the target table of an <literal>INSERT ... ON CONFLICT</> command,
+      the target table of an <literal>INSERT ... ON CONFLICT</literal> command,
       but are not one of the selected arbiter indexes (Tom Lane)
      </para>
 
@@ -3178,7 +3466,7 @@ Branch: master [8a13d5e6d] 2016-05-11 17:06:53 -0400
 Branch: REL9_5_STABLE [428484ce1] 2016-05-11 17:06:53 -0400
 -->
      <para>
-      Fix <command>INSERT ... ON CONFLICT</> to not fail if the target
+      Fix <command>INSERT ... ON CONFLICT</command> to not fail if the target
       table has a unique index on OID (Tom Lane)
      </para>
     </listitem>
@@ -3194,7 +3482,7 @@ Branch: REL9_2_STABLE [f66e0fec3] 2016-06-16 17:16:53 -0400
 Branch: REL9_1_STABLE [7b97dafa2] 2016-06-16 17:16:58 -0400
 -->
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
@@ -3210,8 +3498,8 @@ Branch: REL9_2_STABLE [89b301104] 2016-07-16 14:42:37 -0400
 Branch: REL9_1_STABLE [608cc0c41] 2016-07-16 14:42:37 -0400
 -->
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -3229,7 +3517,7 @@ Branch: REL9_4_STABLE [b25d87f91] 2016-07-01 11:40:22 -0400
 Branch: REL9_3_STABLE [b0f20c2ea] 2016-07-01 11:40:22 -0400
 -->
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
@@ -3245,12 +3533,12 @@ Branch: REL9_2_STABLE [b0134fe84] 2016-08-08 11:13:45 -0400
 Branch: REL9_1_STABLE [d555d2642] 2016-08-08 11:13:51 -0400
 -->
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -3267,8 +3555,8 @@ Branch: REL9_3_STABLE [17bfef80e] 2016-06-27 15:57:21 -0400
 -->
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -3291,7 +3579,7 @@ Branch: REL9_1_STABLE [37276017f] 2016-07-15 17:49:49 -0700
 -->
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -3331,8 +3619,8 @@ Branch: REL9_4_STABLE [166873dd0] 2016-07-15 14:17:20 -0400
 Branch: REL9_3_STABLE [6c243f90a] 2016-07-15 14:17:20 -0400
 -->
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3346,14 +3634,14 @@ Branch: master [9eaf5be50] 2016-06-03 18:07:14 -0400
 Branch: REL9_5_STABLE [8355897ff] 2016-06-03 18:07:14 -0400
 -->
      <para>
-      Make sure <quote>expanded</> datums returned by a plan node are
+      Make sure <quote>expanded</quote> datums returned by a plan node are
       read-only (Tom Lane)
      </para>
 
      <para>
       This avoids failures in some cases where the result of a lower plan
       node is referenced in multiple places in upper nodes.  So far as
-      core <productname>PostgreSQL</> is concerned, only array values
+      core <productname>PostgreSQL</productname> is concerned, only array values
       returned by PL/pgSQL functions are at risk; but extensions might
       use expanded datums for other things.
      </para>
@@ -3374,7 +3662,7 @@ Branch: REL9_3_STABLE [dafdcbb6c] 2016-06-22 11:55:32 -0400
 Branch: REL9_2_STABLE [dd41661d2] 2016-06-22 11:55:35 -0400
 -->
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -3470,12 +3758,12 @@ Branch: REL9_2_STABLE [4cf0978ea] 2016-05-24 15:47:51 -0400
 Branch: REL9_1_STABLE [5551dac59] 2016-05-24 15:47:51 -0400
 -->
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -3498,7 +3786,7 @@ Branch: REL9_3_STABLE [28f294afd] 2016-06-24 18:29:28 -0400
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
@@ -3514,8 +3802,8 @@ Branch: REL9_2_STABLE [3201709de] 2016-06-06 17:44:18 -0400
 Branch: REL9_1_STABLE [32ceb8dfb] 2016-06-06 17:44:18 -0400
 -->
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -3536,7 +3824,7 @@ Branch: REL9_2_STABLE [127d73009] 2016-08-07 18:52:02 -0400
 Branch: REL9_1_STABLE [a449ad095] 2016-08-07 18:52:02 -0400
 -->
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -3600,7 +3888,7 @@ Branch: REL9_4_STABLE [98d5f366b] 2016-08-06 14:28:38 -0400
      </para>
 
      <para>
-      This mistake prevented <command>VACUUM</> from completing in some
+      This mistake prevented <command>VACUUM</command> from completing in some
       cases involving corrupt b-tree indexes.
      </para>
     </listitem>
@@ -3612,7 +3900,7 @@ Branch: master [8cf739de8] 2016-06-24 16:57:36 -0400
 Branch: REL9_5_STABLE [07f69137b] 2016-06-24 16:57:36 -0400
 -->
      <para>
-      Fix building of large (bigger than <varname>shared_buffers</>)
+      Fix building of large (bigger than <varname>shared_buffers</varname>)
       hash indexes (Tom Lane)
      </para>
 
@@ -3646,9 +3934,9 @@ Branch: master [8a859691d] 2016-06-05 11:53:06 -0400
 Branch: REL9_5_STABLE [a7aa61ffe] 2016-06-05 11:53:06 -0400
 -->
      <para>
-      Fix possible crash during a nearest-neighbor (<literal>ORDER BY</>
-      distance) indexscan on a <filename>contrib/btree_gist</> index on
-      an <type>interval</> column (Peter Geoghegan)
+      Fix possible crash during a nearest-neighbor (<literal>ORDER BY</literal>
+      distance) indexscan on a <filename>contrib/btree_gist</filename> index on
+      an <type>interval</type> column (Peter Geoghegan)
      </para>
     </listitem>
 
@@ -3659,7 +3947,7 @@ Branch: master [975ad4e60] 2016-05-30 14:47:22 -0400
 Branch: REL9_5_STABLE [2973d7d02] 2016-05-30 14:47:22 -0400
 -->
      <para>
-      Fix <quote>PANIC: failed to add BRIN tuple</> error when attempting
+      Fix <quote>PANIC: failed to add BRIN tuple</quote> error when attempting
       to update a BRIN index entry (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3682,8 +3970,8 @@ Branch: master [baebab3ac] 2016-07-12 18:07:03 -0400
 Branch: REL9_5_STABLE [a0943dbbe] 2016-07-12 18:06:50 -0400
 -->
      <para>
-      Fix PL/pgSQL's handling of the <literal>INTO</> clause
-      within <command>IMPORT FOREIGN SCHEMA</> commands (Tom Lane)
+      Fix PL/pgSQL's handling of the <literal>INTO</literal> clause
+      within <command>IMPORT FOREIGN SCHEMA</command> commands (Tom Lane)
      </para>
     </listitem>
 
@@ -3698,8 +3986,8 @@ Branch: REL9_2_STABLE [6c0be49b2] 2016-07-17 09:39:51 -0400
 Branch: REL9_1_STABLE [84d679204] 2016-07-17 09:41:08 -0400
 -->
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -3721,7 +4009,7 @@ Branch: REL9_1_STABLE [1f63b0e09] 2016-08-05 18:58:36 -0400
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
@@ -3737,7 +4025,7 @@ Branch: REL9_2_STABLE [295edbecf] 2016-08-01 15:08:48 +0200
 Branch: REL9_1_STABLE [c15f502b6] 2016-08-01 15:08:36 +0200
 -->
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
@@ -3752,8 +4040,8 @@ Branch: REL9_3_STABLE [6693c9d7b] 2016-08-02 12:49:09 -0400
 Branch: REL9_2_STABLE [a5a7caaa1] 2016-08-02 12:49:15 -0400
 -->
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
@@ -3771,15 +4059,15 @@ Branch: REL9_4_STABLE [53c2601a5] 2016-06-03 11:29:20 -0400
 Branch: REL9_3_STABLE [4a21c6fd7] 2016-06-03 11:29:20 -0400
 -->
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
@@ -3792,17 +4080,17 @@ Branch: REL9_4_STABLE [ea274b2f4] 2016-05-25 12:39:57 -0400
 Branch: REL9_3_STABLE [1c8205159] 2016-05-25 12:39:57 -0400
 -->
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -3817,8 +4105,8 @@ Branch: REL9_4_STABLE [d32bc204c] 2016-05-26 10:50:42 -0400
 Branch: REL9_3_STABLE [b9784e1f7] 2016-05-26 10:50:46 -0400
 -->
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -3835,13 +4123,13 @@ Branch: master [d74048def] 2016-05-26 22:14:23 +0200
 Branch: REL9_5_STABLE [47e596976] 2016-05-26 22:18:04 +0200
 -->
      <para>
-      Make parallel <application>pg_dump</> fail cleanly when run against a
+      Make parallel <application>pg_dump</application> fail cleanly when run against a
       standby server (Magnus Hagander)
      </para>
 
      <para>
       This usage is not supported
-      unless <option>--no-synchronized-snapshots</> is specified, but the
+      unless <option>--no-synchronized-snapshots</option> is specified, but the
       error was not handled very well.
      </para>
     </listitem>
@@ -3855,7 +4143,7 @@ Branch: REL9_4_STABLE [f2f18a37c] 2016-05-26 11:51:16 -0400
 Branch: REL9_3_STABLE [99565a1ef] 2016-05-26 11:51:20 -0400
 -->
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -3876,7 +4164,7 @@ Branch: REL9_2_STABLE [a21617759] 2016-08-01 17:38:00 +0900
 Branch: REL9_1_STABLE [366f4a962] 2016-08-01 17:38:05 +0900
 -->
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -3922,13 +4210,13 @@ Branch: REL9_4_STABLE [c2651cd24] 2016-05-27 10:40:20 -0400
 Branch: REL9_3_STABLE [1f1e70a87] 2016-05-27 10:40:20 -0400
 -->
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -3981,7 +4269,7 @@ Branch: REL9_1_STABLE [d70df7867] 2016-07-19 17:53:31 -0400
 -->
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -4002,7 +4290,7 @@ Branch: REL9_2_STABLE [7822792f7] 2016-08-05 12:58:58 -0400
 Branch: REL9_1_STABLE [a44388ffe] 2016-08-05 12:59:02 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -4066,7 +4354,7 @@ Branch: REL9_1_STABLE [9b676fd49] 2016-05-07 00:09:37 -0400
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -4084,7 +4372,7 @@ Branch: REL9_2_STABLE [ad2d32b57] 2016-04-21 20:05:58 -0400
 Branch: REL9_1_STABLE [6882dbd34] 2016-04-21 20:05:58 -0400
 -->
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -4106,10 +4394,10 @@ Branch: REL9_2_STABLE [f02cb8c9a] 2016-04-29 20:19:38 -0400
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -4128,7 +4416,7 @@ Branch: REL9_5_STABLE [81deadd31] 2016-04-21 23:17:36 -0400
      </para>
 
      <para>
-      An example is that <literal>SELECT (ARRAY[])::text[]</> gave an error,
+      An example is that <literal>SELECT (ARRAY[])::text[]</literal> gave an error,
       though it worked without the parentheses.
      </para>
     </listitem>
@@ -4160,7 +4448,7 @@ Branch: REL9_4_STABLE [ef35afa35] 2016-04-20 14:25:15 -0400
      <para>
       The memory leak would typically not amount to much in simple queries,
       but it could be very substantial during a large GIN index build with
-      high <varname>maintenance_work_mem</>.
+      high <varname>maintenance_work_mem</varname>.
      </para>
     </listitem>
 
@@ -4175,8 +4463,8 @@ Branch: REL9_2_STABLE [11247dd99] 2016-05-06 12:09:20 -0400
 Branch: REL9_1_STABLE [7bad282c3] 2016-05-06 12:09:20 -0400
 -->
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -4197,9 +4485,9 @@ Branch: REL9_2_STABLE [c7c145e4f] 2016-04-21 14:20:18 -0400
 Branch: REL9_1_STABLE [663624e60] 2016-04-21 14:20:18 -0400
 -->
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
@@ -4212,14 +4500,14 @@ Branch: REL9_5_STABLE [f3d17491c] 2016-04-04 18:05:23 -0400
 Branch: REL9_4_STABLE [28148e258] 2016-04-04 18:05:24 -0400
 -->
      <para>
-      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      Disallow newlines in <command>ALTER SYSTEM</command> parameter values
       (Tom Lane)
      </para>
 
      <para>
       The configuration-file parser doesn't support embedded newlines in
       string literals, so we mustn't allow them in values to be inserted
-      by <command>ALTER SYSTEM</>.
+      by <command>ALTER SYSTEM</command>.
      </para>
     </listitem>
 
@@ -4231,7 +4519,7 @@ Branch: REL9_5_STABLE [8f8e65d34] 2016-04-15 12:11:27 -0400
 Branch: REL9_4_STABLE [8eed31ffb] 2016-04-15 12:11:27 -0400
 -->
      <para>
-      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</command> to
       work properly if an index on OID is selected (David Rowley)
      </para>
     </listitem>
@@ -4290,13 +4578,13 @@ Branch: REL9_2_STABLE [1b22368ff] 2016-04-20 23:48:13 -0400
 Branch: REL9_1_STABLE [4c1c9f80b] 2016-04-20 23:48:13 -0400
 -->
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
@@ -4311,7 +4599,7 @@ Branch: REL9_2_STABLE [6bb42d520] 2016-04-13 18:57:52 -0400
 Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -4319,7 +4607,7 @@ Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
@@ -4333,13 +4621,13 @@ Branch: REL9_4_STABLE [e1aecebc0] 2016-05-06 22:05:51 -0400
 Branch: REL9_3_STABLE [e1d88f983] 2016-05-06 22:05:51 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -4369,7 +4657,7 @@ Branch: REL9_2_STABLE [b24f7e280] 2016-04-18 13:33:07 -0400
 -->
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
@@ -4384,8 +4672,8 @@ Branch: REL9_2_STABLE [0f5491283] 2016-04-23 16:53:15 -0400
 Branch: REL9_1_STABLE [cbff4b708] 2016-04-23 16:53:15 -0400
 -->
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
@@ -4407,8 +4695,8 @@ Branch: REL9_2_STABLE [b5ebc513d] 2016-04-21 16:59:13 -0400
 Branch: REL9_1_STABLE [9028f404e] 2016-04-21 16:59:17 -0400
 -->
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -4463,7 +4751,7 @@ Branch: REL9_4_STABLE [c238a4101] 2016-04-22 05:20:07 -0400
 Branch: REL9_3_STABLE [ab5c6d01f] 2016-04-22 05:20:18 -0400
 -->
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
@@ -4479,12 +4767,12 @@ Branch: REL9_2_STABLE [b4b06931e] 2016-03-29 11:54:58 -0400
 Branch: REL9_1_STABLE [6cd30292b] 2016-03-29 11:54:58 -0400
 -->
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -4501,9 +4789,9 @@ Branch: REL9_2_STABLE [29d154e36] 2016-05-05 20:09:27 -0400
 Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -4536,7 +4824,7 @@ Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
    </para>
 
    <para>
-    However, you may need to <command>REINDEX</> some indexes after applying
+    However, you may need to <command>REINDEX</command> some indexes after applying
     the update, as per the first changelog entry below.
    </para>
   </sect2>
@@ -4554,39 +4842,39 @@ Branch: REL9_5_STABLE [8aa6e9780] 2016-03-23 16:04:35 -0400
 
     <listitem>
      <para>
-      Disable abbreviated keys for string sorting in non-<literal>C</>
+      Disable abbreviated keys for string sorting in non-<literal>C</literal>
       locales (Robert Haas)
      </para>
 
      <para>
-      <productname>PostgreSQL</> 9.5 introduced logic for speeding up
+      <productname>PostgreSQL</productname> 9.5 introduced logic for speeding up
       comparisons of string data types by using the standard C library
-      function <function>strxfrm()</> as a substitute
-      for <function>strcoll()</>.  It now emerges that most versions of
+      function <function>strxfrm()</function> as a substitute
+      for <function>strcoll()</function>.  It now emerges that most versions of
       glibc (Linux's implementation of the C library) have buggy
-      implementations of <function>strxfrm()</> that, in some locales,
+      implementations of <function>strxfrm()</function> that, in some locales,
       can produce string comparison results that do not
-      match <function>strcoll()</>.  Until this problem can be better
-      characterized, disable the optimization in all non-<literal>C</>
-      locales.  (<literal>C</> locale is safe since it uses
-      neither <function>strcoll()</> nor <function>strxfrm()</>.)
+      match <function>strcoll()</function>.  Until this problem can be better
+      characterized, disable the optimization in all non-<literal>C</literal>
+      locales.  (<literal>C</literal> locale is safe since it uses
+      neither <function>strcoll()</function> nor <function>strxfrm()</function>.)
      </para>
 
      <para>
       Unfortunately, this problem affects not only sorting but also entry
       ordering in B-tree indexes, which means that B-tree indexes
-      on <type>text</>, <type>varchar</>, or <type>char</> columns may now
+      on <type>text</type>, <type>varchar</type>, or <type>char</type> columns may now
       be corrupt if they sort according to an affected locale and were
-      built or modified under <productname>PostgreSQL</> 9.5.0 or 9.5.1.
-      Users should <command>REINDEX</> indexes that might be affected.
+      built or modified under <productname>PostgreSQL</productname> 9.5.0 or 9.5.1.
+      Users should <command>REINDEX</command> indexes that might be affected.
      </para>
 
      <para>
       It is not possible at this time to give an exhaustive list of
-      known-affected locales.  <literal>C</> locale is known safe, and
+      known-affected locales.  <literal>C</literal> locale is known safe, and
       there is no evidence of trouble in English-based locales such
-      as <literal>en_US</>, but some other popular locales such
-      as <literal>de_DE</> are affected in most glibc versions.
+      as <literal>en_US</literal>, but some other popular locales such
+      as <literal>de_DE</literal> are affected in most glibc versions.
      </para>
     </listitem>
 
@@ -4619,14 +4907,14 @@ Branch: REL9_5_STABLE [bf78a6f10] 2016-03-28 10:57:46 -0300
     <listitem>
      <para>
       Add must-be-superuser checks to some
-      new <filename>contrib/pageinspect</> functions (Andreas Seltenreich)
+      new <filename>contrib/pageinspect</filename> functions (Andreas Seltenreich)
      </para>
 
      <para>
-      Most functions in the <filename>pageinspect</> extension that
-      inspect <type>bytea</> values disallow calls by non-superusers,
-      but <function>brin_page_type()</> and <function>brin_metapage_info()</>
-      failed to do so.  Passing contrived <type>bytea</> values to them might
+      Most functions in the <filename>pageinspect</filename> extension that
+      inspect <type>bytea</type> values disallow calls by non-superusers,
+      but <function>brin_page_type()</function> and <function>brin_metapage_info()</function>
+      failed to do so.  Passing contrived <type>bytea</type> values to them might
       crash the server or disclose a few bytes of server memory.  Add the
       missing permissions checks to prevent misuse.
       (CVE-2016-3065)
@@ -4641,15 +4929,15 @@ Branch: REL9_5_STABLE [bf7ced5e2] 2016-03-03 09:50:38 +0000
 
     <listitem>
      <para>
-      Fix incorrect handling of indexed <literal>ROW()</> comparisons
+      Fix incorrect handling of indexed <literal>ROW()</literal> comparisons
       (Simon Riggs)
      </para>
 
      <para>
       Flaws in a minor optimization introduced in 9.5 caused incorrect
-      results if the <literal>ROW()</> comparison matches the index ordering
+      results if the <literal>ROW()</literal> comparison matches the index ordering
       partially but not exactly (for example, differing column order, or the
-      index contains both <literal>ASC</> and <literal>DESC</> columns).
+      index contains both <literal>ASC</literal> and <literal>DESC</literal> columns).
       Pending a better solution, the optimization has been removed.
      </para>
     </listitem>
@@ -4667,15 +4955,15 @@ Branch: REL9_1_STABLE [d485d9581] 2016-03-09 14:51:02 -0500
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
@@ -4698,7 +4986,7 @@ Branch: REL9_1_STABLE [d0e47bcd4] 2016-03-09 18:53:54 -0800
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
@@ -4712,14 +5000,14 @@ Branch: REL9_5_STABLE [d8d5a00b1] 2016-03-22 17:56:06 -0400
     <listitem>
      <para>
       Fix incorrect behavior when rechecking a just-modified row in a query
-      that does <command>SELECT FOR UPDATE/SHARE</> and contains some
+      that does <command>SELECT FOR UPDATE/SHARE</command> and contains some
       relations that need not be locked (Tom Lane)
      </para>
 
      <para>
       Rows from non-locked relations were incorrectly treated as containing
       all NULLs during the recheck, which could result in incorrectly
-      deciding that the updated row no longer passes the <literal>WHERE</>
+      deciding that the updated row no longer passes the <literal>WHERE</literal>
       condition, or in incorrectly outputting NULLs.
      </para>
     </listitem>
@@ -4733,7 +5021,7 @@ Branch: REL9_4_STABLE [597e41e45] 2016-03-02 23:31:39 -0500
 
     <listitem>
      <para>
-      Fix bug in <function>json_to_record()</> when a field of its input
+      Fix bug in <function>json_to_record()</function> when a field of its input
       object contains a sub-object with a field name matching one of the
       requested output column names (Tom Lane)
      </para>
@@ -4748,7 +5036,7 @@ Branch: REL9_5_STABLE [68d68ff83] 2016-02-21 10:40:39 -0500
     <listitem>
      <para>
       Fix nonsense result from two-argument form
-      of <function>jsonb_object()</> when called with empty arrays
+      of <function>jsonb_object()</function> when called with empty arrays
       (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
@@ -4761,7 +5049,7 @@ Branch: REL9_5_STABLE [5f95521b3] 2016-03-23 10:43:24 -0400
 
     <listitem>
      <para>
-      Fix misbehavior in <function>jsonb_set()</> when converting a path
+      Fix misbehavior in <function>jsonb_set()</function> when converting a path
       array element into an integer for use as an array subscript
       (Michael Paquier)
      </para>
@@ -4777,7 +5065,7 @@ Branch: REL9_4_STABLE [17a250b18] 2016-03-17 15:50:33 -0400
     <listitem>
      <para>
       Fix misformatting of negative time zone offsets
-      by <function>to_char()</>'s <literal>OF</> format code
+      by <function>to_char()</function>'s <literal>OF</literal> format code
       (Thomas Munro, Tom Lane)
      </para>
     </listitem>
@@ -4791,7 +5079,7 @@ Branch: REL9_5_STABLE [3f14d8d59] 2016-03-15 18:04:48 -0400
     <listitem>
      <para>
       Fix possible incorrect logging of waits done by
-      <command>INSERT ... ON CONFLICT</> (Peter Geoghegan)
+      <command>INSERT ... ON CONFLICT</command> (Peter Geoghegan)
      </para>
 
      <para>
@@ -4815,7 +5103,7 @@ Branch: REL9_4_STABLE [a9613ee69] 2016-03-06 02:43:26 +0900
 
      <para>
       Previously, standby servers would delay application of WAL records in
-      response to <varname>recovery_min_apply_delay</> even while replaying
+      response to <varname>recovery_min_apply_delay</varname> even while replaying
       the initial portion of WAL needed to make their database state valid.
       Since the standby is useless until it's reached a consistent database
       state, this was deemed unhelpful.
@@ -4834,7 +5122,7 @@ Branch: REL9_1_STABLE [ca32f125b] 2016-02-19 08:35:02 +0000
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
@@ -4870,10 +5158,10 @@ Branch: REL9_5_STABLE [f8a75881f] 2016-03-02 23:43:42 -0800
 
      <para>
       Trouble cases included tuples larger than one page when replica
-      identity is <literal>FULL</>, <command>UPDATE</>s that change a
+      identity is <literal>FULL</literal>, <command>UPDATE</command>s that change a
       primary key within a transaction large enough to be spooled to disk,
       incorrect reports of <quote>subxact logged without previous toplevel
-      record</>, and incorrect reporting of a transaction's commit time.
+      record</quote>, and incorrect reporting of a transaction's commit time.
      </para>
     </listitem>
 
@@ -4887,7 +5175,7 @@ Branch: REL9_4_STABLE [9b69d5c1d] 2016-02-29 12:34:33 +0000
     <listitem>
      <para>
       Fix planner error with nested security barrier views when the outer
-      view has a <literal>WHERE</> clause containing a correlated subquery
+      view has a <literal>WHERE</literal> clause containing a correlated subquery
       (Dean Rasheed)
      </para>
     </listitem>
@@ -4916,7 +5204,7 @@ Branch: REL9_1_STABLE [7d6c58aa1] 2016-02-28 23:40:35 -0500
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
@@ -4933,14 +5221,14 @@ Branch: REL9_1_STABLE [fe747b741] 2016-03-06 19:21:03 -0500
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
@@ -4956,7 +5244,7 @@ Branch: REL9_1_STABLE [e56acbe2a] 2016-02-10 19:30:12 -0500
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -5020,7 +5308,7 @@ Branch: REL9_1_STABLE [b4895bf79] 2016-03-04 11:57:40 -0500
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
@@ -5036,12 +5324,12 @@ Branch: REL9_1_STABLE [2d61d88d8] 2016-03-14 11:31:49 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
@@ -5058,8 +5346,8 @@ Branch: REL9_1_STABLE [f97664cf5] 2016-02-10 20:34:48 -0500
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -5083,12 +5371,12 @@ Branch: REL9_1_STABLE [5a39c7395] 2016-03-07 10:41:11 -0500
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
@@ -5105,8 +5393,8 @@ Branch: REL9_1_STABLE [1965a8ce1] 2016-03-16 23:18:08 -0400
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
@@ -5120,7 +5408,7 @@ Branch: REL9_3_STABLE [bf26c4f44] 2016-02-18 18:32:26 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -5178,7 +5466,7 @@ Branch: REL9_1_STABLE [0f359c7de] 2016-02-18 15:40:36 -0500
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
@@ -5195,7 +5483,7 @@ Branch: REL9_1_STABLE [2aa9fd963] 2016-03-19 18:59:41 -0400
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
@@ -5212,7 +5500,7 @@ Branch: REL9_1_STABLE [e5fd35cc5] 2016-03-25 19:03:54 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -5296,7 +5584,7 @@ Branch: REL9_5_STABLE [87dbc72a7] 2016-02-08 11:03:37 +0100
 
     <listitem>
      <para>
-      Avoid pushdown of <literal>HAVING</> clauses when grouping sets are
+      Avoid pushdown of <literal>HAVING</literal> clauses when grouping sets are
       used (Andrew Gierth)
      </para>
     </listitem>
@@ -5309,7 +5597,7 @@ Branch: REL9_5_STABLE [82406d6ff] 2016-02-07 14:57:24 -0500
 
     <listitem>
      <para>
-      Fix deparsing of <literal>ON CONFLICT</> arbiter <literal>WHERE</>
+      Fix deparsing of <literal>ON CONFLICT</literal> arbiter <literal>WHERE</literal>
       clauses (Peter Geoghegan)
      </para>
     </listitem>
@@ -5326,14 +5614,14 @@ Branch: REL9_1_STABLE [b043df093] 2016-01-26 15:38:33 -0500
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -5367,8 +5655,8 @@ Branch: REL9_1_STABLE [ed5f57218] 2016-01-29 10:28:03 +0100
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
@@ -5385,7 +5673,7 @@ Branch: REL9_1_STABLE [b96f6f444] 2016-01-07 11:59:08 -0300
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -5403,7 +5691,7 @@ Branch: REL9_1_STABLE [5108013db] 2016-01-13 18:55:27 -0500
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
@@ -5417,7 +5705,7 @@ Branch: REL9_5_STABLE [1e910cf5b] 2016-01-22 20:04:35 -0300
     <listitem>
      <para>
       Fix improper quoting of domain constraint names
-      in <application>pg_dump</> (Elvis Pranskevichus)
+      in <application>pg_dump</application> (Elvis Pranskevichus)
      </para>
     </listitem>
 
@@ -5433,9 +5721,9 @@ Branch: REL9_1_STABLE [9c704632c] 2016-02-04 00:26:10 -0500
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
@@ -5451,7 +5739,7 @@ Branch: REL9_1_STABLE [4c8b07d3c] 2016-02-03 09:25:34 -0500
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -5465,7 +5753,7 @@ Branch: REL9_5_STABLE [7ef311eb4] 2016-01-05 17:25:12 -0300
 
     <listitem>
      <para>
-      Suppress useless warning message when <application>pg_receivexlog</>
+      Suppress useless warning message when <application>pg_receivexlog</application>
       connects to a pre-9.4 server (Marco Nenciarini)
      </para>
     </listitem>
@@ -5483,15 +5771,15 @@ Branch: REL9_5_STABLE [5ef26b8de] 2016-01-11 20:06:47 -0500
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -5508,7 +5796,7 @@ Branch: REL9_5_STABLE [a66c1fcdd] 2016-01-08 11:39:28 -0500
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
@@ -5525,16 +5813,16 @@ Branch: REL9_1_STABLE [b1f591c50] 2016-02-05 20:23:19 -0500
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
@@ -5551,14 +5839,14 @@ Branch: REL9_4_STABLE [33b26426e] 2016-02-08 11:10:14 +0100
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
@@ -5572,8 +5860,8 @@ Branch: REL9_3_STABLE [1f2b195eb] 2016-02-03 01:39:08 -0500
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -5594,8 +5882,8 @@ Branch: REL9_4_STABLE [2099b911d] 2016-02-04 22:27:47 -0500
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>, fix bugs triggered by use
-      of <literal>tableoid</> in data-modifying commands (Etsuro Fujita,
+      In <filename>contrib/postgres_fdw</filename>, fix bugs triggered by use
+      of <literal>tableoid</literal> in data-modifying commands (Etsuro Fujita,
       Robert Haas)
      </para>
     </listitem>
@@ -5608,7 +5896,7 @@ Branch: REL9_5_STABLE [47acf3add] 2016-01-22 11:53:06 -0500
 
     <listitem>
      <para>
-      Fix ill-advised restriction of <literal>NAMEDATALEN</> to be less
+      Fix ill-advised restriction of <literal>NAMEDATALEN</literal> to be less
       than 256 (Robert Haas, Tom Lane)
      </para>
     </listitem>
@@ -5645,7 +5933,7 @@ Branch: REL9_1_STABLE [b1bc38144] 2016-01-19 23:30:28 -0500
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -5662,7 +5950,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -5685,7 +5973,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.5 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.5 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -5694,31 +5982,31 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Allow <link linkend="sql-on-conflict"><command>INSERT</></>s
+      Allow <link linkend="sql-on-conflict"><command>INSERT</command></link>s
       that would generate constraint conflicts to be turned into
-      <command>UPDATE</>s or ignored
+      <command>UPDATE</command>s or ignored
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>GROUP BY</> analysis features <link
-      linkend="queries-grouping-sets"><literal>GROUPING SETS</></>,
-      <link linkend="queries-grouping-sets"><literal>CUBE</></> and
-      <link linkend="queries-grouping-sets"><literal>ROLLUP</></>
+      Add <literal>GROUP BY</literal> analysis features <link
+      linkend="queries-grouping-sets"><literal>GROUPING SETS</literal></link>,
+      <link linkend="queries-grouping-sets"><literal>CUBE</literal></link> and
+      <link linkend="queries-grouping-sets"><literal>ROLLUP</literal></link>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <link linkend="ddl-rowsecurity">row-level security control</>
+      Add <link linkend="ddl-rowsecurity">row-level security control</link>
      </para>
     </listitem>
 
     <listitem>
      <para>
       Create mechanisms for tracking
-      the <link linkend="replication-origins">progress of replication</>,
+      the <link linkend="replication-origins">progress of replication</link>,
       including methods for identifying the origin of individual changes
       during logical replication
      </para>
@@ -5726,7 +6014,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Add <link linkend="BRIN">Block Range Indexes</> (<acronym>BRIN</>)
+      Add <link linkend="brin">Block Range Indexes</link> (<acronym>BRIN</acronym>)
      </para>
     </listitem>
 
@@ -5772,21 +6060,21 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 2015-03-11 [c6b3c93] Tom Lane: Make operator precedence follow the SQL standar..
 -->
      <para>
-      Adjust <link linkend="sql-precedence">operator precedence</>
-      to match the <acronym>SQL</> standard (Tom Lane)
+      Adjust <link linkend="sql-precedence">operator precedence</link>
+      to match the <acronym>SQL</acronym> standard (Tom Lane)
      </para>
 
      <para>
       The precedence of <literal>&lt;=</literal>, <literal>&gt;=</literal>
       and <literal>&lt;&gt;</literal> has been reduced to match that of
       <literal>&lt;</literal>, <literal>&gt;</literal>
-      and <literal>=</literal>.  The precedence of <literal>IS</> tests
-      (e.g., <replaceable>x</> <literal>IS NULL</>) has been reduced to be
+      and <literal>=</literal>.  The precedence of <literal>IS</literal> tests
+      (e.g., <replaceable>x</replaceable> <literal>IS NULL</literal>) has been reduced to be
       just below these six comparison operators.
-      Also, multi-keyword operators beginning with <literal>NOT</> now have
+      Also, multi-keyword operators beginning with <literal>NOT</literal> now have
       the precedence of their base operator (for example, <literal>NOT
-      BETWEEN</> now has the same precedence as <literal>BETWEEN</>) whereas
-      before they had inconsistent precedence, behaving like <literal>NOT</>
+      BETWEEN</literal> now has the same precedence as <literal>BETWEEN</literal>) whereas
+      before they had inconsistent precedence, behaving like <literal>NOT</literal>
       with respect to their left operand but like their base operator with
       respect to their right operand.  The new configuration
       parameter <xref linkend="guc-operator-precedence-warning"> can be
@@ -5801,7 +6089,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Change <xref linkend="app-pg-ctl">'s default shutdown mode from
-      <literal>smart</> to <literal>fast</> (Bruce Momjian)
+      <literal>smart</literal> to <literal>fast</literal> (Bruce Momjian)
      </para>
 
      <para>
@@ -5816,18 +6104,18 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Use assignment cast behavior for data type conversions
-      in <application>PL/pgSQL</> assignments, rather than converting to and
+      in <application>PL/pgSQL</application> assignments, rather than converting to and
       from text (Tom Lane)
      </para>
 
      <para>
       This change causes conversions of Booleans to strings to
-      produce <literal>true</> or <literal>false</>, not <literal>t</>
-      or <literal>f</>.  Other type conversions may succeed in more cases
-      than before; for example, assigning a numeric value <literal>3.9</> to
+      produce <literal>true</literal> or <literal>false</literal>, not <literal>t</literal>
+      or <literal>f</literal>.  Other type conversions may succeed in more cases
+      than before; for example, assigning a numeric value <literal>3.9</literal> to
       an integer variable will now assign 4 rather than failing.  If no
       assignment-grade cast is defined for the particular source and
-      destination types, <application>PL/pgSQL</> will fall back to its old
+      destination types, <application>PL/pgSQL</application> will fall back to its old
       I/O conversion behavior.
      </para>
     </listitem>
@@ -5838,13 +6126,13 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Allow characters in <link linkend="libpq-connect-options">server
-      command-line options</> to be escaped with a backslash (Andres Freund)
+      command-line options</link> to be escaped with a backslash (Andres Freund)
      </para>
 
      <para>
       Formerly, spaces in the options string always separated options, so
       there was no way to include a space in an option value.  Including
-      a backslash in an option value now requires writing <literal>\\</>.
+      a backslash in an option value now requires writing <literal>\\</literal>.
      </para>
     </listitem>
 
@@ -5854,9 +6142,9 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Change the default value of the GSSAPI <link
-      linkend="gssapi-auth"><varname>include_realm</></> parameter to 1, so
-      that by default the realm is not removed from a <acronym>GSS</>
-      or <acronym>SSPI</> principal name (Stephen Frost)
+      linkend="gssapi-auth"><varname>include_realm</varname></link> parameter to 1, so
+      that by default the realm is not removed from a <acronym>GSS</acronym>
+      or <acronym>SSPI</acronym> principal name (Stephen Frost)
      </para>
     </listitem>
 
@@ -5867,7 +6155,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 2015-06-29 [d661532] Heikki..: Also trigger restartpoints based on max_wal_siz..
 -->
      <para>
-      Replace configuration parameter <varname>checkpoint_segments</>
+      Replace configuration parameter <varname>checkpoint_segments</varname>
       with <xref linkend="guc-min-wal-size">
       and <xref linkend="guc-max-wal-size"> (Heikki Linnakangas)
      </para>
@@ -5889,13 +6177,13 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2014-06-18 [df8b7bc] Tom Lane: Improve our mechanism for controlling the Linux..
 -->
        <para>
-        Control the Linux <acronym>OOM</> killer via new environment
+        Control the Linux <acronym>OOM</acronym> killer via new environment
         variables <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</envar></link>
         and <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</></>,
-        instead of compile-time options <literal>LINUX_OOM_SCORE_ADJ</> and
-        <literal>LINUX_OOM_ADJ</>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</envar></link>,
+        instead of compile-time options <literal>LINUX_OOM_SCORE_ADJ</literal> and
+        <literal>LINUX_OOM_ADJ</literal>
         (Gurjeet Singh)
        </para>
       </listitem>
@@ -5907,7 +6195,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 -->
      <para>
       Decommission server configuration
-      parameter <varname>ssl_renegotiation_limit</>, which was deprecated
+      parameter <varname>ssl_renegotiation_limit</varname>, which was deprecated
       in earlier releases (Andres Freund)
      </para>
 
@@ -5915,8 +6203,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
       While SSL renegotiation is a good idea in theory, it has caused enough
       bugs to be considered a net negative in practice, and it is due to be
       removed from future versions of the relevant standards.  We have
-      therefore removed support for it from <productname>PostgreSQL</>.
-      The <varname>ssl_renegotiation_limit</> parameter still exists, but
+      therefore removed support for it from <productname>PostgreSQL</productname>.
+      The <varname>ssl_renegotiation_limit</varname> parameter still exists, but
       cannot be set to anything but zero (disabled).  It's not documented
       anymore, either.
      </para>
@@ -5927,7 +6215,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2014-11-05 [525a489] Tom Lane: Remove the last vestige of server-side autocomm..
 -->
      <para>
-      Remove server configuration parameter <varname>autocommit</>, which
+      Remove server configuration parameter <varname>autocommit</varname>, which
       was already deprecated and non-operational (Tom Lane)
      </para>
     </listitem>
@@ -5937,8 +6225,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-03-06 [bb8582a] Peter ..: Remove rolcatupdate
 -->
      <para>
-      Remove the <link linkend="catalog-pg-authid"><structname>pg_authid</></>
-      catalog's <structfield>rolcatupdate</> field, as it had no usefulness
+      Remove the <link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>
+      catalog's <structfield>rolcatupdate</structfield> field, as it had no usefulness
       (Adam Brightwell)
      </para>
     </listitem>
@@ -5949,8 +6237,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 -->
      <para>
       The <link
-      linkend="monitoring-stats-views-table"><structname>pg_stat_replication</></link>
-      system view's <structfield>sent</> field is now NULL, not zero, when
+      linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
+      system view's <structfield>sent</structfield> field is now NULL, not zero, when
       it has no valid value (Magnus Hagander)
      </para>
     </listitem>
@@ -5960,13 +6248,13 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-07-17 [89ddd29] Andrew..: Support JSON negative array subscripts everywh..
 -->
      <para>
-      Allow <type>json</> and <type>jsonb</> array extraction operators to
+      Allow <type>json</type> and <type>jsonb</type> array extraction operators to
       accept negative subscripts, which count from the end of JSON arrays
       (Peter Geoghegan, Andrew Dunstan)
      </para>
 
      <para>
-      Previously, these operators returned <literal>NULL</> for negative
+      Previously, these operators returned <literal>NULL</literal> for negative
       subscripts.
      </para>
     </listitem>
@@ -5999,12 +6287,12 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-05-15 [b0b7be6] Alvaro..: Add BRIN infrastructure for "inclusion" opclasses
 -->
        <para>
-        Add <link linkend="BRIN">Block Range Indexes</> (<acronym>BRIN</>)
+        Add <link linkend="brin">Block Range Indexes</link> (<acronym>BRIN</acronym>)
         (&Aacute;lvaro Herrera)
        </para>
 
        <para>
-        <acronym>BRIN</> indexes store only summary data (such as minimum
+        <acronym>BRIN</acronym> indexes store only summary data (such as minimum
         and maximum values) for ranges of heap blocks.  They are therefore
         very compact and cheap to update; but if the data is naturally
         clustered, they can still provide substantial speedup of searches.
@@ -6018,7 +6306,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
        <para>
         Allow queries to perform accurate distance filtering of
         bounding-box-indexed objects (polygons, circles) using <link
-        linkend="GiST">GiST</> indexes (Alexander Korotkov, Heikki
+        linkend="gist">GiST</link> indexes (Alexander Korotkov, Heikki
         Linnakangas)
        </para>
 
@@ -6038,7 +6326,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-03-30 [0633a60] Heikki..: Add index-only scan support to range type GiST ..
 -->
        <para>
-        Allow <link linkend="GiST">GiST</> indexes to perform index-only
+        Allow <link linkend="gist">GiST</link> indexes to perform index-only
         scans (Anastasia Lubennikova, Heikki Linnakangas, Andreas Karlsson)
        </para>
       </listitem>
@@ -6049,14 +6337,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add configuration parameter <xref linkend="guc-gin-pending-list-limit">
-        to control the size of <acronym>GIN</> pending lists (Fujii Masao)
+        to control the size of <acronym>GIN</acronym> pending lists (Fujii Masao)
        </para>
 
        <para>
         This value can also be set on a per-index basis as an index storage
         parameter.  Previously the pending-list size was controlled
         by <xref linkend="guc-work-mem">, which was awkward because
-        appropriate values for <varname>work_mem</> are often much too large
+        appropriate values for <varname>work_mem</varname> are often much too large
         for this purpose.
        </para>
       </listitem>
@@ -6067,7 +6355,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Issue a warning during the creation of <link
-        linkend="indexes-types">hash</> indexes because they are not
+        linkend="indexes-types">hash</link> indexes because they are not
         crash-safe (Bruce Momjian)
        </para>
       </listitem>
@@ -6088,8 +6376,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-13 [78efd5c] Robert..: Extend abbreviated key infrastructure to datum ..
 -->
        <para>
-        Improve the speed of sorting of <type>varchar</>, <type>text</>,
-        and <type>numeric</> fields via <quote>abbreviated</> keys
+        Improve the speed of sorting of <type>varchar</type>, <type>text</type>,
+        and <type>numeric</type> fields via <quote>abbreviated</quote> keys
         (Peter Geoghegan, Andrew Gierth, Robert Haas)
        </para>
       </listitem>
@@ -6101,8 +6389,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Extend the infrastructure that allows sorting to be performed by
         inlined, non-<acronym>SQL</acronym>-callable comparison functions to
-        cover <command>CREATE INDEX</>, <command>REINDEX</>, and
-        <command>CLUSTER</> (Peter Geoghegan)
+        cover <command>CREATE INDEX</command>, <command>REINDEX</command>, and
+        <command>CLUSTER</command> (Peter Geoghegan)
        </para>
       </listitem>
 
@@ -6163,7 +6451,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
        <para>
         This particularly addresses scalability problems when running on
-        systems with multiple <acronym>CPU</> sockets.
+        systems with multiple <acronym>CPU</acronym> sockets.
        </para>
       </listitem>
 
@@ -6183,7 +6471,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow pushdown of query restrictions into subqueries with <link
-        linkend="tutorial-window">window functions</>, where appropriate
+        linkend="tutorial-window">window functions</link>, where appropriate
         (David Rowley)
        </para>
       </listitem>
@@ -6206,7 +6494,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Teach the planner to use statistics obtained from an expression
         index on a boolean-returning function, when a matching function call
-        appears in <literal>WHERE</> (Tom Lane)
+        appears in <literal>WHERE</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -6215,7 +6503,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-09-23 [cfb2024] Tom Lane: Make ANALYZE compute basic statistics even for..
 -->
        <para>
-        Make <command>ANALYZE</> compute basic statistics (null fraction and
+        Make <command>ANALYZE</command> compute basic statistics (null fraction and
         average column width) even for columns whose data type lacks an
         equality function (Oleksandr Shulgin)
        </para>
@@ -6229,7 +6517,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
 -->
        <para>
-        Speed up <acronym>CRC</> (cyclic redundancy check) computations
+        Speed up <acronym>CRC</acronym> (cyclic redundancy check) computations
         and switch to CRC-32C (Abhijit Menon-Sen, Heikki Linnakangas)
        </para>
       </listitem>
@@ -6249,7 +6537,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-01 [9f03ca9] Robert..: Avoid copying index tuples when building an ind..
 -->
        <para>
-        Speed up <command>CREATE INDEX</> by avoiding unnecessary memory
+        Speed up <command>CREATE INDEX</command> by avoiding unnecessary memory
         copies (Robert Haas)
        </para>
       </listitem>
@@ -6283,7 +6571,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add per-table autovacuum logging control via new
-        <varname>log_autovacuum_min_duration</> storage parameter
+        <varname>log_autovacuum_min_duration</varname> storage parameter
         (Michael Paquier)
        </para>
       </listitem>
@@ -6299,7 +6587,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
        <para>
         This string, typically set in <link
-        linkend="config-setting-configuration-file"><filename>postgresql.conf</></>,
+        linkend="config-setting-configuration-file"><filename>postgresql.conf</filename></link>,
         allows clients to identify the cluster.  This name also appears
         in the process title of all server processes, allowing for easier
         identification of processes belonging to the same cluster.
@@ -6321,7 +6609,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><acronym>SSL</></title>
+     <title><acronym>SSL</acronym></title>
 
      <itemizedlist>
 
@@ -6331,13 +6619,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Check <link linkend="libpq-ssl"><quote>Subject Alternative
-        Names</></> in <acronym>SSL</> server certificates, if present
+        Names</quote></link> in <acronym>SSL</acronym> server certificates, if present
         (Alexey Klyukin)
        </para>
 
        <para>
         When they are present, this replaces checks against the certificate's
-        <quote>Common Name</>.
+        <quote>Common Name</quote>.
        </para>
       </listitem>
 
@@ -6347,8 +6635,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add system view <link
-        linkend="pg-stat-ssl-view"><structname>pg_stat_ssl</></> to report
-        <acronym>SSL</> connection information (Magnus Hagander)
+        linkend="pg-stat-ssl-view"><structname>pg_stat_ssl</structname></link> to report
+        <acronym>SSL</acronym> connection information (Magnus Hagander)
        </para>
       </listitem>
 
@@ -6357,22 +6645,22 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-03 [91fa7b4] Heikki..: Add API functions to libpq to interrogate SSL ..
 -->
        <para>
-        Add <application>libpq</> functions to return <acronym>SSL</>
+        Add <application>libpq</application> functions to return <acronym>SSL</acronym>
         information in an implementation-independent way (Heikki Linnakangas)
        </para>
 
        <para>
-        While <link linkend="libpq-pqgetssl"><function>PQgetssl()</></> can
-        still be used to call <productname>OpenSSL</> functions, it is now
+        While <link linkend="libpq-pqgetssl"><function>PQgetssl()</function></link> can
+        still be used to call <productname>OpenSSL</productname> functions, it is now
         considered deprecated because future versions
-        of <application>libpq</> might support other <acronym>SSL</>
+        of <application>libpq</application> might support other <acronym>SSL</acronym>
         implementations.  When possible, use the new
         functions <link
-        linkend="libpq-pqsslattribute"><function>PQsslAttribute()</></>, <link
-        linkend="libpq-pqsslattributenames"><function>PQsslAttributeNames()</></>,
-        and <link linkend="libpq-pqsslinuse"><function>PQsslInUse()</></>
-        to obtain <acronym>SSL</> information in
-        an <acronym>SSL</>-implementation-independent way.
+        linkend="libpq-pqsslattribute"><function>PQsslAttribute()</function></link>, <link
+        linkend="libpq-pqsslattributenames"><function>PQsslAttributeNames()</function></link>,
+        and <link linkend="libpq-pqsslinuse"><function>PQsslInUse()</function></link>
+        to obtain <acronym>SSL</acronym> information in
+        an <acronym>SSL</acronym>-implementation-independent way.
        </para>
       </listitem>
 
@@ -6381,7 +6669,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [8a0d34e4] Peter ..: libpq: Don't overwrite existing OpenSSL thread..
 -->
        <para>
-        Make <application>libpq</> honor any <productname>OpenSSL</>
+        Make <application>libpq</application> honor any <productname>OpenSSL</productname>
         thread callbacks (Jan Urbanski)
        </para>
 
@@ -6406,20 +6694,20 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-29 [d661532] Heikki..: Also trigger restartpoints based on max_wal_siz..
 -->
        <para>
-        Replace configuration parameter <varname>checkpoint_segments</>
+        Replace configuration parameter <varname>checkpoint_segments</varname>
         with <xref linkend="guc-min-wal-size">
         and <xref linkend="guc-max-wal-size"> (Heikki Linnakangas)
        </para>
 
        <para>
-        This change allows the allocation of a large number of <acronym>WAL</>
+        This change allows the allocation of a large number of <acronym>WAL</acronym>
         files without keeping them after they are no longer needed.
-        Therefore the default for <varname>max_wal_size</> has been set
-        to <literal>1GB</>, much larger than the old default
-        for <varname>checkpoint_segments</>.
+        Therefore the default for <varname>max_wal_size</varname> has been set
+        to <literal>1GB</literal>, much larger than the old default
+        for <varname>checkpoint_segments</varname>.
         Also note that standby servers perform restartpoints to try to limit
-        their WAL space consumption to <varname>max_wal_size</>; previously
-        they did not pay any attention to <varname>checkpoint_segments</>.
+        their WAL space consumption to <varname>max_wal_size</varname>; previously
+        they did not pay any attention to <varname>checkpoint_segments</varname>.
        </para>
       </listitem>
 
@@ -6428,18 +6716,18 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-18 [df8b7bc] Tom Lane: Improve our mechanism for controlling the Linux..
 -->
        <para>
-        Control the Linux <acronym>OOM</> killer via new environment
+        Control the Linux <acronym>OOM</acronym> killer via new environment
         variables <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</envar></link>
         and <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</envar></link>
         (Gurjeet Singh)
        </para>
 
        <para>
-        The previous <acronym>OOM</> control infrastructure involved
-        compile-time options <literal>LINUX_OOM_SCORE_ADJ</> and
-        <literal>LINUX_OOM_ADJ</>, which are no longer supported.
+        The previous <acronym>OOM</acronym> control infrastructure involved
+        compile-time options <literal>LINUX_OOM_SCORE_ADJ</literal> and
+        <literal>LINUX_OOM_ADJ</literal>, which are no longer supported.
         The new behavior is available in all builds.
        </para>
       </listitem>
@@ -6457,8 +6745,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
        <para>
         Time stamp information can be accessed using functions <link
-        linkend="functions-commit-timestamp"><function>pg_xact_commit_timestamp()</></>
-        and <function>pg_last_committed_xact()</>.
+        linkend="functions-commit-timestamp"><function>pg_xact_commit_timestamp()</function></link>
+        and <function>pg_last_committed_xact()</function>.
        </para>
       </listitem>
 
@@ -6468,7 +6756,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow <xref linkend="guc-local-preload-libraries"> to be set
-        by <command>ALTER ROLE SET</> (Peter Eisentraut, Kyotaro Horiguchi)
+        by <command>ALTER ROLE SET</command> (Peter Eisentraut, Kyotaro Horiguchi)
        </para>
       </listitem>
 
@@ -6477,7 +6765,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-03 [a75fb9b] Alvaro..: Have autovacuum workers listen to SIGHUP, too
 -->
        <para>
-        Allow <link linkend="autovacuum">autovacuum workers</>
+        Allow <link linkend="autovacuum">autovacuum workers</link>
         to respond to configuration parameter changes during a run
         (Michael Paquier)
        </para>
@@ -6496,7 +6784,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         This means that assertions can no longer be turned
         off if they were enabled at compile time, allowing for more
         efficient code optimization.  This change also removes the <link
-        linkend="app-postgres-options">postgres</> <option>-A</> option.
+        linkend="app-postgres-options">postgres</link> <option>-A</option> option.
        </para>
       </listitem>
 
@@ -6517,7 +6805,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add system view <link
-        linkend="view-pg-file-settings"><structname>pg_file_settings</></>
+        linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link>
         to show the contents of the server's configuration files
         (Sawada Masahiko)
        </para>
@@ -6528,8 +6816,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-14 [a486e35] Peter ..: Add pg_settings.pending_restart column
 -->
        <para>
-        Add <structname>pending_restart</> to the system view <link
-        linkend="view-pg-settings"><structname>pg_settings</></> to
+        Add <structname>pending_restart</structname> to the system view <link
+        linkend="view-pg-settings"><structname>pg_settings</structname></link> to
         indicate a change has been made but will not take effect until a
         database restart (Peter Eisentraut)
        </para>
@@ -6540,14 +6828,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-02 [bd3b7a9] Fujii ..: Support ALTER SYSTEM RESET command.
 -->
        <para>
-        Allow <link linkend="SQL-ALTERSYSTEM"><command>ALTER SYSTEM</></>
-        values to be reset with <command>ALTER SYSTEM RESET</> (Vik
+        Allow <link linkend="sql-altersystem"><command>ALTER SYSTEM</command></link>
+        values to be reset with <command>ALTER SYSTEM RESET</command> (Vik
         Fearing)
        </para>
 
        <para>
         This command removes the specified setting
-        from <filename>postgresql.auto.conf</>.
+        from <filename>postgresql.auto.conf</filename>.
        </para>
       </listitem>
 
@@ -6568,7 +6856,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Create mechanisms for tracking
-        the <link linkend="replication-origins">progress of replication</>,
+        the <link linkend="replication-origins">progress of replication</link>,
         including methods for identifying the origin of individual changes
         during logical replication (Andres Freund)
        </para>
@@ -6600,14 +6888,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-15 [51c11a7] Andres..: Remove pause_at_recovery_target recovery.conf s..
 -->
        <para>
-        Add <link linkend="recovery-config"><filename>recovery.conf</></>
+        Add <link linkend="recovery-config"><filename>recovery.conf</filename></link>
         parameter <link
-        linkend="recovery-target-action"><varname>recovery_target_action</></>
+        linkend="recovery-target-action"><varname>recovery_target_action</varname></link>
         to control post-recovery activity (Petr Jel&iacute;nek)
        </para>
 
        <para>
-        This replaces the old parameter <varname>pause_at_recovery_target</>.
+        This replaces the old parameter <varname>pause_at_recovery_target</varname>.
        </para>
       </listitem>
 
@@ -6617,8 +6905,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add new <xref linkend="guc-archive-mode"> value
-        <literal>always</> to allow standbys to always archive received
-        <acronym>WAL</> files (Fujii Masao)
+        <literal>always</literal> to allow standbys to always archive received
+        <acronym>WAL</acronym> files (Fujii Masao)
        </para>
       </listitem>
 
@@ -6629,7 +6917,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Add configuration
         parameter <xref linkend="guc-wal-retrieve-retry-interval"> to
-        control <acronym>WAL</> read retry after failure
+        control <acronym>WAL</acronym> read retry after failure
         (Alexey Vasiliev, Michael Paquier)
        </para>
 
@@ -6643,7 +6931,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-11 [57aa5b2] Fujii ..: Add GUC to enable compression of full page imag..
 -->
        <para>
-        Allow compression of full-page images stored in <acronym>WAL</>
+        Allow compression of full-page images stored in <acronym>WAL</acronym>
         (Rahila Syed, Michael Paquier)
        </para>
 
@@ -6660,7 +6948,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-08 [de76884] Heikki..: At promotion, archive last segment from old tim..
 -->
        <para>
-        Archive <acronym>WAL</> files with suffix <literal>.partial</>
+        Archive <acronym>WAL</acronym> files with suffix <literal>.partial</literal>
         during standby promotion (Heikki Linnakangas)
        </para>
       </listitem>
@@ -6677,9 +6965,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
        <para>
         By default, replication commands, e.g. <link
-        linkend="protocol-replication"><literal>IDENTIFY_SYSTEM</></>,
+        linkend="protocol-replication"><literal>IDENTIFY_SYSTEM</literal></link>,
         are not logged, even when <xref linkend="guc-log-statement"> is set
-        to <literal>all</>.
+        to <literal>all</literal>.
        </para>
       </listitem>
 
@@ -6689,12 +6977,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Report the processes holding replication slots in <link
-        linkend="view-pg-replication-slots"><structname>pg_replication_slots</></>
+        linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
         (Craig Ringer)
        </para>
 
        <para>
-        The new output column is <structname>active_pid</>.
+        The new output column is <structname>active_pid</structname>.
        </para>
       </listitem>
 
@@ -6703,9 +6991,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-25 [b3fc672] Heikki..: Allow using connection URI in primary_conninfo.
 -->
        <para>
-        Allow <filename>recovery.conf</>'s <link
-        linkend="primary-conninfo"><varname>primary_conninfo</></> setting to
-        use connection <acronym>URI</>s, e.g. <literal>postgres://</>
+        Allow <filename>recovery.conf</filename>'s <link
+        linkend="primary-conninfo"><varname>primary_conninfo</varname></link> setting to
+        use connection <acronym>URI</acronym>s, e.g. <literal>postgres://</literal>
         (Alexander Shulgin)
        </para>
       </listitem>
@@ -6725,16 +7013,16 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-08 [2c8f483] Andres..: Represent columns requiring insert and update p..
 -->
        <para>
-        Allow <link linkend="sql-on-conflict"><command>INSERT</></>s
+        Allow <link linkend="sql-on-conflict"><command>INSERT</command></link>s
         that would generate constraint conflicts to be turned into
-        <command>UPDATE</>s or ignored (Peter Geoghegan, Heikki
+        <command>UPDATE</command>s or ignored (Peter Geoghegan, Heikki
         Linnakangas, Andres Freund)
        </para>
 
        <para>
-        The syntax is <command>INSERT ... ON CONFLICT DO NOTHING/UPDATE</>.
+        The syntax is <command>INSERT ... ON CONFLICT DO NOTHING/UPDATE</command>.
         This is the Postgres implementation of the popular
-        <command>UPSERT</> command.
+        <command>UPSERT</command> command.
        </para>
       </listitem>
 
@@ -6743,10 +7031,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-16 [f3d3118] Andres..: Support GROUPING SETS, CUBE and ROLLUP.
 -->
        <para>
-        Add <literal>GROUP BY</> analysis features <link
-        linkend="queries-grouping-sets"><literal>GROUPING SETS</></>,
-        <link linkend="queries-grouping-sets"><literal>CUBE</></> and
-        <link linkend="queries-grouping-sets"><literal>ROLLUP</></>
+        Add <literal>GROUP BY</literal> analysis features <link
+        linkend="queries-grouping-sets"><literal>GROUPING SETS</literal></link>,
+        <link linkend="queries-grouping-sets"><literal>CUBE</literal></link> and
+        <link linkend="queries-grouping-sets"><literal>ROLLUP</literal></link>
         (Andrew Gierth, Atri Sharma)
        </para>
       </listitem>
@@ -6757,13 +7045,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow setting multiple target columns in
-        an <link linkend="SQL-UPDATE"><command>UPDATE</></> from the result of
+        an <link linkend="sql-update"><command>UPDATE</command></link> from the result of
         a single sub-SELECT (Tom Lane)
        </para>
 
        <para>
         This is accomplished using the syntax <command>UPDATE tab SET
-        (col1, col2, ...) = (SELECT ...)</>.
+        (col1, col2, ...) = (SELECT ...)</command>.
        </para>
       </listitem>
 
@@ -6772,13 +7060,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-07 [df630b0] Alvaro..: Implement SKIP LOCKED for row-level locks
 -->
        <para>
-        Add <link linkend="SQL-SELECT"><command>SELECT</></> option
-        <literal>SKIP LOCKED</> to skip locked rows (Thomas Munro)
+        Add <link linkend="sql-select"><command>SELECT</command></link> option
+        <literal>SKIP LOCKED</literal> to skip locked rows (Thomas Munro)
        </para>
 
        <para>
         This does not throw an error for locked rows like
-        <literal>NOWAIT</> does.
+        <literal>NOWAIT</literal> does.
        </para>
       </listitem>
 
@@ -6787,8 +7075,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [f6d208d] Simon ..: TABLESAMPLE, SQL Standard and extensible
 -->
        <para>
-        Add <link linkend="SQL-SELECT"><command>SELECT</></> option
-        <literal>TABLESAMPLE</> to return a subset of a table (Petr
+        Add <link linkend="sql-select"><command>SELECT</command></link> option
+        <literal>TABLESAMPLE</literal> to return a subset of a table (Petr
         Jel&iacute;nek)
        </para>
 
@@ -6796,7 +7084,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         This feature supports the SQL-standard table sampling methods.
         In addition, there are provisions
         for <link linkend="tablesample-method">user-defined
-        table sampling methods</>.
+        table sampling methods</link>.
        </para>
       </listitem>
 
@@ -6825,13 +7113,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add more details about sort ordering in <link
-        linkend="SQL-EXPLAIN"><command>EXPLAIN</></> output (Marius Timmer,
+        linkend="sql-explain"><command>EXPLAIN</command></link> output (Marius Timmer,
         Lukas Kreft, Arne Scheffer)
        </para>
 
        <para>
-        Details include <literal>COLLATE</>, <literal>DESC</>,
-        <literal>USING</>, and <literal>NULLS FIRST</><literal>/LAST</>.
+        Details include <literal>COLLATE</literal>, <literal>DESC</literal>,
+        <literal>USING</literal>, and <literal>NULLS FIRST</literal><literal>/LAST</literal>.
        </para>
       </listitem>
 
@@ -6840,7 +7128,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-18 [35192f0] Alvaro..: Have VACUUM log number of skipped pages due to ..
 -->
        <para>
-        Make <link linkend="SQL-VACUUM"><command>VACUUM</></> log the
+        Make <link linkend="sql-vacuum"><command>VACUUM</command></link> log the
         number of pages skipped due to pins (Jim Nasby)
        </para>
       </listitem>
@@ -6850,15 +7138,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-20 [d42358e] Alvaro..: Have TRUNCATE update pgstat tuple counters
 -->
        <para>
-        Make <link linkend="SQL-TRUNCATE"><command>TRUNCATE</></> properly
-        update the <literal>pg_stat</>* tuple counters (Alexander Shulgin)
+        Make <link linkend="sql-truncate"><command>TRUNCATE</command></link> properly
+        update the <literal>pg_stat</literal>* tuple counters (Alexander Shulgin)
        </para>
       </listitem>
 
        </itemizedlist>
 
        <sect4>
-        <title><xref linkend="SQL-REINDEX"></title>
+        <title><xref linkend="sql-reindex"></title>
 
         <itemizedlist>
 
@@ -6867,8 +7155,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-09 [fe263d1] Simon ..: REINDEX SCHEMA
 -->
        <para>
-        Allow <command>REINDEX</> to reindex an entire schema using the
-        <literal>SCHEMA</> option (Sawada Masahiko)
+        Allow <command>REINDEX</command> to reindex an entire schema using the
+        <literal>SCHEMA</literal> option (Sawada Masahiko)
        </para>
       </listitem>
 
@@ -6877,7 +7165,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [ecd222e] Fujii ..: Support VERBOSE option in REINDEX command.
 -->
        <para>
-        Add <literal>VERBOSE</> option to <command>REINDEX</> (Sawada
+        Add <literal>VERBOSE</literal> option to <command>REINDEX</command> (Sawada
         Masahiko)
        </para>
       </listitem>
@@ -6887,8 +7175,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-09 [ae4e688] Simon ..: Silence REINDEX
 -->
        <para>
-        Prevent <command>REINDEX DATABASE</> and <command>SCHEMA</>
-        from outputting object names, unless <literal>VERBOSE</> is used
+        Prevent <command>REINDEX DATABASE</command> and <command>SCHEMA</command>
+        from outputting object names, unless <literal>VERBOSE</literal> is used
         (Simon Riggs)
        </para>
       </listitem>
@@ -6898,7 +7186,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [17d436d] Fujii ..: Remove obsolete FORCE option from REINDEX.
 -->
        <para>
-        Remove obsolete <literal>FORCE</> option from <command>REINDEX</>
+        Remove obsolete <literal>FORCE</literal> option from <command>REINDEX</command>
         (Fujii Masao)
        </para>
       </listitem>
@@ -6918,7 +7206,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-19 [491c029] Stephe..: Row-Level Security Policies (RLS)
 -->
        <para>
-        Add  <link linkend="ddl-rowsecurity">row-level security control</>
+        Add  <link linkend="ddl-rowsecurity">row-level security control</link>
         (Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean Rasheed,
         Stephen Frost)
        </para>
@@ -6926,11 +7214,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         This feature allows row-by-row control over which users can add,
         modify, or even see rows in a table.  This is controlled by new
-        commands <link linkend="SQL-CREATEPOLICY"><command>CREATE</></>/<link
-        linkend="SQL-ALTERPOLICY"><command>ALTER</></>/<link
-        linkend="SQL-DROPPOLICY"><command>DROP POLICY</></> and <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... ENABLE/DISABLE
-        ROW SECURITY</></>.
+        commands <link linkend="sql-createpolicy"><command>CREATE</command></link>/<link
+        linkend="sql-alterpolicy"><command>ALTER</command></link>/<link
+        linkend="sql-droppolicy"><command>DROP POLICY</command></link> and <link
+        linkend="sql-altertable"><command>ALTER TABLE ... ENABLE/DISABLE
+        ROW SECURITY</command></link>.
        </para>
       </listitem>
 
@@ -6941,8 +7229,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Allow changing of the <acronym>WAL</acronym>
         logging status of a table after creation with <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... SET LOGGED /
-        UNLOGGED</></> (Fabr&iacute;zio de Royes Mello)
+        linkend="sql-altertable"><command>ALTER TABLE ... SET LOGGED /
+        UNLOGGED</command></link> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6953,12 +7241,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-13 [e39b6f9] Andrew..: Add CINE option for CREATE TABLE AS and CREATE ..
 -->
        <para>
-        Add <literal>IF NOT EXISTS</> clause to <link
-        linkend="SQL-CREATETABLEAS"><command>CREATE TABLE AS</></>,
-        <link linkend="SQL-CREATEINDEX"><command>CREATE INDEX</></>,
-        <link linkend="SQL-CREATESEQUENCE"><command>CREATE SEQUENCE</></>,
-        and <link linkend="SQL-CREATEMATERIALIZEDVIEW"><command>CREATE
-        MATERIALIZED VIEW</></> (Fabr&iacute;zio de Royes Mello)
+        Add <literal>IF NOT EXISTS</literal> clause to <link
+        linkend="sql-createtableas"><command>CREATE TABLE AS</command></link>,
+        <link linkend="sql-createindex"><command>CREATE INDEX</command></link>,
+        <link linkend="sql-createsequence"><command>CREATE SEQUENCE</command></link>,
+        and <link linkend="sql-creatematerializedview"><command>CREATE
+        MATERIALIZED VIEW</command></link> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6967,9 +7255,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-24 [1d8198b] Bruce ..: Add support for ALTER TABLE IF EXISTS ... RENAM..
 -->
        <para>
-        Add support for <literal>IF EXISTS</> to <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... RENAME
-        CONSTRAINT</></> (Bruce Momjian)
+        Add support for <literal>IF EXISTS</literal> to <link
+        linkend="sql-altertable"><command>ALTER TABLE ... RENAME
+        CONSTRAINT</command></link> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -6978,17 +7266,17 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-09 [31eae60] Alvaro..: Allow CURRENT/SESSION_USER to be used in certai..
 -->
        <para>
-        Allow some DDL commands to accept <literal>CURRENT_USER</>
-        or <literal>SESSION_USER</>, meaning the current user or session
+        Allow some DDL commands to accept <literal>CURRENT_USER</literal>
+        or <literal>SESSION_USER</literal>, meaning the current user or session
         user, in place of a specific user name (Kyotaro Horiguchi,
         &Aacute;lvaro Herrera)
        </para>
 
        <para>
         This feature is now supported in
-        <xref linkend="SQL-ALTERUSER">, <xref linkend="SQL-ALTERGROUP">,
-        <xref linkend="SQL-ALTERROLE">, <xref linkend="SQL-GRANT">,
-        and <command>ALTER <replaceable>object</> OWNER TO</> commands.
+        <xref linkend="sql-alteruser">, <xref linkend="sql-altergroup">,
+        <xref linkend="sql-alterrole">, <xref linkend="sql-grant">,
+        and <command>ALTER <replaceable>object</replaceable> OWNER TO</command> commands.
        </para>
       </listitem>
 
@@ -6997,8 +7285,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-23 [7eca575] Alvaro..: get_object_address: separate domain constraints..
 -->
        <para>
-        Support comments on <link linkend="SQL-CREATEDOMAIN">domain
-        constraints</> (&Aacute;lvaro Herrera)
+        Support comments on <link linkend="sql-createdomain">domain
+        constraints</link> (&Aacute;lvaro Herrera)
        </para>
       </listitem>
 
@@ -7017,14 +7305,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-11 [fa26424] Stephe..: Allow LOCK TABLE .. ROW EXCLUSIVE MODE with IN..
 -->
        <para>
-        Allow <link linkend="SQL-LOCK"><command>LOCK TABLE ... ROW EXCLUSIVE
-        MODE</></> for those with <command>INSERT</> privileges on the
+        Allow <link linkend="sql-lock"><command>LOCK TABLE ... ROW EXCLUSIVE
+        MODE</command></link> for those with <command>INSERT</command> privileges on the
         target table (Stephen Frost)
        </para>
 
        <para>
-        Previously this command required <command>UPDATE</>, <command>DELETE</>,
-        or <command>TRUNCATE</> privileges.
+        Previously this command required <command>UPDATE</command>, <command>DELETE</command>,
+        or <command>TRUNCATE</command> privileges.
        </para>
       </listitem>
 
@@ -7033,7 +7321,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-23 [e5f455f] Tom Lane: Apply table and domain CHECK constraints in nam.
 -->
        <para>
-        Apply table and domain <literal>CHECK</> constraints in order by name
+        Apply table and domain <literal>CHECK</literal> constraints in order by name
         (Tom Lane)
        </para>
 
@@ -7049,16 +7337,16 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow <link
-        linkend="SQL-CREATEDATABASE"><command>CREATE</></>/<link
-        linkend="SQL-ALTERDATABASE"><command>ALTER DATABASE</></>
-        to manipulate <structname>datistemplate</> and
-        <structname>datallowconn</> (Vik Fearing)
+        linkend="sql-createdatabase"><command>CREATE</command></link>/<link
+        linkend="sql-alterdatabase"><command>ALTER DATABASE</command></link>
+        to manipulate <structname>datistemplate</structname> and
+        <structname>datallowconn</structname> (Vik Fearing)
        </para>
 
        <para>
         This allows these per-database settings to be
         changed without manually modifying the <link
-        linkend="catalog-pg-database"><structname>pg_database</></>
+        linkend="catalog-pg-database"><structname>pg_database</structname></link>
         system catalog.
        </para>
       </listitem>
@@ -7075,7 +7363,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-10 [59efda3] Tom Lane: Implement IMPORT FOREIGN SCHEMA.
 -->
        <para>
-        Add support for <xref linkend="SQL-IMPORTFOREIGNSCHEMA">
+        Add support for <xref linkend="sql-importforeignschema">
         (Ronan Dunklau, Michael Paquier, Tom Lane)
        </para>
 
@@ -7090,7 +7378,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-17 [fc2ac1f] Tom Lane: Allow CHECK constraints to be placed on foreign..
 -->
        <para>
-        Allow <literal>CHECK</> constraints to be placed on foreign tables
+        Allow <literal>CHECK</literal> constraints to be placed on foreign tables
         (Shigeru Hanada, Etsuro Fujita)
        </para>
 
@@ -7099,7 +7387,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         and are not enforced locally.  However, they are assumed to hold for
         purposes of query optimization, such
         as <link linkend="ddl-partitioning-constraint-exclusion">constraint
-        exclusion</>.
+        exclusion</link>.
        </para>
       </listitem>
 
@@ -7115,7 +7403,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         To let this work naturally, foreign tables are now allowed to have
         check constraints marked as not valid, and to set storage
-        and <type>OID</> characteristics, even though these operations are
+        and <type>OID</type> characteristics, even though these operations are
         effectively no-ops for a foreign table.
        </para>
       </listitem>
@@ -7145,14 +7433,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-11 [b488c58] Alvaro..: Allow on-the-fly capture of DDL event details
 -->
         <para>
-         Whenever a <literal>ddl_command_end</> event trigger is installed,
-         capture details of <acronym>DDL</> activity for it to inspect
+         Whenever a <literal>ddl_command_end</literal> event trigger is installed,
+         capture details of <acronym>DDL</acronym> activity for it to inspect
          (&Aacute;lvaro Herrera)
         </para>
 
         <para>
          This information is available through a set-returning function <link
-         linkend="pg-event-trigger-ddl-command-end-functions"><function>pg_event_trigger_ddl_commands()</></link>,
+         linkend="pg-event-trigger-ddl-command-end-functions"><function>pg_event_trigger_ddl_commands()</function></link>,
          or by inspection of C data structures if that function doesn't
          provide enough detail.
         </para>
@@ -7164,7 +7452,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Allow event triggers on table rewrites caused by <link
-         linkend="SQL-ALTERTABLE"><command>ALTER TABLE</></> (Dimitri
+         linkend="sql-altertable"><command>ALTER TABLE</command></link> (Dimitri
          Fontaine)
         </para>
        </listitem>
@@ -7175,10 +7463,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Add event trigger support for database-level <link
-         linkend="SQL-COMMENT"><command>COMMENT</></>, <link
-         linkend="SQL-SECURITY-LABEL"><command>SECURITY LABEL</></>,
-         and <link linkend="SQL-GRANT"><command>GRANT</></>/<link
-         linkend="SQL-REVOKE"><command>REVOKE</></> (&Aacute;lvaro Herrera)
+         linkend="sql-comment"><command>COMMENT</command></link>, <link
+         linkend="sql-security-label"><command>SECURITY LABEL</command></link>,
+         and <link linkend="sql-grant"><command>GRANT</command></link>/<link
+         linkend="sql-revoke"><command>REVOKE</command></link> (&Aacute;lvaro Herrera)
         </para>
        </listitem>
 
@@ -7189,7 +7477,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Add columns to the output of <link
-         linkend="pg-event-trigger-sql-drop-functions"><function>pg_event_trigger_dropped_objects</></>
+         linkend="pg-event-trigger-sql-drop-functions"><function>pg_event_trigger_dropped_objects</function></link>
          (&Aacute;lvaro Herrera)
         </para>
 
@@ -7214,12 +7502,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-09 [57b1085] Peter ..: Allow empty content in xml type
 -->
       <para>
-       Allow the <link linkend="datatype-xml"><type>xml</></> data type
+       Allow the <link linkend="datatype-xml"><type>xml</type></link> data type
        to accept empty or all-whitespace content values (Peter Eisentraut)
       </para>
 
       <para>
-       This is required by the <acronym>SQL</>/<acronym>XML</>
+       This is required by the <acronym>SQL</acronym>/<acronym>XML</acronym>
        specification.
       </para>
      </listitem>
@@ -7229,8 +7517,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-21 [6f04368] Peter ..: Allow input format xxxx-xxxx-xxxx for macaddr ..
 -->
       <para>
-       Allow <link linkend="datatype-macaddr"><type>macaddr</></> input
-       using the format <literal>xxxx-xxxx-xxxx</> (Herwin Weststrate)
+       Allow <link linkend="datatype-macaddr"><type>macaddr</type></link> input
+       using the format <literal>xxxx-xxxx-xxxx</literal> (Herwin Weststrate)
       </para>
      </listitem>
 
@@ -7240,15 +7528,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Disallow non-SQL-standard syntax for <link
-       linkend="datatype-interval-input"><type>interval</></link> with
+       linkend="datatype-interval-input"><type>interval</type></link> with
        both precision and field specifications (Bruce Momjian)
       </para>
 
       <para>
        Per the standard, such type specifications should be written as,
-       for example, <literal>INTERVAL MINUTE TO SECOND(2)</>.
-       <productname>PostgreSQL</> formerly allowed this to be written as
-       <literal>INTERVAL(2) MINUTE TO SECOND</>, but it must now be
+       for example, <literal>INTERVAL MINUTE TO SECOND(2)</literal>.
+       <productname>PostgreSQL</productname> formerly allowed this to be written as
+       <literal>INTERVAL(2) MINUTE TO SECOND</literal>, but it must now be
        written in the standard way.
       </para>
      </listitem>
@@ -7259,8 +7547,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add selectivity estimators for <link
-       linkend="datatype-inet"><type>inet</></>/<link
-       linkend="datatype-cidr"><type>cidr</></> operators and improve
+       linkend="datatype-inet"><type>inet</type></link>/<link
+       linkend="datatype-cidr"><type>cidr</type></link> operators and improve
        estimators for text search functions (Emre Hasegeli, Tom Lane)
       </para>
      </listitem>
@@ -7272,9 +7560,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add data
-       types <link linkend="datatype-oid-table"><type>regrole</></link>
-       and <link linkend="datatype-oid-table"><type>regnamespace</></link>
-       to simplify entering and pretty-printing the <type>OID</> of a role
+       types <link linkend="datatype-oid-table"><type>regrole</type></link>
+       and <link linkend="datatype-oid-table"><type>regnamespace</type></link>
+       to simplify entering and pretty-printing the <type>OID</type> of a role
        or namespace (Kyotaro Horiguchi)
       </para>
      </listitem>
@@ -7282,7 +7570,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="datatype-json"><acronym>JSON</></link></title>
+     <title><link linkend="datatype-json"><acronym>JSON</acronym></link></title>
 
      <itemizedlist>
 
@@ -7292,10 +7580,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-31 [37def42] Andrew..: Rename jsonb_replace to jsonb_set and allow it ..
 -->
        <para>
-        Add <type>jsonb</> functions <link
-        linkend="functions-json-processing-table"><function>jsonb_set()</></>
+        Add <type>jsonb</type> functions <link
+        linkend="functions-json-processing-table"><function>jsonb_set()</function></link>
         and <link
-        linkend="functions-json-processing-table"><function>jsonb_pretty()</></>
+        linkend="functions-json-processing-table"><function>jsonb_pretty()</function></link>
         (Dmitry Dolgov, Andrew Dunstan, Petr Jel&iacute;nek)
        </para>
       </listitem>
@@ -7305,23 +7593,23 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-12 [7e354ab] Andrew..: Add several generator functions for jsonb that ..
 -->
        <para>
-        Add <type>jsonb</> generator functions <link
-        linkend="functions-json-creation-table"><function>to_jsonb()</></>,
+        Add <type>jsonb</type> generator functions <link
+        linkend="functions-json-creation-table"><function>to_jsonb()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_object()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_object()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_build_object()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_build_object()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_build_array()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_build_array()</function></link>,
         <link
-        linkend="functions-aggregate-table"><function>jsonb_agg()</></>,
+        linkend="functions-aggregate-table"><function>jsonb_agg()</function></link>,
         and <link
-        linkend="functions-aggregate-table"><function>jsonb_object_agg()</></>
+        linkend="functions-aggregate-table"><function>jsonb_object_agg()</function></link>
         (Andrew Dunstan)
        </para>
 
        <para>
-        Equivalent functions already existed for type <type>json</>.
+        Equivalent functions already existed for type <type>json</type>.
        </para>
       </listitem>
 
@@ -7331,8 +7619,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Reduce casting requirements to/from <link
-        linkend="datatype-json"><type>json</></> and <link
-        linkend="datatype-json"><type>jsonb</></> (Tom Lane)
+        linkend="datatype-json"><type>json</type></link> and <link
+        linkend="datatype-json"><type>jsonb</type></link> (Tom Lane)
        </para>
       </listitem>
 
@@ -7341,9 +7629,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-11 [908e234] Andrew..: Rename jsonb - text[] operator to #- to avoid a..
 -->
        <para>
-        Allow <type>text</>, <type>text</> array, and <type>integer</>
-        values to be <link linkend="functions-jsonb-op-table">subtracted</>
-        from <type>jsonb</> documents (Dmitry Dolgov, Andrew Dunstan)
+        Allow <type>text</type>, <type>text</type> array, and <type>integer</type>
+        values to be <link linkend="functions-jsonb-op-table">subtracted</link>
+        from <type>jsonb</type> documents (Dmitry Dolgov, Andrew Dunstan)
        </para>
       </listitem>
 
@@ -7352,8 +7640,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-12 [c694701] Andrew..: Additional functions and operators for jsonb
 -->
        <para>
-        Add <type>jsonb</> <link
-        linkend="functions-jsonb-op-table"><literal>||</></> operator
+        Add <type>jsonb</type> <link
+        linkend="functions-jsonb-op-table"><literal>||</literal></link> operator
         (Dmitry Dolgov, Andrew Dunstan)
        </para>
       </listitem>
@@ -7364,9 +7652,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="functions-json-processing-table"><function>json_strip_nulls()</></>
+        linkend="functions-json-processing-table"><function>json_strip_nulls()</function></link>
         and <link
-        linkend="functions-json-processing-table"><function>jsonb_strip_nulls()</></>
+        linkend="functions-json-processing-table"><function>jsonb_strip_nulls()</function></link>
         functions to remove JSON null values from documents
         (Andrew Dunstan)
        </para>
@@ -7388,8 +7676,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-11 [1871c89] Fujii ..: Add generate_series(numeric, numeric).
 -->
        <para>
-        Add <link linkend="functions-srf"><function>generate_series()</></>
-        for <type>numeric</> values (Plato Malugin)
+        Add <link linkend="functions-srf"><function>generate_series()</function></link>
+        for <type>numeric</type> values (Plato Malugin)
        </para>
       </listitem>
 
@@ -7399,8 +7687,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow <link
-        linkend="functions-aggregate-table"><function>array_agg()</></> and
-        <function>ARRAY()</> to take arrays as inputs (Ali Akbar, Tom Lane)
+        linkend="functions-aggregate-table"><function>array_agg()</function></link> and
+        <function>ARRAY()</function> to take arrays as inputs (Ali Akbar, Tom Lane)
        </para>
       </listitem>
 
@@ -7411,9 +7699,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add functions <link
-        linkend="array-functions-table"><function>array_position()</></>
+        linkend="array-functions-table"><function>array_position()</function></link>
         and <link
-        linkend="array-functions-table"><function>array_positions()</></>
+        linkend="array-functions-table"><function>array_positions()</function></link>
         to return subscripts of array values (Pavel Stehule)
        </para>
       </listitem>
@@ -7423,8 +7711,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-15 [4520ba6] Heikki..: Add point <-> polygon distance operator.
 -->
        <para>
-        Add a <type>point</>-to-<type>polygon</> distance operator
-        <link linkend="functions-geometry-op-table">&lt;-&gt;</>
+        Add a <type>point</type>-to-<type>polygon</type> distance operator
+        <link linkend="functions-geometry-op-table">&lt;-&gt;</link>
         (Alexander Korotkov)
        </para>
       </listitem>
@@ -7435,8 +7723,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow multibyte characters as escapes in <link
-        linkend="functions-similarto-regexp"><literal>SIMILAR TO</></>
-        and <link linkend="functions-string-sql"><literal>SUBSTRING</></>
+        linkend="functions-similarto-regexp"><literal>SIMILAR TO</literal></link>
+        and <link linkend="functions-string-sql"><literal>SUBSTRING</literal></link>
         (Jeff Davis)
        </para>
 
@@ -7451,7 +7739,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add a <link
-        linkend="functions-math-func-table"><function>width_bucket()</></>
+        linkend="functions-math-func-table"><function>width_bucket()</function></link>
         variant that supports any sortable data type and non-uniform bucket
         widths (Petr Jel&iacute;nek)
        </para>
@@ -7462,8 +7750,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-28 [cb2acb1] Heikki..: Add missing_ok option to the SQL functions for..
 -->
        <para>
-        Add an optional <replaceable>missing_ok</> argument to <link
-        linkend="functions-admin-genfile-table"><function>pg_read_file()</></>
+        Add an optional <replaceable>missing_ok</replaceable> argument to <link
+        linkend="functions-admin-genfile-table"><function>pg_read_file()</function></link>
         and related functions (Michael Paquier, Heikki Linnakangas)
        </para>
       </listitem>
@@ -7473,14 +7761,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-10 [865f14a] Robert..: Allow named parameters to be specified using =>..
 -->
        <para>
-        Allow <link linkend="sql-syntax-calling-funcs"><literal>=&gt;</></>
+        Allow <link linkend="sql-syntax-calling-funcs"><literal>=&gt;</literal></link>
         to specify named parameters in function calls (Pavel Stehule)
        </para>
 
        <para>
-        Previously only <literal>:=</> could be used.  This requires removing
-        the possibility for <literal>=&gt;</> to be a user-defined operator.
-        Creation of user-defined <literal>=&gt;</> operators has been issuing
+        Previously only <literal>:=</literal> could be used.  This requires removing
+        the possibility for <literal>=&gt;</literal> to be a user-defined operator.
+        Creation of user-defined <literal>=&gt;</literal> operators has been issuing
         warnings since PostgreSQL 9.0.
        </para>
       </listitem>
@@ -7490,7 +7778,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-25 [06bf0dd] Tom Lane: Upgrade src/port/rint.c to be POSIX-compliant.
 -->
        <para>
-        Add <acronym>POSIX</>-compliant rounding for platforms that use
+        Add <acronym>POSIX</acronym>-compliant rounding for platforms that use
         PostgreSQL-supplied rounding functions (Pedro Gimeno Fortea)
        </para>
       </listitem>
@@ -7509,11 +7797,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add function <link
-        linkend="functions-info-object-table"><function>pg_get_object_address()</></>
-        to return <type>OID</>s that uniquely
+        linkend="functions-info-object-table"><function>pg_get_object_address()</function></link>
+        to return <type>OID</type>s that uniquely
         identify an object, and function <link
-        linkend="functions-info-object-table"><function>pg_identify_object_as_address()</></>
-        to return object information based on <type>OID</>s (&Aacute;lvaro
+        linkend="functions-info-object-table"><function>pg_identify_object_as_address()</function></link>
+        to return object information based on <type>OID</type>s (&Aacute;lvaro
         Herrera)
        </para>
       </listitem>
@@ -7524,11 +7812,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Loosen security checks for viewing queries in <link
-        linkend="pg-stat-activity-view"><structname>pg_stat_activity</></>,
+        linkend="pg-stat-activity-view"><structname>pg_stat_activity</structname></link>,
         executing <link
-        linkend="functions-admin-signal-table"><function>pg_cancel_backend()</></>,
+        linkend="functions-admin-signal-table"><function>pg_cancel_backend()</function></link>,
         and executing <link
-        linkend="functions-admin-signal-table"><function>pg_terminate_backend()</></>
+        linkend="functions-admin-signal-table"><function>pg_terminate_backend()</function></link>
         (Stephen Frost)
        </para>
 
@@ -7544,7 +7832,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="monitoring-stats-funcs-table"><function>pg_stat_get_snapshot_timestamp()</></>
+        linkend="monitoring-stats-funcs-table"><function>pg_stat_get_snapshot_timestamp()</function></link>
         to output the time stamp of the statistics snapshot (Matt Kelly)
        </para>
 
@@ -7560,7 +7848,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="vacuum-for-multixact-wraparound"><function>mxid_age()</></>
+        linkend="vacuum-for-multixact-wraparound"><function>mxid_age()</function></link>
         to compute multi-xid age (Bruce Momjian)
        </para>
       </listitem>
@@ -7578,9 +7866,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-28 [6c40f83] Tom Lane: Add min and max aggregates for inet/cidr data t..
 -->
        <para>
-        Add <function>min()</>/<function>max()</> aggregates
-        for <link linkend="datatype-inet"><type>inet</></>/<link
-        linkend="datatype-cidr"><type>cidr</></> data types (Haribabu
+        Add <function>min()</function>/<function>max()</function> aggregates
+        for <link linkend="datatype-inet"><type>inet</type></link>/<link
+        linkend="datatype-cidr"><type>cidr</type></link> data types (Haribabu
         Kommi)
        </para>
       </listitem>
@@ -7613,12 +7901,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Improve support for composite types in <link
-       linkend="plpython"><application>PL/Python</></> (Ed Behn, Ronan
+       linkend="plpython"><application>PL/Python</application></link> (Ed Behn, Ronan
        Dunklau)
       </para>
 
       <para>
-       This allows <application>PL/Python</> functions to return arrays
+       This allows <application>PL/Python</application> functions to return arrays
        of composite types.
       </para>
      </listitem>
@@ -7629,7 +7917,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Reduce lossiness of <link
-       linkend="plpython"><application>PL/Python</></> floating-point value
+       linkend="plpython"><application>PL/Python</application></link> floating-point value
        conversions (Marko Kreen)
       </para>
      </listitem>
@@ -7639,19 +7927,19 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-26 [cac7658] Peter ..: Add transforms feature
 -->
       <para>
-       Allow specification of conversion routines between <acronym>SQL</>
+       Allow specification of conversion routines between <acronym>SQL</acronym>
        data types and data types of procedural languages (Peter Eisentraut)
       </para>
 
       <para>
        This change adds new commands <link
-       linkend="SQL-CREATETRANSFORM"><command>CREATE</></>/<link
-       linkend="SQL-DROPTRANSFORM"><command>DROP TRANSFORM</></>.
+       linkend="sql-createtransform"><command>CREATE</command></link>/<link
+       linkend="sql-droptransform"><command>DROP TRANSFORM</command></link>.
        This also adds optional transformations between the <link
-       linkend="hstore"><application>hstore</></> and <link
-       linkend="ltree"><application>ltree</></> types to/from <link
-       linkend="plperl"><application>PL/Perl</></> and <link
-       linkend="plpython"><application>PL/Python</></>.
+       linkend="hstore"><application>hstore</application></link> and <link
+       linkend="ltree"><application>ltree</application></link> types to/from <link
+       linkend="plperl"><application>PL/Perl</application></link> and <link
+       linkend="plpython"><application>PL/Python</application></link>.
       </para>
      </listitem>
 
@@ -7670,7 +7958,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-16 [9e3ad1a] Tom Lane: Use fast path in plpgsql's RETURN/RETURN NEXT i..
 -->
       <para>
-       Improve <link linkend="plpgsql"><application>PL/pgSQL</></> array
+       Improve <link linkend="plpgsql"><application>PL/pgSQL</application></link> array
        performance (Tom Lane)
       </para>
      </listitem>
@@ -7680,8 +7968,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-25 [a4847fc] Tom Lane: Add an ASSERT statement in plpgsql.
 -->
       <para>
-       Add an <link linkend="plpgsql-statements-assert"><command>ASSERT</></>
-       statement in <application>PL/pgSQL</> (Pavel Stehule)
+       Add an <link linkend="plpgsql-statements-assert"><command>ASSERT</command></link>
+       statement in <application>PL/pgSQL</application> (Pavel Stehule)
       </para>
      </listitem>
 
@@ -7690,7 +7978,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-25 [bb1b8f6] Tom Lane: De-reserve most statement-introducing keywords ..
 -->
       <para>
-       Allow more <link linkend="plpgsql"><application>PL/pgSQL</></>
+       Allow more <link linkend="plpgsql"><application>PL/pgSQL</application></link>
        keywords to be used as identifiers (Tom Lane)
       </para>
      </listitem>
@@ -7715,11 +8003,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Move <link
-       linkend="pgarchivecleanup"><application>pg_archivecleanup</></>,
-       <link linkend="pgtestfsync"><application>pg_test_fsync</></>,
-       <link linkend="pgtesttiming"><application>pg_test_timing</></>,
-       and <link linkend="pgwaldump"><application>pg_xlogdump</></>
-       from <filename>contrib</> to <filename>src/bin</> (Peter Eisentraut)
+       linkend="pgarchivecleanup"><application>pg_archivecleanup</application></link>,
+       <link linkend="pgtestfsync"><application>pg_test_fsync</application></link>,
+       <link linkend="pgtesttiming"><application>pg_test_timing</application></link>,
+       and <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
+       from <filename>contrib</filename> to <filename>src/bin</filename> (Peter Eisentraut)
       </para>
 
       <para>
@@ -7733,7 +8021,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-23 [61081e7] Heikki..: Add pg_rewind, for re-synchronizing a master se..
 -->
       <para>
-       Add <link linkend="app-pgrewind"><application>pg_rewind</></>,
+       Add <link linkend="app-pgrewind"><application>pg_rewind</application></link>,
        which allows re-synchronizing a master server after failback
        (Heikki Linnakangas)
       </para>
@@ -7745,13 +8033,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow <link
-       linkend="app-pgreceivewal"><application>pg_receivexlog</></>
+       linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
        to manage physical replication slots (Michael Paquier)
       </para>
 
       <para>
-       This is controlled via new <option>--create-slot</> and
-       <option>--drop-slot</> options.
+       This is controlled via new <option>--create-slot</option> and
+       <option>--drop-slot</option> options.
       </para>
      </listitem>
 
@@ -7761,13 +8049,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow <link
-       linkend="app-pgreceivewal"><application>pg_receivexlog</></>
-       to synchronously flush <acronym>WAL</> to storage using new
-       <option>--synchronous</> option (Furuya Osamu, Fujii Masao)
+       linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
+       to synchronously flush <acronym>WAL</acronym> to storage using new
+       <option>--synchronous</option> option (Furuya Osamu, Fujii Masao)
       </para>
 
       <para>
-       Without this, <acronym>WAL</> files are fsync'ed only on close.
+       Without this, <acronym>WAL</acronym> files are fsync'ed only on close.
       </para>
      </listitem>
 
@@ -7776,8 +8064,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-01-23 [a179232] Alvaro..: vacuumdb: enable parallel mode
 -->
       <para>
-       Allow <link linkend="APP-VACUUMDB"><application>vacuumdb</></> to
-       vacuum in parallel using new <option>--jobs</> option (Dilip Kumar)
+       Allow <link linkend="app-vacuumdb"><application>vacuumdb</application></link> to
+       vacuum in parallel using new <option>--jobs</option> option (Dilip Kumar)
       </para>
      </listitem>
 
@@ -7786,7 +8074,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-11-12 [5094da9] Alvaro..: vacuumdb: don't prompt for passwords over and ..
 -->
       <para>
-       In <link linkend="APP-VACUUMDB"><application>vacuumdb</></>, do not
+       In <link linkend="app-vacuumdb"><application>vacuumdb</application></link>, do not
        prompt for the same password repeatedly when multiple connections
        are necessary (Haribabu Kommi, Michael Paquier)
       </para>
@@ -7797,8 +8085,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [458a077] Fujii ..: Support &#8211;&#8211;verbose option in reindexdb.
 -->
       <para>
-       Add <option>--verbose</> option to <link
-       linkend="APP-REINDEXDB"><application>reindexdb</></> (Sawada
+       Add <option>--verbose</option> option to <link
+       linkend="app-reindexdb"><application>reindexdb</application></link> (Sawada
        Masahiko)
       </para>
      </listitem>
@@ -7808,10 +8096,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-12 [72d422a] Andrew..: Map basebackup tablespaces using a tablespace_..
 -->
       <para>
-       Make <link linkend="app-pgbasebackup"><application>pg_basebackup</></>
-       use a tablespace mapping file when using <application>tar</> format,
+       Make <link linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+       use a tablespace mapping file when using <application>tar</application> format,
        to support symbolic links and file paths of 100+ characters in length
-       on <systemitem class="osname">MS Windows</> (Amit Kapila)
+       on <systemitem class="osname">MS Windows</systemitem> (Amit Kapila)
       </para>
      </listitem>
 
@@ -7821,15 +8109,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-19 [bdd5726] Andres..: Add the capability to display summary statistic..
 -->
       <para>
-       Add <link linkend="pgwaldump"><application>pg_xlogdump</></> option
-       <option>--stats</> to display summary statistics (Abhijit Menon-Sen)
+       Add <link linkend="pgwaldump"><application>pg_xlogdump</application></link> option
+       <option>--stats</option> to display summary statistics (Abhijit Menon-Sen)
       </para>
      </listitem>
 
     </itemizedlist>
 
      <sect4>
-      <title><xref linkend="APP-PSQL"></title>
+      <title><xref linkend="app-psql"></title>
 
       <itemizedlist>
 
@@ -7838,7 +8126,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-31 [9d9991c] Bruce ..: psql:  add asciidoc output format
 -->
         <para>
-         Allow <application>psql</> to produce AsciiDoc output (Szymon Guz)
+         Allow <application>psql</application> to produce AsciiDoc output (Szymon Guz)
         </para>
        </listitem>
 
@@ -7847,14 +8135,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-10 [5b214c5] Fujii ..: Add new ECHO mode 'errors' that displays only ..
 -->
         <para>
-         Add an <literal>errors</> mode that displays only failed commands
-         to <application>psql</>'s <varname>ECHO</> variable
+         Add an <literal>errors</literal> mode that displays only failed commands
+         to <application>psql</application>'s <varname>ECHO</varname> variable
          (Pavel Stehule)
         </para>
 
         <para>
-         This behavior can also be selected with <application>psql</>'s
-         <option>-b</> option.
+         This behavior can also be selected with <application>psql</application>'s
+         <option>-b</option> option.
         </para>
        </listitem>
 
@@ -7864,12 +8152,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Provide separate column, header, and border linestyle control
-         in <application>psql</>'s unicode linestyle (Pavel Stehule)
+         in <application>psql</application>'s unicode linestyle (Pavel Stehule)
         </para>
 
         <para>
          Single or double lines are supported; the default is
-         <literal>single</>.
+         <literal>single</literal>.
         </para>
        </listitem>
 
@@ -7878,8 +8166,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-02 [51bb795] Andres..: Add psql PROMPT variable showing which line of ..
 -->
         <para>
-         Add new option <literal>%l</> in <application>psql</>'s <link
-         linkend="APP-PSQL-variables"><envar>PROMPT</></> variables
+         Add new option <literal>%l</literal> in <application>psql</application>'s <link
+         linkend="app-psql-variables"><envar>PROMPT</envar></link> variables
          to display the current multiline statement line number
          (Sawada Masahiko)
         </para>
@@ -7890,8 +8178,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-28 [7655f4c] Andrew..: Add a pager_min_lines setting to psql
 -->
         <para>
-         Add <literal>\pset</> option <link
-         linkend="APP-PSQL-meta-commands"><varname>pager_min_lines</></>
+         Add <literal>\pset</literal> option <link
+         linkend="app-psql-meta-commands"><varname>pager_min_lines</varname></link>
          to control pager invocation (Andrew Dunstan)
         </para>
        </listitem>
@@ -7901,7 +8189,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-21 [4077fb4] Andrew..: Fix an error in psql that overcounted output l..
 -->
         <para>
-         Improve <application>psql</> line counting used when deciding
+         Improve <application>psql</application> line counting used when deciding
          to invoke the pager (Andrew Dunstan)
         </para>
        </listitem>
@@ -7912,8 +8200,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-12-08 [e90371d] Tom Lane: Make failure to open psql log-file fatal.
 -->
         <para>
-         <application>psql</> now fails if the file specified by
-         an <option>--output</> or <option>--log-file</> switch cannot be
+         <application>psql</application> now fails if the file specified by
+         an <option>--output</option> or <option>--log-file</option> switch cannot be
          written (Tom Lane, Daniel V&eacute;rit&eacute;)
         </para>
 
@@ -7927,7 +8215,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-12 [bd40951] Andres..: Minimal psql tab completion support for SET se..
 -->
         <para>
-         Add <application>psql</> tab completion when setting the
+         Add <application>psql</application> tab completion when setting the
          <xref linkend="guc-search-path"> variable (Jeff Janes)
         </para>
 
@@ -7941,7 +8229,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-23 [631e7f6] Heikki..: Improve tab-completion of DROP and ALTER ENABLE..
 -->
         <para>
-         Improve <application>psql</>'s tab completion for triggers and rules
+         Improve <application>psql</application>'s tab completion for triggers and rules
          (Andreas Karlsson)
         </para>
        </listitem>
@@ -7949,7 +8237,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
       </itemizedlist>
 
      <sect5>
-      <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+      <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
       <itemizedlist>
 
@@ -7958,17 +8246,17 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-10 [07c8651] Andres..: Add new psql help topics, accessible to both..
 -->
         <para>
-         Add <application>psql</> <command>\?</> help sections
-         <literal>variables</> and <literal>options</> (Pavel Stehule)
+         Add <application>psql</application> <command>\?</command> help sections
+         <literal>variables</literal> and <literal>options</literal> (Pavel Stehule)
         </para>
 
         <para>
-         <literal>\? variables</> shows <application>psql</>'s special
-         variables and <literal>\? options</> shows the command-line options.
-         <command>\? commands</> shows the meta-commands, which is the
+         <literal>\? variables</literal> shows <application>psql</application>'s special
+         variables and <literal>\? options</literal> shows the command-line options.
+         <command>\? commands</command> shows the meta-commands, which is the
          traditional output and remains the default.  These help displays
          can also be obtained with the command-line
-         option <literal>--help=<replaceable>section</></literal>.
+         option <literal>--help=<replaceable>section</replaceable></literal>.
         </para>
        </listitem>
 
@@ -7977,7 +8265,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [ee80f04] Alvaro..: psql: Show tablespace size in \db+
 -->
         <para>
-         Show tablespace size in <application>psql</>'s <literal>\db+</>
+         Show tablespace size in <application>psql</application>'s <literal>\db+</literal>
          (Fabr&iacute;zio de Royes Mello)
         </para>
        </listitem>
@@ -7987,7 +8275,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [a6f3c1f] Magnus..: Show owner of types in psql \dT+
 -->
         <para>
-         Show data type owners in <application>psql</>'s <literal>\dT+</>
+         Show data type owners in <application>psql</application>'s <literal>\dT+</literal>
          (Magnus Hagander)
         </para>
        </listitem>
@@ -7997,13 +8285,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-04 [f6f654f] Fujii ..: Allow \watch to display query execution time if..
 -->
         <para>
-         Allow <application>psql</>'s <command>\watch</> to output
-         <command>\timing</> information (Fujii Masao)
+         Allow <application>psql</application>'s <command>\watch</command> to output
+         <command>\timing</command> information (Fujii Masao)
         </para>
 
         <para>
-         Also prevent <option>--echo-hidden</> from echoing
-         <command>\watch</> queries, since that is generally unwanted.
+         Also prevent <option>--echo-hidden</option> from echoing
+         <command>\watch</command> queries, since that is generally unwanted.
         </para>
        </listitem>
 
@@ -8012,8 +8300,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-22 [eca2b9b] Andrew..: Rework echo_hidden for \sf and \ef from commit ..
 -->
         <para>
-         Make <application>psql</>'s <literal>\sf</> and <literal>\ef</>
-         commands honor <envar>ECHO_HIDDEN</> (Andrew Dunstan)
+         Make <application>psql</application>'s <literal>\sf</literal> and <literal>\ef</literal>
+         commands honor <envar>ECHO_HIDDEN</envar> (Andrew Dunstan)
         </para>
        </listitem>
 
@@ -8022,8 +8310,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-12 [e15c4ab] Fujii ..: Add tab-completion for \unset and valid setting..
 -->
         <para>
-         Improve <application>psql</> tab completion for <command>\set</>,
-         <command>\unset</>, and <literal>:variable</> names (Pavel
+         Improve <application>psql</application> tab completion for <command>\set</command>,
+         <command>\unset</command>, and <literal>:variable</literal> names (Pavel
          Stehule)
         </para>
        </listitem>
@@ -8034,7 +8322,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Allow tab completion of role names
-         in <application>psql</> <literal>\c</> commands (Ian Barwick)
+         in <application>psql</application> <literal>\c</literal> commands (Ian Barwick)
         </para>
        </listitem>
 
@@ -8045,7 +8333,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><xref linkend="APP-PGDUMP"></title>
+     <title><xref linkend="app-pgdump"></title>
 
      <itemizedlist>
 
@@ -8054,15 +8342,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-17 [be1cc8f] Simon ..: Add pg_dump &#8211;&#8211;snapshot option
 -->
        <para>
-        Allow <application>pg_dump</> to share a snapshot taken by another
-        session using <option>--snapshot</> (Simon Riggs, Michael Paquier)
+        Allow <application>pg_dump</application> to share a snapshot taken by another
+        session using <option>--snapshot</option> (Simon Riggs, Michael Paquier)
        </para>
 
        <para>
         The remote snapshot must have been exported by
-        <function>pg_export_snapshot()</> or logical replication slot
+        <function>pg_export_snapshot()</function> or logical replication slot
         creation.  This can be used to share a consistent snapshot
-        across multiple <application>pg_dump</> processes.
+        across multiple <application>pg_dump</application> processes.
        </para>
       </listitem>
 
@@ -8087,13 +8375,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-07 [7700597] Tom Lane: In pg_dump, show server and pg_dump versions w..
 -->
        <para>
-        Make <application>pg_dump</> always print the server and
-        <application>pg_dump</> versions (Jing Wang)
+        Make <application>pg_dump</application> always print the server and
+        <application>pg_dump</application> versions (Jing Wang)
        </para>
 
        <para>
         Previously, version information was only printed in
-        <option>--verbose</> mode.
+        <option>--verbose</option> mode.
        </para>
       </listitem>
 
@@ -8102,9 +8390,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-04 [232cd63] Fujii ..: Remove -i/-ignore-version option from pg_dump..
 -->
        <para>
-        Remove the long-ignored <option>-i</>/<option>--ignore-version</>
-        option from <application>pg_dump</>, <application>pg_dumpall</>,
-        and <application>pg_restore</> (Fujii Masao)
+        Remove the long-ignored <option>-i</option>/<option>--ignore-version</option>
+        option from <application>pg_dump</application>, <application>pg_dumpall</application>,
+        and <application>pg_restore</application> (Fujii Masao)
        </para>
       </listitem>
 
@@ -8122,7 +8410,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-25 [ebe30ad] Bruce ..: pg_ctl, pg_upgrade:  allow multiple -o/-O opti..
 -->
        <para>
-        Support multiple <application>pg_ctl</> <option>-o</> options,
+        Support multiple <application>pg_ctl</application> <option>-o</option> options,
         concatenating their values (Bruce Momjian)
        </para>
       </listitem>
@@ -8132,13 +8420,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-17 [c0e4520] Magnus..: Add option to pg_ctl to choose event source for..
 -->
        <para>
-        Allow control of <application>pg_ctl</>'s event source logging
-        on <systemitem class="osname">MS Windows</> (MauMau)
+        Allow control of <application>pg_ctl</application>'s event source logging
+        on <systemitem class="osname">MS Windows</systemitem> (MauMau)
        </para>
 
        <para>
-        This only controls <application>pg_ctl</>, not the server, which
-        has separate settings in <filename>postgresql.conf</>.
+        This only controls <application>pg_ctl</application>, not the server, which
+        has separate settings in <filename>postgresql.conf</filename>.
        </para>
       </listitem>
 
@@ -8148,14 +8436,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         If the server's listen address is set to a wildcard value
-        (<literal>0.0.0.0</> in IPv4 or <literal>::</> in IPv6), connect via
+        (<literal>0.0.0.0</literal> in IPv4 or <literal>::</literal> in IPv6), connect via
         the loopback address rather than trying to use the wildcard address
         literally (Kondo Yuta)
        </para>
 
        <para>
         This fix primarily affects Windows, since on other platforms
-        <application>pg_ctl</> will prefer to use a Unix-domain socket.
+        <application>pg_ctl</application> will prefer to use a Unix-domain socket.
        </para>
       </listitem>
 
@@ -8173,13 +8461,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-14 [9fa8b0e] Peter ..: Move pg_upgrade from contrib/ to src/bin/
 -->
        <para>
-        Move <application>pg_upgrade</> from <filename>contrib</> to
-        <filename>src/bin</> (Peter Eisentraut)
+        Move <application>pg_upgrade</application> from <filename>contrib</filename> to
+        <filename>src/bin</filename> (Peter Eisentraut)
        </para>
 
        <para>
         In connection with this change, the functionality previously
-        provided by the <application>pg_upgrade_support</> module has been
+        provided by the <application>pg_upgrade_support</application> module has been
         moved into the core server.
        </para>
       </listitem>
@@ -8189,8 +8477,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-25 [ebe30ad] Bruce ..: pg_ctl, pg_upgrade:  allow multiple -o/-O optio..
 -->
        <para>
-        Support multiple <application>pg_upgrade</>
-        <option>-o</>/<option>-O</> options,
+        Support multiple <application>pg_upgrade</application>
+        <option>-o</option>/<option>-O</option> options,
         concatenating their values (Bruce Momjian)
        </para>
       </listitem>
@@ -8201,7 +8489,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Improve database collation comparisons in
-        <application>pg_upgrade</> (Heikki Linnakangas)
+        <application>pg_upgrade</application> (Heikki Linnakangas)
        </para>
       </listitem>
 
@@ -8228,7 +8516,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-13 [81134af] Peter ..: Move pgbench from contrib/ to src/bin/
 -->
        <para>
-        Move pgbench from <filename>contrib</> to <filename>src/bin</>
+        Move pgbench from <filename>contrib</filename> to <filename>src/bin</filename>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -8239,7 +8527,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Fix calculation of TPS number <quote>excluding connections
-        establishing</> (Tatsuo Ishii, Fabien Coelho)
+        establishing</quote> (Tatsuo Ishii, Fabien Coelho)
        </para>
 
        <para>
@@ -8261,7 +8549,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        </para>
 
        <para>
-        This is controlled by a new <option>--latency-limit</> option.
+        This is controlled by a new <option>--latency-limit</option> option.
        </para>
       </listitem>
 
@@ -8271,7 +8559,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow pgbench to generate Gaussian/exponential distributions
-        using <command>\setrandom</> (Kondo Mitsumasa, Fabien Coelho)
+        using <command>\setrandom</command> (Kondo Mitsumasa, Fabien Coelho)
        </para>
       </listitem>
 
@@ -8280,9 +8568,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-02 [878fdcb] Robert..: pgbench: Add a real expression syntax to \set
 -->
        <para>
-        Allow <application>pgbench</>'s <command>\set</> command to handle
+        Allow <application>pgbench</application>'s <command>\set</command> command to handle
         arithmetic expressions containing more than one operator, and add
-        <literal>%</> (modulo) to the set of operators it supports
+        <literal>%</literal> (modulo) to the set of operators it supports
         (Robert Haas, Fabien Coelho)
        </para>
       </listitem>
@@ -8303,7 +8591,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-20 [2c03216] Heikki..: Revamp the WAL record format.
 -->
        <para>
-        Simplify <link linkend="wal"><acronym>WAL</></> record format
+        Simplify <link linkend="wal"><acronym>WAL</acronym></link> record format
         (Heikki Linnakangas)
        </para>
 
@@ -8328,7 +8616,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-25 [b64d92f] Andres..: Add a basic atomic ops API abstracting away pla..
 -->
        <para>
-        Add atomic memory operations <acronym>API</> (Andres Freund)
+        Add atomic memory operations <acronym>API</acronym> (Andres Freund)
        </para>
       </listitem>
 
@@ -8366,13 +8654,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Foreign tables can now take part in <command>INSERT ... ON CONFLICT
-        DO NOTHING</> queries (Peter Geoghegan, Heikki Linnakangas,
+        DO NOTHING</command> queries (Peter Geoghegan, Heikki Linnakangas,
         Andres Freund)
        </para>
 
        <para>
         Foreign data wrappers must be modified to handle this.
-        <command>INSERT ... ON CONFLICT DO UPDATE</> is not supported on
+        <command>INSERT ... ON CONFLICT DO UPDATE</command> is not supported on
         foreign tables.
        </para>
       </listitem>
@@ -8382,7 +8670,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-18 [4a14f13] Tom Lane: Improve hash_create's API for selecting simple-..
 -->
        <para>
-        Improve <function>hash_create()</>'s API for selecting
+        Improve <function>hash_create()</function>'s API for selecting
         simple-binary-key hash functions (Teodor Sigaev, Tom Lane)
        </para>
       </listitem>
@@ -8403,8 +8691,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-28 [a6d488c] Andres..: Remove Alpha and Tru64 support.
 -->
        <para>
-        Remove <productname>Alpha</> (<acronym>CPU</>) and <systemitem
-        class="osname">Tru64</> (OS) ports (Andres Freund)
+        Remove <productname>Alpha</productname> (<acronym>CPU</acronym>) and <systemitem
+        class="osname">Tru64</systemitem> (OS) ports (Andres Freund)
        </para>
       </listitem>
 
@@ -8414,11 +8702,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Remove swap-byte-based spinlock implementation for
-        <acronym>ARM</>v5 and earlier <acronym>CPU</>s (Robert Haas)
+        <acronym>ARM</acronym>v5 and earlier <acronym>CPU</acronym>s (Robert Haas)
        </para>
 
        <para>
-        <acronym>ARM</>v5's weak memory ordering made this locking
+        <acronym>ARM</acronym>v5's weak memory ordering made this locking
         implementation unsafe.  Spinlock support is still possible on
         newer gcc implementations with atomics support.
        </para>
@@ -8444,10 +8732,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Change index operator class for columns <link
-        linkend="catalog-pg-seclabel"><structname>pg_seclabel</></>.<structname>provider</>
+        linkend="catalog-pg-seclabel"><structname>pg_seclabel</structname></link>.<structname>provider</structname>
         and <link
-        linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</></>.<structname>provider</>
-        to be <literal>text_pattern_ops</> (Tom Lane)
+        linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</structname></link>.<structname>provider</structname>
+        to be <literal>text_pattern_ops</literal> (Tom Lane)
        </para>
 
        <para>
@@ -8480,8 +8768,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow higher-precision time stamp resolution on <systemitem
-        class="osname">Windows 8</>, <systemitem class="osname">Windows
-        Server 2012</>, and later Windows systems (Craig Ringer)
+        class="osname">Windows 8</systemitem>, <systemitem class="osname">Windows
+        Server 2012</systemitem>, and later Windows systems (Craig Ringer)
        </para>
       </listitem>
 
@@ -8490,8 +8778,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-18 [f9dead5] Alvaro..: Install shared libraries to bin/ in Windows un..
 -->
        <para>
-        Install shared libraries to <filename>bin</> in <systemitem
-        class="osname">MS Windows</> (Peter Eisentraut, Michael Paquier)
+        Install shared libraries to <filename>bin</filename> in <systemitem
+        class="osname">MS Windows</systemitem> (Peter Eisentraut, Michael Paquier)
        </para>
       </listitem>
 
@@ -8500,8 +8788,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-16 [22d0053] Alvaro..: MSVC: install src/test/modules together with c..
 -->
        <para>
-        Install <filename>src/test/modules</> together with
-        <filename>contrib</> on <productname>MSVC</> builds (Michael
+        Install <filename>src/test/modules</filename> together with
+        <filename>contrib</filename> on <productname>MSVC</productname> builds (Michael
         Paquier)
        </para>
       </listitem>
@@ -8511,9 +8799,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-12 [8d9a0e8] Magnus..: Support &#8211;&#8211;with-extra-version equivalent functi..
 -->
        <para>
-        Allow <link linkend="install-procedure">configure</>'s
-        <option>--with-extra-version</> option to be honored by the
-        <productname>MSVC</> build (Michael Paquier)
+        Allow <link linkend="install-procedure">configure</link>'s
+        <option>--with-extra-version</option> option to be honored by the
+        <productname>MSVC</productname> build (Michael Paquier)
        </para>
       </listitem>
 
@@ -8522,7 +8810,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [91f03ba] Noah M..: MSVC: Recognize PGFILEDESC in contrib and conv..
 -->
        <para>
-        Pass <envar>PGFILEDESC</> into <productname>MSVC</> contrib builds
+        Pass <envar>PGFILEDESC</envar> into <productname>MSVC</productname> contrib builds
         (Michael Paquier)
        </para>
       </listitem>
@@ -8532,8 +8820,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [c4a448e] Noah M..: MSVC: Apply icons to all binaries having them ..
 -->
        <para>
-        Add icons to all <productname>MSVC</>-built binaries and version
-        information to all <systemitem class="osname">MS Windows</>
+        Add icons to all <productname>MSVC</productname>-built binaries and version
+        information to all <systemitem class="osname">MS Windows</systemitem>
         binaries (Noah Misch)
        </para>
 
@@ -8548,12 +8836,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add optional-argument support to the internal
-        <function>getopt_long()</> implementation (Michael Paquier,
+        <function>getopt_long()</function> implementation (Michael Paquier,
         Andres Freund)
        </para>
 
        <para>
-        This is used by the <productname>MSVC</> build.
+        This is used by the <productname>MSVC</productname> build.
        </para>
       </listitem>
 
@@ -8575,7 +8863,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
       <para>
        Add statistics for minimum, maximum,
        mean, and standard deviation times to <link
-       linkend="pgstatstatements-columns"><application>pg_stat_statements</></>
+       linkend="pgstatstatements-columns"><application>pg_stat_statements</application></link>
        (Mitsumasa Kondo, Andrew Dunstan)
       </para>
      </listitem>
@@ -8585,8 +8873,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-01 [32984d8] Heikki..: Add functions for dealing with PGP armor heade..
 -->
       <para>
-       Add <link linkend="pgcrypto"><application>pgcrypto</></> function
-       <function>pgp_armor_headers()</> to extract <productname>PGP</>
+       Add <link linkend="pgcrypto"><application>pgcrypto</application></link> function
+       <function>pgp_armor_headers()</function> to extract <productname>PGP</productname>
        armor headers (Marko Tiikkaja, Heikki Linnakangas)
       </para>
      </listitem>
@@ -8597,7 +8885,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow empty replacement strings in <link
-       linkend="unaccent"><application>unaccent</></> (Mohammad Alhashash)
+       linkend="unaccent"><application>unaccent</application></link> (Mohammad Alhashash)
       </para>
 
       <para>
@@ -8612,7 +8900,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow multicharacter source strings in <link
-       linkend="unaccent"><application>unaccent</></> (Tom Lane)
+       linkend="unaccent"><application>unaccent</application></link> (Tom Lane)
       </para>
 
       <para>
@@ -8628,9 +8916,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [149f6f1] Simon ..: TABLESAMPLE system_time(limit)
 -->
       <para>
-       Add <filename>contrib</> modules <link
-       linkend="tsm-system-rows"><application>tsm_system_rows</></> and
-       <link linkend="tsm-system-time"><application>tsm_system_time</></>
+       Add <filename>contrib</filename> modules <link
+       linkend="tsm-system-rows"><application>tsm_system_rows</application></link> and
+       <link linkend="tsm-system-time"><application>tsm_system_time</application></link>
        to allow additional table sampling methods (Petr Jel&iacute;nek)
       </para>
      </listitem>
@@ -8640,9 +8928,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-21 [3a82bc6] Heikki..: Add pageinspect functions for inspecting GIN in..
 -->
       <para>
-       Add <link linkend="GIN"><acronym>GIN</></>
+       Add <link linkend="gin"><acronym>GIN</acronym></link>
        index inspection functions to <link
-       linkend="pageinspect"><application>pageinspect</></> (Heikki
+       linkend="pageinspect"><application>pageinspect</application></link> (Heikki
        Linnakangas, Peter Geoghegan, Michael Paquier)
       </para>
      </listitem>
@@ -8653,7 +8941,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add information about buffer pins to <link
-       linkend="pgbuffercache"><application>pg_buffercache</></> display
+       linkend="pgbuffercache"><application>pg_buffercache</application></link> display
        (Andres Freund)
       </para>
      </listitem>
@@ -8663,9 +8951,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-13 [5850b20] Andres..: Add pgstattuple_approx() to the pgstattuple ext..
 -->
       <para>
-       Allow <link linkend="pgstattuple"><application>pgstattuple</></>
+       Allow <link linkend="pgstattuple"><application>pgstattuple</application></link>
        to report approximate answers with less overhead using
-       <function>pgstattuple_approx()</> (Abhijit Menon-Sen)
+       <function>pgstattuple_approx()</function> (Abhijit Menon-Sen)
       </para>
      </listitem>
 
@@ -8675,15 +8963,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-01 [df761e3] Alvaro..: Move security_label test
 -->
       <para>
-       Move <application>dummy_seclabel</>, <application>test_shm_mq</>,
-       <application>test_parser</>, and <application>worker_spi</>
-       from <filename>contrib</> to <filename>src/test/modules</>
+       Move <application>dummy_seclabel</application>, <application>test_shm_mq</application>,
+       <application>test_parser</application>, and <application>worker_spi</application>
+       from <filename>contrib</filename> to <filename>src/test/modules</filename>
        (&Aacute;lvaro Herrera)
       </para>
 
       <para>
        These modules are only meant for server testing, so they do not need
-       to be built or installed when packaging <productname>PostgreSQL</>.
+       to be built or installed when packaging <productname>PostgreSQL</productname>.
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index dc811c4ca5d9ba7cbb057a543b9c66c6cd34b429..5e358ef4b4d33499b786e516471519fbf4fa0fb6 100644
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -1,6 +1,512 @@
 <!-- doc/src/sgml/release-9.6.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-6-6">
+  <title>Release 9.6.6</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.6.5.
+   For information about new features in the 9.6 major release, see
+   <xref linkend="release-9-6">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.6.6</title>
+
+   <para>
+    A dump/restore is not required for those running 9.6.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the first changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.6.4,
+    see <xref linkend="release-9-6-4">.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect query results when multiple <literal>GROUPING
+      SETS</literal> columns contain the same simple variable (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect parallelization decisions for nested queries
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix parallel query handling to not fail when a recently-used role is
+      dropped (Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7769fc000] 2017-09-27 17:05:53 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [07ea925e2] 2017-09-27 17:05:53 -0400
+Branch: REL9_6_STABLE [def03e4bf] 2017-09-27 17:05:53 -0400
+Branch: REL9_5_STABLE [ad56dbd6c] 2017-09-27 17:05:53 -0400
+Branch: REL9_4_STABLE [c38575edc] 2017-09-27 17:05:53 -0400
+Branch: REL9_3_STABLE [2e82fba0e] 2017-09-27 17:05:54 -0400
+Branch: REL9_2_STABLE [72d4fd08e] 2017-09-27 17:05:54 -0400
+-->
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6f44fe7f1] 2017-09-17 15:28:51 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [244b4a37e] 2017-09-17 15:28:51 -0400
+Branch: REL9_6_STABLE [86e4ebb9a] 2017-09-17 15:28:51 -0400
+Branch: REL9_5_STABLE [eeff68396] 2017-09-17 15:28:51 -0400
+-->
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when determining relation distinctness (David Rowley)
+     </para>
+
+     <para>
+      This allows the intended optimization to occur when a subquery has
+      a result column of type <type>varchar</type>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sharing transition states between ordered-set aggregates
+      (David Rowley)
+     </para>
+
+     <para>
+      This causes a crash with the built-in ordered-set aggregates, and
+      probably with user-written ones as well.  v11 and later will include
+      provisions for dealing with such cases safely, but in released
+      branches, just disable the optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent <varname>idle_in_transaction_session_timeout</varname> from
+      being ignored when a <varname>statement_timeout</varname> occurred
+      earlier (Lukas Fittl)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [899bd785c] 2017-09-25 16:09:19 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [4621c7f7a] 2017-09-25 16:09:19 -0400
+Branch: REL9_6_STABLE [175061222] 2017-09-25 16:09:20 -0400
+Branch: REL9_5_STABLE [05297416f] 2017-09-25 16:09:20 -0400
+Branch: REL9_4_STABLE [3a07a6f3e] 2017-09-25 16:09:20 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [5ea96efaa] 2017-09-26 13:42:53 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [d29f30d8c] 2017-09-26 13:43:00 -0400
+Branch: REL9_6_STABLE [12ac252f9] 2017-09-26 13:43:07 -0400
+Branch: REL9_5_STABLE [06852f215] 2017-09-26 13:43:12 -0400
+Branch: REL9_4_STABLE [e5c058e2e] 2017-09-26 13:43:17 -0400
+-->
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the frequency of data flush requests during bulk file copies to
+      avoid performance problems on macOS, particularly with its new APFS
+      file system (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [27c6619e9] 2017-09-17 14:50:01 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [66fe509be] 2017-09-17 14:50:01 -0400
+Branch: REL9_6_STABLE [c0d21bdb8] 2017-09-17 14:50:01 -0400
+Branch: REL9_5_STABLE [825fac5d3] 2017-09-17 14:50:01 -0400
+Branch: REL9_4_STABLE [bc0974703] 2017-09-17 14:50:01 -0400
+Branch: REL9_3_STABLE [b1be33593] 2017-09-17 14:50:01 -0400
+Branch: REL9_2_STABLE [4cd6cd21d] 2017-09-17 14:50:01 -0400
+-->
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [aa6b7b72d] 2017-09-22 17:10:36 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [3d7f11a0f] 2017-09-23 10:03:05 -0400
+Branch: REL9_6_STABLE [a1f30ecc5] 2017-09-23 10:03:36 -0400
+Branch: REL9_5_STABLE [acae13faa] 2017-09-23 10:04:55 -0400
+Branch: REL9_4_STABLE [9bf049946] 2017-09-23 10:05:28 -0400
+Branch: REL9_3_STABLE [e0f5710c5] 2017-09-23 10:05:40 -0400
+Branch: REL9_2_STABLE [2eb84e54a] 2017-09-23 10:14:30 -0400
+-->
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [714805010] 2017-09-21 18:13:11 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [a2b1eb234] 2017-09-21 18:13:11 -0400
+Branch: REL9_6_STABLE [ea31541f5] 2017-09-21 18:13:11 -0400
+Branch: REL9_5_STABLE [122289a66] 2017-09-21 18:13:11 -0400
+Branch: REL9_4_STABLE [b572b435c] 2017-09-21 18:13:11 -0400
+Branch: REL9_3_STABLE [a09d8be7d] 2017-09-21 18:13:11 -0400
+Branch: REL9_2_STABLE [e56facd8b] 2017-09-21 18:13:11 -0400
+-->
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [81276fdd3] 2017-09-14 17:19:04 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [a2a61f633] 2017-09-14 16:44:01 -0400
+Branch: REL9_6_STABLE [353328ad1] 2017-09-14 16:47:11 -0400
+-->
+     <para>
+      Add missing cases in <function>GetCommandLogLevel()</function>,
+      preventing errors when certain SQL commands are used while
+      <varname>log_statement</varname> is set to <literal>ddl</literal>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_6_STABLE [2ac598874] 2017-10-17 12:15:08 -0400
+Branch: REL9_5_STABLE [9e20276e1] 2017-10-17 12:15:08 -0400
+Branch: REL9_4_STABLE [38f17e8ee] 2017-10-17 12:15:08 -0400
+Branch: REL9_3_STABLE [06b2a73ed] 2017-10-17 12:15:08 -0400
+-->
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>AggGetAggref()</function> to return the
+      correct <structname>Aggref</structname> nodes to aggregate final
+      functions whose transition calculations have been merged (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Stephen Frost <sfrost@snowman.net>
+Branch: master [d2e40b310] 2017-09-13 20:02:09 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [68a7c24fd] 2017-09-13 20:04:43 -0400
+Branch: REL9_6_STABLE [caae416aa] 2017-09-13 20:02:27 -0400
+-->
+     <para>
+      Fix <application>pg_dump</application> to ensure that it
+      emits <command>GRANT</command> commands in a valid order
+      (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [2e70d6b5e] 2017-08-29 15:18:01 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [b481b39b8] 2017-08-29 15:18:01 -0400
+Branch: REL9_6_STABLE [bc95e5874] 2017-08-29 15:18:01 -0400
+Branch: REL9_5_STABLE [dfd1042c6] 2017-08-29 15:18:01 -0400
+Branch: REL9_4_STABLE [1c53722ff] 2017-08-29 15:18:01 -0400
+Branch: REL9_3_STABLE [d391fb6c3] 2017-08-29 15:18:01 -0400
+Branch: REL9_2_STABLE [a07058a6d] 2017-08-29 15:18:01 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9d6b160d7] 2017-09-01 15:14:46 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [f2fe1cbef] 2017-09-01 15:14:18 -0400
+Branch: REL9_6_STABLE [3a0f8e7d3] 2017-09-01 15:14:18 -0400
+Branch: REL9_5_STABLE [1305186de] 2017-09-01 15:14:18 -0400
+Branch: REL9_4_STABLE [53863ebeb] 2017-09-01 15:14:18 -0400
+Branch: REL9_3_STABLE [dd344de67] 2017-09-01 15:14:18 -0400
+Branch: REL9_2_STABLE [f60a236ba] 2017-09-01 15:14:18 -0400
+-->
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [35e156882] 2017-09-12 04:53:36 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [75fbf8ad1] 2017-09-18 23:07:18 +0200
+Branch: REL9_6_STABLE [59b5a3e5c] 2017-09-18 23:07:34 +0200
+Branch: REL9_5_STABLE [3a5aa7de3] 2017-09-18 23:07:44 +0200
+Branch: REL9_4_STABLE [e5b8b771e] 2017-09-18 23:08:17 +0200
+Branch: REL9_3_STABLE [149cfdb3a] 2017-09-18 23:08:24 +0200
+-->
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [a772624b1] 2017-08-26 12:57:21 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [38d7cb67f] 2017-09-14 00:47:03 +0200
+Branch: REL9_6_STABLE [839ee1811] 2017-09-14 01:17:03 +0200
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [04fbe0e45] 2017-08-26 19:11:58 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [eaf7001eb] 2017-09-14 00:47:08 +0200
+Branch: REL9_6_STABLE [407e66078] 2017-09-14 01:17:15 +0200
+-->
+     <para>
+      Fix <application>ecpg</application>'s regression tests to work reliably
+      on Windows (Christian Ullrich, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [47f849a3c] 2017-09-22 00:04:29 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [3876b16ce] 2017-09-22 00:04:21 -0400
+Branch: REL9_6_STABLE [e25f4401d] 2017-09-22 00:04:21 -0400
+Branch: REL9_5_STABLE [89f02e17a] 2017-09-22 00:04:21 -0400
+Branch: REL9_4_STABLE [dbd6099fb] 2017-09-22 00:04:21 -0400
+Branch: REL9_3_STABLE [2020f90bf] 2017-09-22 00:04:21 -0400
+Branch: REL9_2_STABLE [a07105afa] 2017-09-22 00:04:21 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [24a1897ab] 2017-10-23 17:54:09 -0400
+Branch: REL_10_STABLE [dffe7fbc2] 2017-10-23 17:54:09 -0400
+Branch: REL9_6_STABLE [173b7a4a7] 2017-10-23 17:54:09 -0400
+Branch: REL9_5_STABLE [4b433a8b0] 2017-10-23 17:54:09 -0400
+Branch: REL9_4_STABLE [876e076eb] 2017-10-23 17:54:09 -0400
+Branch: REL9_3_STABLE [9c74dd2d5] 2017-10-23 17:54:09 -0400
+Branch: REL9_2_STABLE [1317d1301] 2017-10-23 17:54:09 -0400
+-->
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-6-5">
   <title>Release 9.6.5</title>
 
@@ -46,20 +552,20 @@ Branch: REL9_2_STABLE [98e6784aa] 2017-08-15 19:33:04 -0400
 -->
      <para>
       Show foreign tables
-      in <structname>information_schema</>.<structname>table_privileges</>
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
       view (Peter Eisentraut)
      </para>
 
      <para>
-      All other relevant <structname>information_schema</> views include
+      All other relevant <structname>information_schema</structname> views include
       foreign tables, but this one ignored them.
      </para>
 
      <para>
-      Since this view definition is installed by <application>initdb</>,
+      Since this view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can, as a superuser, do this
-      in <application>psql</>:
+      in <application>psql</application>:
 <programlisting>
 SET search_path TO information_schema;
 CREATE OR REPLACE VIEW table_privileges AS
@@ -98,7 +604,7 @@ CREATE OR REPLACE VIEW table_privileges AS
                OR grantee.rolname = 'PUBLIC');
 </programlisting>
       This must be repeated in each database to be fixed,
-      including <literal>template0</>.
+      including <literal>template0</literal>.
      </para>
     </listitem>
 
@@ -114,14 +620,14 @@ Branch: REL9_2_STABLE [8ae41ceae] 2017-08-14 15:43:20 -0400
 -->
      <para>
       Clean up handling of a fatal exit (e.g., due to receipt
-      of <systemitem>SIGTERM</>) that occurs while trying to execute
-      a <command>ROLLBACK</> of a failed transaction (Tom Lane)
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
      </para>
 
      <para>
       This situation could result in an assertion failure.  In production
       builds, the exit would still occur, but it would log an unexpected
-      message about <quote>cannot drop active portal</>.
+      message about <quote>cannot drop active portal</quote>.
      </para>
     </listitem>
 
@@ -156,7 +662,7 @@ Branch: REL9_2_STABLE [4e704aac1] 2017-08-09 17:03:10 -0400
      </para>
 
      <para>
-      Certain <command>ALTER</> commands that change the definition of a
+      Certain <command>ALTER</command> commands that change the definition of a
       composite type or domain type are supposed to fail if there are any
       stored values of that type in the database, because they lack the
       infrastructure needed to update or check such values.  Previously,
@@ -189,7 +695,7 @@ Branch: REL9_4_STABLE [59dde9fed] 2017-08-19 13:39:38 -0400
 Branch: REL9_3_STABLE [ece4bd901] 2017-08-19 13:39:38 -0400
 -->
      <para>
-      Fix crash in <application>pg_restore</> when using parallel mode and
+      Fix crash in <application>pg_restore</application> when using parallel mode and
       using a list file to select a subset of items to restore
       (Fabr&iacute;zio de Royes Mello)
      </para>
@@ -206,13 +712,13 @@ Branch: REL9_3_STABLE [f8bc6b2f6] 2017-08-16 13:30:09 +0200
 Branch: REL9_2_STABLE [60b135c82] 2017-08-16 13:30:20 +0200
 -->
      <para>
-      Change <application>ecpg</>'s parser to allow <literal>RETURNING</>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
       clauses without attached C variables (Michael Meskes)
      </para>
 
      <para>
-      This allows <application>ecpg</> programs to contain SQL constructs
-      that use <literal>RETURNING</> internally (for example, inside a CTE)
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
       rather than using it to define values to be returned to the client.
      </para>
     </listitem>
@@ -225,7 +731,7 @@ Branch: REL_10_STABLE [a6b174f55] 2017-08-16 13:27:21 +0200
 Branch: REL9_6_STABLE [954490fec] 2017-08-16 13:28:10 +0200
 -->
      <para>
-      Change <application>ecpg</>'s parser to recognize backslash
+      Change <application>ecpg</application>'s parser to recognize backslash
       continuation of C preprocessor command lines (Michael Meskes)
      </para>
     </listitem>
@@ -253,12 +759,12 @@ Branch: REL9_2_STABLE [f7e4783dd] 2017-08-17 13:15:46 -0400
 
      <para>
       This fix avoids possible crashes of PL/Perl due to inconsistent
-      assumptions about the width of <type>time_t</> values.
+      assumptions about the width of <type>time_t</type> values.
       A side-effect that may be visible to extension developers is
-      that <literal>_USE_32BIT_TIME_T</> is no longer defined globally
-      in <productname>PostgreSQL</> Windows builds.  This is not expected
-      to cause problems, because type <type>time_t</> is not used
-      in any <productname>PostgreSQL</> API definitions.
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
      </para>
     </listitem>
 
@@ -270,7 +776,7 @@ Branch: REL9_6_STABLE [fc2aafe4a] 2017-08-09 12:06:08 -0400
 Branch: REL9_5_STABLE [a784d5f21] 2017-08-09 12:06:14 -0400
 -->
      <para>
-      Fix <literal>make check</> to behave correctly when invoked via a
+      Fix <literal>make check</literal> to behave correctly when invoked via a
       non-GNU make program (Thomas Munro)
      </para>
     </listitem>
@@ -329,7 +835,7 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
 -->
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -337,11 +843,11 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -356,15 +862,15 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -395,15 +901,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -417,7 +923,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -440,16 +946,16 @@ Branch: REL9_2_STABLE [06651648a] 2017-08-07 17:04:17 +0300
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -464,13 +970,13 @@ Branch: REL9_5_STABLE [873741c68] 2017-08-07 10:19:21 -0400
 Branch: REL9_4_STABLE [f1cda6d6c] 2017-08-07 10:19:22 -0400
 -->
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -485,12 +991,12 @@ Branch: REL9_5_STABLE [fd376afc9] 2017-06-15 12:30:02 -0400
 -->
      <para>
       Correct the documentation about the process for upgrading standby
-      servers with <application>pg_upgrade</> (Bruce Momjian)
+      servers with <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
       The previous documentation instructed users to start/stop the primary
-      server after running <application>pg_upgrade</> but before syncing
+      server after running <application>pg_upgrade</application> but before syncing
       the standby servers.  This sequence is unsafe.
      </para>
     </listitem>
@@ -697,7 +1203,7 @@ Branch: REL9_2_STABLE [81bf7b5b1] 2017-06-21 14:13:58 -0700
 -->
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
@@ -711,7 +1217,7 @@ Branch: REL9_5_STABLE [446914f6b] 2017-06-30 12:00:03 -0400
 Branch: REL9_4_STABLE [5aa8db014] 2017-06-30 12:00:03 -0400
 -->
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
@@ -731,7 +1237,7 @@ Branch: REL9_3_STABLE [45d067d50] 2017-06-05 19:18:16 -0700
 Branch: REL9_2_STABLE [133b1920c] 2017-06-05 19:18:16 -0700
 -->
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -761,7 +1267,7 @@ Branch: REL9_3_STABLE [cb59949f6] 2017-06-26 17:31:56 -0400
 Branch: REL9_2_STABLE [e96adaacd] 2017-06-26 17:31:56 -0400
 -->
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -880,7 +1386,7 @@ Branch: REL9_3_STABLE [aea1a3f0e] 2017-07-12 18:00:04 -0400
 Branch: REL9_2_STABLE [75670ec37] 2017-07-12 18:00:04 -0400
 -->
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -896,7 +1402,7 @@ Branch: REL9_4_STABLE [dc777f9db] 2017-06-27 17:51:11 -0400
 Branch: REL9_3_STABLE [66dee28b4] 2017-06-27 17:51:11 -0400
 -->
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -908,7 +1414,7 @@ Branch: master [7086be6e3] 2017-07-24 15:57:24 -0400
 Branch: REL9_6_STABLE [971faefc2] 2017-07-24 16:24:42 -0400
 -->
      <para>
-      Ensure that a view's <literal>CHECK OPTIONS</> clause is enforced
+      Ensure that a view's <literal>CHECK OPTIONS</literal> clause is enforced
       properly when the underlying table is a foreign table (Etsuro Fujita)
      </para>
 
@@ -930,12 +1436,12 @@ Branch: REL9_2_STABLE [da9165686] 2017-05-26 15:16:59 -0400
 -->
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
@@ -948,7 +1454,7 @@ Branch: REL9_6_STABLE [b35cce914] 2017-05-15 11:33:44 -0400
 Branch: REL9_5_STABLE [53a1aa9f9] 2017-05-15 11:33:45 -0400
 -->
      <para>
-      Fix dangling pointer in <command>ALTER TABLE</> when there is a
+      Fix dangling pointer in <command>ALTER TABLE</command> when there is a
       comment on a constraint belonging to the table (David Rowley)
      </para>
 
@@ -969,8 +1475,8 @@ Branch: REL9_3_STABLE [b7d1bc820] 2017-08-03 21:29:36 -0400
 Branch: REL9_2_STABLE [22eb38caa] 2017-08-03 21:42:46 -0400
 -->
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -981,18 +1487,18 @@ Branch: master [86705aa8c] 2017-08-03 13:24:48 -0400
 Branch: REL9_6_STABLE [1f220c390] 2017-08-03 13:25:32 -0400
 -->
      <para>
-      Allow a foreign table's <literal>CHECK</> constraints to be
-      initially <literal>NOT VALID</> (Amit Langote)
+      Allow a foreign table's <literal>CHECK</literal> constraints to be
+      initially <literal>NOT VALID</literal> (Amit Langote)
      </para>
 
      <para>
-      <command>CREATE TABLE</> silently drops <literal>NOT VALID</>
-      specifiers for <literal>CHECK</> constraints, reasoning that the
+      <command>CREATE TABLE</command> silently drops <literal>NOT VALID</literal>
+      specifiers for <literal>CHECK</literal> constraints, reasoning that the
       table must be empty so the constraint can be validated immediately.
-      But this is wrong for <command>CREATE FOREIGN TABLE</>, where there's
+      But this is wrong for <command>CREATE FOREIGN TABLE</command>, where there's
       no reason to suppose that the underlying table is empty, and even if
       it is it's no business of ours to decide that the constraint can be
-      treated as valid going forward.  Skip this <quote>optimization</> for
+      treated as valid going forward.  Skip this <quote>optimization</quote> for
       foreign tables.
      </para>
     </listitem>
@@ -1009,14 +1515,14 @@ Branch: REL9_2_STABLE [ac93a78b0] 2017-06-16 11:46:26 +0300
 -->
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
@@ -1028,7 +1534,7 @@ Branch: master [34aebcf42] 2017-06-02 19:11:15 -0700
 Branch: REL9_6_STABLE [8a7cd781e] 2017-06-02 19:11:23 -0700
 -->
      <para>
-      Allow parallelism in the query plan when <command>COPY</> copies from
+      Allow parallelism in the query plan when <command>COPY</command> copies from
       a query's result (Andres Freund)
      </para>
     </listitem>
@@ -1044,8 +1550,8 @@ Branch: REL9_3_STABLE [11854dee0] 2017-07-12 22:04:08 +0300
 Branch: REL9_2_STABLE [40ba61b44] 2017-07-12 22:04:15 +0300
 -->
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -1061,7 +1567,7 @@ Branch: REL9_2_STABLE [798d2321e] 2017-05-21 13:05:17 -0400
 -->
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
@@ -1077,7 +1583,7 @@ Branch: REL9_2_STABLE [a047270d5] 2017-05-24 15:28:35 -0400
 -->
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -1103,13 +1609,13 @@ Branch: REL9_3_STABLE [0d8f015e7] 2017-07-31 12:38:35 -0400
 Branch: REL9_2_STABLE [456c7dff2] 2017-07-31 12:38:35 -0400
 -->
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
@@ -1124,7 +1630,7 @@ Branch: REL9_4_STABLE [1fe1fc449] 2017-06-07 14:04:49 +0300
 Branch: REL9_3_STABLE [f2fa0c651] 2017-06-07 14:04:44 +0300
 -->
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -1146,9 +1652,9 @@ Branch: REL9_3_STABLE [6bc710f6d] 2017-05-17 12:24:19 -0400
 Branch: REL9_2_STABLE [07477130e] 2017-05-17 12:24:19 -0400
 -->
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -1167,8 +1673,8 @@ Branch: REL9_4_STABLE [b93217653] 2017-08-03 17:36:43 -0400
 Branch: REL9_3_STABLE [035bb8222] 2017-08-03 17:36:23 -0400
 -->
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -1190,8 +1696,8 @@ Branch: REL9_5_STABLE [12f1e523a] 2017-08-03 14:55:17 -0400
 Branch: REL9_4_STABLE [69ad12b58] 2017-08-03 14:55:17 -0400
 -->
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -1206,7 +1712,7 @@ Branch: REL9_4_STABLE [502ead3d6] 2017-07-22 20:20:10 -0400
 Branch: REL9_3_STABLE [68a22bc69] 2017-07-22 20:20:10 -0400
 -->
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -1224,8 +1730,8 @@ Branch: master [4500edc7e] 2017-06-28 10:33:57 -0400
 Branch: REL9_6_STABLE [a2de017b3] 2017-06-28 10:34:01 -0400
 -->
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to not
-      fail when the <literal>public</> schema doesn't exist (Stephen Frost)
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to not
+      fail when the <literal>public</literal> schema doesn't exist (Stephen Frost)
      </para>
     </listitem>
 
@@ -1240,7 +1746,7 @@ Branch: REL9_3_STABLE [a561254e4] 2017-05-26 12:51:05 -0400
 Branch: REL9_2_STABLE [f62e1eff5] 2017-05-26 12:51:06 -0400
 -->
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
@@ -1256,7 +1762,7 @@ Branch: REL9_3_STABLE [2943c04f7] 2017-06-19 11:03:16 -0400
 Branch: REL9_2_STABLE [c10cbf77a] 2017-06-19 11:03:21 -0400
 -->
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -1276,14 +1782,14 @@ Branch: REL9_3_STABLE [b6d640047] 2017-07-24 15:16:31 -0400
 Branch: REL9_2_STABLE [d9874fde8] 2017-07-24 15:16:31 -0400
 -->
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -1299,7 +1805,7 @@ Branch: REL9_3_STABLE [e947838ae] 2017-07-20 11:29:36 -0400
 -->
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
@@ -1314,7 +1820,7 @@ Branch: REL9_3_STABLE [0ecc407d9] 2017-07-13 19:24:44 -0400
 Branch: REL9_2_STABLE [bccfb1776] 2017-07-13 19:24:44 -0400
 -->
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -1331,7 +1837,7 @@ Branch: REL9_3_STABLE [f3633689f] 2017-07-14 16:03:23 +0300
 Branch: REL9_2_STABLE [4b994a96c] 2017-07-14 16:03:27 +0300
 -->
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -1349,12 +1855,12 @@ Branch: REL9_6_STABLE [73fbf3d3d] 2017-07-21 22:04:55 -0400
 Branch: REL9_5_STABLE [ed367be64] 2017-07-21 22:05:07 -0400
 -->
      <para>
-      Fix <application>pg_rewind</> to correctly handle files exceeding 2GB
+      Fix <application>pg_rewind</application> to correctly handle files exceeding 2GB
       (Kuntal Ghosh, Michael Paquier)
      </para>
 
      <para>
-      Ordinarily such files won't appear in <productname>PostgreSQL</> data
+      Ordinarily such files won't appear in <productname>PostgreSQL</productname> data
       directories, but they could be present in some cases.
      </para>
     </listitem>
@@ -1370,8 +1876,8 @@ Branch: REL9_3_STABLE [5c890645d] 2017-06-20 13:20:02 -0400
 Branch: REL9_2_STABLE [65beccae5] 2017-06-20 13:20:02 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -1389,7 +1895,7 @@ Branch: REL9_6_STABLE [d3ca4b4b4] 2017-06-05 16:10:07 -0700
 Branch: REL9_5_STABLE [25653c171] 2017-06-05 16:10:07 -0700
 -->
      <para>
-      Fix <application>pg_xlogdump</>'s computation of WAL record length
+      Fix <application>pg_xlogdump</application>'s computation of WAL record length
       (Andres Freund)
      </para>
     </listitem>
@@ -1409,9 +1915,9 @@ Branch: REL9_4_STABLE [a648fc70a] 2017-07-21 14:20:43 -0400
 Branch: REL9_3_STABLE [6d9de660d] 2017-07-21 14:20:43 -0400
 -->
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -1430,7 +1936,7 @@ Branch: REL9_4_STABLE [c02c450cf] 2017-06-07 15:40:35 -0400
 Branch: REL9_3_STABLE [fc267a0c3] 2017-06-07 15:41:05 -0400
 -->
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -1449,7 +1955,7 @@ Branch: REL9_5_STABLE [6f2fe2468] 2017-05-11 14:51:38 -0400
 Branch: REL9_4_STABLE [5c633f76b] 2017-05-11 14:51:46 -0400
 -->
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
@@ -1465,7 +1971,7 @@ Branch: REL9_3_STABLE [cee7238de] 2017-06-01 13:32:56 -0400
 Branch: REL9_2_STABLE [a378b9bc2] 2017-06-01 13:32:56 -0400
 -->
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -1492,8 +1998,8 @@ Branch: REL9_3_STABLE [da30fa603] 2017-06-05 20:40:47 -0400
 Branch: REL9_2_STABLE [f964a7c5a] 2017-06-05 20:41:01 -0400
 -->
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -1508,13 +2014,13 @@ Branch: REL9_3_STABLE [2c7d2114b] 2017-05-12 10:24:16 -0400
 Branch: REL9_2_STABLE [614f83c12] 2017-05-12 10:24:36 -0400
 -->
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
@@ -1530,7 +2036,7 @@ Branch: REL9_2_STABLE [4885e5c88] 2017-07-23 23:53:55 -0700
 -->
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -1551,8 +2057,8 @@ Branch: REL9_5_STABLE [7eb4124da] 2017-07-16 11:27:07 -0400
 Branch: REL9_4_STABLE [9c3f502b4] 2017-07-16 11:27:15 -0400
 -->
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -1589,7 +2095,7 @@ Branch: REL9_4_STABLE [9c3f502b4] 2017-07-16 11:27:15 -0400
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
@@ -1615,18 +2121,18 @@ Branch: REL9_2_STABLE [99cbb0bd9] 2017-05-08 07:24:28 -0700
 -->
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -1665,7 +2171,7 @@ Branch: REL9_3_STABLE [703da1795] 2017-05-08 11:19:08 -0400
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -1687,17 +2193,17 @@ Branch: REL9_4_STABLE [ed36c1fe1] 2017-05-08 07:24:27 -0700
 Branch: REL9_3_STABLE [3eab81127] 2017-05-08 07:24:28 -0700
 -->
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -1748,7 +2254,7 @@ Branch: REL9_3_STABLE [6bd7816e7] 2017-03-14 12:08:14 -0400
 Branch: REL9_2_STABLE [b2ae1d6c4] 2017-03-14 12:10:36 -0400
 -->
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -1770,7 +2276,7 @@ Branch: REL9_3_STABLE [856580873] 2017-04-23 13:10:57 -0400
 Branch: REL9_2_STABLE [952e33b05] 2017-04-23 13:10:58 -0400
 -->
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -1778,7 +2284,7 @@ Branch: REL9_2_STABLE [952e33b05] 2017-04-23 13:10:58 -0400
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -1792,7 +2298,7 @@ Branch: REL9_5_STABLE [feb659cce] 2017-02-22 08:29:44 +0900
 Branch: REL9_4_STABLE [a3eb715a3] 2017-02-22 08:29:57 +0900
 -->
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
@@ -1840,7 +2346,7 @@ Branch: REL9_5_STABLE [dba1f310a] 2017-04-24 12:16:58 -0400
 Branch: REL9_4_STABLE [436b560b8] 2017-04-24 12:16:58 -0400
 -->
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -1858,7 +2364,7 @@ Branch: master [89deca582] 2017-04-07 12:18:38 -0400
 Branch: REL9_6_STABLE [c0a493e17] 2017-04-07 12:18:38 -0400
 -->
      <para>
-      Fix possible <quote>no relation entry for relid 0</> error when
+      Fix possible <quote>no relation entry for relid 0</quote> error when
       planning nested set operations (Tom Lane)
      </para>
     </listitem>
@@ -1886,7 +2392,7 @@ Branch: REL9_6_STABLE [6c73b390b] 2017-04-17 15:29:00 -0400
 Branch: REL9_5_STABLE [6f0f98bb0] 2017-04-17 15:29:00 -0400
 -->
      <para>
-      Avoid applying <quote>physical targetlist</> optimization to custom
+      Avoid applying <quote>physical targetlist</quote> optimization to custom
       scans (Dmitry Ivanov, Tom Lane)
      </para>
 
@@ -1905,13 +2411,13 @@ Branch: REL9_6_STABLE [92b15224b] 2017-05-06 21:46:41 -0400
 Branch: REL9_5_STABLE [d617c7629] 2017-05-06 21:46:56 -0400
 -->
      <para>
-      Use the correct sub-expression when applying a <literal>FOR ALL</>
+      Use the correct sub-expression when applying a <literal>FOR ALL</literal>
       row-level-security policy (Stephen Frost)
      </para>
 
      <para>
-      In some cases the <literal>WITH CHECK</> restriction would be applied
-      when the <literal>USING</> restriction is more appropriate.
+      In some cases the <literal>WITH CHECK</literal> restriction would be applied
+      when the <literal>USING</literal> restriction is more appropriate.
      </para>
     </listitem>
 
@@ -1934,7 +2440,7 @@ Branch: REL9_2_STABLE [c9d6c564f] 2017-05-02 18:05:54 -0400
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
@@ -1950,12 +2456,12 @@ Branch: REL9_2_STABLE [27a8c8033] 2017-02-12 16:05:23 -0500
 -->
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -1972,13 +2478,13 @@ Branch: REL9_3_STABLE [954744f7a] 2017-04-28 14:53:56 -0400
 Branch: REL9_2_STABLE [f60f0c8fe] 2017-04-28 14:55:42 -0400
 -->
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
@@ -1991,7 +2497,7 @@ Branch: REL9_6_STABLE [943140d57] 2017-03-06 16:50:47 -0500
 Branch: REL9_5_STABLE [420d9ec0a] 2017-03-06 16:50:47 -0500
 -->
      <para>
-      Avoid dangling pointer in <command>COPY ... TO</> when row-level
+      Avoid dangling pointer in <command>COPY ... TO</command> when row-level
       security is active for the source table (Tom Lane)
      </para>
 
@@ -2009,8 +2515,8 @@ Branch: REL9_6_STABLE [68f7b91e5] 2017-03-04 16:09:33 -0500
 Branch: REL9_5_STABLE [807df31d1] 2017-03-04 16:09:33 -0500
 -->
      <para>
-      Avoid accessing an already-closed relcache entry in <command>CLUSTER</>
-      and <command>VACUUM FULL</> (Tom Lane)
+      Avoid accessing an already-closed relcache entry in <command>CLUSTER</command>
+      and <command>VACUUM FULL</command> (Tom Lane)
      </para>
 
      <para>
@@ -2032,14 +2538,14 @@ Branch: master [64ae420b2] 2017-03-17 14:35:54 +0000
 Branch: REL9_6_STABLE [733488dc6] 2017-03-17 14:46:15 +0000
 -->
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -2067,13 +2573,13 @@ Branch: master [d5286aa90] 2017-03-21 16:23:10 +0300
 Branch: REL9_6_STABLE [a4d07d2e9] 2017-03-21 16:24:10 +0300
 -->
      <para>
-      Fix incorrect support for certain <type>box</> operators in SP-GiST
+      Fix incorrect support for certain <type>box</type> operators in SP-GiST
       (Nikita Glukhov)
      </para>
 
      <para>
-      SP-GiST index scans using the operators <literal>&amp;&lt;</>
-      <literal>&amp;&gt;</> <literal>&amp;&lt;|</> and <literal>|&amp;&gt;</>
+      SP-GiST index scans using the operators <literal>&amp;&lt;</literal>
+      <literal>&amp;&gt;</literal> <literal>&amp;&lt;|</literal> and <literal>|&amp;&gt;</literal>
       would yield incorrect answers.
      </para>
     </listitem>
@@ -2087,12 +2593,12 @@ Branch: REL9_5_STABLE [d68a2b20a] 2017-04-05 23:51:28 -0400
 Branch: REL9_4_STABLE [8851bcf88] 2017-04-05 23:51:28 -0400
 -->
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -2110,13 +2616,13 @@ Branch: REL9_3_STABLE [6e86b448f] 2017-05-04 21:31:12 -0400
 Branch: REL9_2_STABLE [a48d47908] 2017-05-04 22:39:23 -0400
 -->
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
@@ -2134,8 +2640,8 @@ Branch: REL9_5_STABLE [cf73c6bfc] 2017-02-09 15:49:57 -0500
 Branch: REL9_4_STABLE [86ef376bb] 2017-02-09 15:49:58 -0500
 -->
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -2155,7 +2661,7 @@ Branch: REL9_6_STABLE [1ec36a9eb] 2017-04-16 20:49:40 -0400
 Branch: REL9_5_STABLE [b6e6ae1dc] 2017-04-16 20:50:31 -0400
 -->
      <para>
-      Fix <function>pg_get_object_address()</> to handle members of operator
+      Fix <function>pg_get_object_address()</function> to handle members of operator
       families correctly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -2167,12 +2673,12 @@ Branch: master [78874531b] 2017-03-24 13:53:40 +0300
 Branch: REL9_6_STABLE [8de6278d3] 2017-03-24 13:55:02 +0300
 -->
      <para>
-      Fix cancelling of <function>pg_stop_backup()</> when attempting to stop
+      Fix cancelling of <function>pg_stop_backup()</function> when attempting to stop
       a non-exclusive backup (Michael Paquier, David Steele)
      </para>
 
      <para>
-      If <function>pg_stop_backup()</> was cancelled while waiting for a
+      If <function>pg_stop_backup()</function> was cancelled while waiting for a
       non-exclusive backup to end, related state was left inconsistent;
       a new exclusive backup could not be started, and there were other minor
       problems.
@@ -2196,7 +2702,7 @@ Branch: REL9_3_STABLE [07987304d] 2017-05-07 11:35:05 -0400
 Branch: REL9_2_STABLE [9061680f0] 2017-05-07 11:35:11 -0400
 -->
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -2226,13 +2732,13 @@ Branch: REL9_3_STABLE [3f613c6a4] 2017-02-21 17:51:28 -0500
 Branch: REL9_2_STABLE [775227590] 2017-02-21 17:51:28 -0500
 -->
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -2273,8 +2779,8 @@ Branch: REL9_3_STABLE [04207ef76] 2017-03-13 20:52:05 +0100
 Branch: REL9_2_STABLE [d8c207437] 2017-03-13 20:52:16 +0100
 -->
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
@@ -2290,7 +2796,7 @@ Branch: REL9_2_STABLE [731afc91f] 2017-03-10 10:52:01 +0100
 -->
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
@@ -2300,8 +2806,8 @@ Author: Teodor Sigaev <teodor@sigaev.ru>
 Branch: REL9_6_STABLE [2ed391f95] 2017-03-24 19:23:13 +0300
 -->
      <para>
-      Fix <application>pgbench</> to handle the combination
-      of <option>--connect</> and <option>--rate</> options correctly
+      Fix <application>pgbench</application> to handle the combination
+      of <option>--connect</option> and <option>--rate</option> options correctly
       (Fabien Coelho)
      </para>
     </listitem>
@@ -2313,8 +2819,8 @@ Branch: master [ef2662394] 2017-03-07 11:36:42 -0500
 Branch: REL9_6_STABLE [0e2c85d13] 2017-03-07 11:36:35 -0500
 -->
      <para>
-      Fix <application>pgbench</> to honor the long-form option
-      spelling <option>--builtin</>, as per its documentation (Tom Lane)
+      Fix <application>pgbench</application> to honor the long-form option
+      spelling <option>--builtin</option>, as per its documentation (Tom Lane)
      </para>
     </listitem>
 
@@ -2325,15 +2831,15 @@ Branch: master [330b84d8c] 2017-03-06 23:29:02 -0500
 Branch: REL9_6_STABLE [e961341cc] 2017-03-06 23:29:08 -0500
 -->
      <para>
-      Fix <application>pg_dump</>/<application>pg_restore</> to correctly
-      handle privileges for the <literal>public</> schema when
-      using <option>--clean</> option (Stephen Frost)
+      Fix <application>pg_dump</application>/<application>pg_restore</application> to correctly
+      handle privileges for the <literal>public</literal> schema when
+      using <option>--clean</option> option (Stephen Frost)
      </para>
 
      <para>
       Other schemas start out with no privileges granted,
-      but <literal>public</> does not; this requires special-case treatment
-      when it is dropped and restored due to the <option>--clean</> option.
+      but <literal>public</literal> does not; this requires special-case treatment
+      when it is dropped and restored due to the <option>--clean</option> option.
      </para>
     </listitem>
 
@@ -2348,7 +2854,7 @@ Branch: REL9_3_STABLE [783acfd4d] 2017-03-06 19:33:59 -0500
 Branch: REL9_2_STABLE [0ab75448e] 2017-03-06 19:33:59 -0500
 -->
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -2368,12 +2874,12 @@ Branch: master [39370e6a0] 2017-02-17 15:06:28 -0500
 Branch: REL9_6_STABLE [4e8b2fd33] 2017-02-17 15:06:34 -0500
 -->
      <para>
-      Fix typo in <application>pg_dump</>'s query for initial privileges
+      Fix typo in <application>pg_dump</application>'s query for initial privileges
       of a procedural language (Peter Eisentraut)
      </para>
 
      <para>
-      This resulted in <application>pg_dump</> always believing that the
+      This resulted in <application>pg_dump</application> always believing that the
       language had no initial privileges.  Since that's true for most
       procedural languages, ill effects from this bug are probably rare.
      </para>
@@ -2390,13 +2896,13 @@ Branch: REL9_3_STABLE [0c0a95c2f] 2017-03-10 14:15:09 -0500
 Branch: REL9_2_STABLE [e6d2ba419] 2017-03-10 14:15:09 -0500
 -->
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
@@ -2411,8 +2917,8 @@ Branch: REL9_3_STABLE [7f831f09b] 2017-03-06 17:04:29 -0500
 Branch: REL9_2_STABLE [e864cd25b] 2017-03-06 17:04:55 -0500
 -->
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -2433,13 +2939,13 @@ Branch: REL9_2_STABLE [0276da5eb] 2017-03-12 19:36:28 -0400
 -->
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
@@ -2454,7 +2960,7 @@ Branch: REL9_3_STABLE [f6cfc14e5] 2017-03-11 13:33:22 -0800
 Branch: REL9_2_STABLE [c4613c3f4] 2017-03-11 13:33:30 -0800
 -->
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
@@ -2479,7 +2985,7 @@ Branch: REL9_4_STABLE [b179684c7] 2017-04-13 17:18:35 -0400
 Branch: REL9_3_STABLE [5be58cc89] 2017-04-13 17:18:35 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -2497,7 +3003,7 @@ Branch: master [332bec1e6] 2017-04-24 22:50:07 -0400
 Branch: REL9_6_STABLE [86e640a69] 2017-04-26 09:14:21 -0400
 -->
      <para>
-      In <filename>contrib/postgres_fdw</>, allow join conditions that
+      In <filename>contrib/postgres_fdw</filename>, allow join conditions that
       contain shippable extension-provided functions to be pushed to the
       remote server (David Rowley, Ashutosh Bapat)
      </para>
@@ -2555,7 +3061,7 @@ Branch: REL9_3_STABLE [dc93cafca] 2017-05-01 11:54:02 -0400
 Branch: REL9_2_STABLE [c96ccc40e] 2017-05-01 11:54:08 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -2569,9 +3075,9 @@ Branch: REL9_2_STABLE [c96ccc40e] 2017-05-01 11:54:08 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -2593,15 +3099,15 @@ Branch: REL9_2_STABLE [82e7d3dfd] 2017-05-07 11:57:41 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
       other zone file (see <xref linkend="datatype-timezones">).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
@@ -2663,15 +3169,15 @@ Branch: REL9_2_STABLE [bcd7b47c2] 2017-02-06 13:20:25 -0500
 -->
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -2695,7 +3201,7 @@ Branch: REL9_4_STABLE [3e844a34b] 2016-11-15 15:55:36 -0500
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
@@ -2711,7 +3217,7 @@ Branch: REL9_5_STABLE [ed8e8b814] 2017-01-09 18:19:29 -0300
      </para>
 
      <para>
-      The WAL record emitted for a BRIN <quote>revmap</> page when moving an
+      The WAL record emitted for a BRIN <quote>revmap</quote> page when moving an
       index tuple to a different page was incorrect.  Replay would make the
       related portion of the index useless, forcing it to be recomputed.
      </para>
@@ -2728,13 +3234,13 @@ Branch: REL9_3_STABLE [8e403f215] 2016-12-08 14:16:47 -0500
 Branch: REL9_2_STABLE [a00ac6299] 2016-12-08 14:19:25 -0500
 -->
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
       Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -2816,7 +3322,7 @@ Branch: master [93eb619cd] 2016-12-17 02:22:15 +0900
 Branch: REL9_6_STABLE [6c75fb6b3] 2016-12-17 02:25:47 +0900
 -->
      <para>
-      Disallow setting the <replaceable>num_sync</> field to zero in
+      Disallow setting the <replaceable>num_sync</replaceable> field to zero in
       <xref linkend="guc-synchronous-standby-names"> (Fujii Masao)
      </para>
 
@@ -2867,7 +3373,7 @@ Branch: REL9_6_STABLE [20064c0ec] 2017-01-29 23:05:09 -0500
 -->
      <para>
       Fix tracking of initial privileges for extension member objects so
-      that it works correctly with <command>ALTER EXTENSION ... ADD/DROP</>
+      that it works correctly with <command>ALTER EXTENSION ... ADD/DROP</command>
       (Stephen Frost)
      </para>
 
@@ -2875,7 +3381,7 @@ Branch: REL9_6_STABLE [20064c0ec] 2017-01-29 23:05:09 -0500
       An object's current privileges at the time it is added to the
       extension will now be considered its default privileges; only
       later changes in its privileges will be dumped by
-      subsequent <application>pg_dump</> runs.
+      subsequent <application>pg_dump</application> runs.
      </para>
     </listitem>
 
@@ -2890,7 +3396,7 @@ Branch: REL9_3_STABLE [8f67a6c22] 2016-11-23 13:45:56 -0500
 Branch: REL9_2_STABLE [05975ab0a] 2016-11-23 13:45:56 -0500
 -->
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
@@ -2912,7 +3418,7 @@ Branch: REL9_4_STABLE [3a9a8c408] 2016-10-26 17:05:06 -0400
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -2937,8 +3443,8 @@ Branch: REL9_2_STABLE [6a363a4c2] 2016-11-25 13:44:48 -0500
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
@@ -2950,15 +3456,15 @@ Branch: REL9_6_STABLE [4e563a1f6] 2017-01-09 19:26:58 -0300
 Branch: REL9_5_STABLE [4d4ab6ccd] 2017-01-09 19:26:58 -0300
 -->
      <para>
-      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</> when child
+      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</command> when child
       table has different column ordering than the parent
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      Failure to adjust the column numbering in the <literal>USING</>
+      Failure to adjust the column numbering in the <literal>USING</literal>
       expression led to errors,
-      typically <quote>attribute <replaceable>N</> has wrong type</quote>.
+      typically <quote>attribute <replaceable>N</replaceable> has wrong type</quote>.
      </para>
     </listitem>
 
@@ -2974,7 +3480,7 @@ Branch: REL9_2_STABLE [6c4cf2be8] 2017-01-04 18:00:12 -0500
 -->
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -2992,8 +3498,8 @@ Branch: master [1ead0208b] 2016-12-22 16:23:38 -0500
 Branch: REL9_6_STABLE [68330c8b4] 2016-12-22 16:23:34 -0500
 -->
      <para>
-      Ensure that <command>CREATE TABLE ... LIKE ... WITH OIDS</> creates
-      a table with OIDs, whether or not the <literal>LIKE</>-referenced
+      Ensure that <command>CREATE TABLE ... LIKE ... WITH OIDS</command> creates
+      a table with OIDs, whether or not the <literal>LIKE</literal>-referenced
       table(s) have OIDs (Tom Lane)
      </para>
     </listitem>
@@ -3007,7 +3513,7 @@ Branch: REL9_5_STABLE [78a98b767] 2016-12-21 17:02:47 +0000
 Branch: REL9_4_STABLE [cad24980e] 2016-12-21 17:03:54 +0000
 -->
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -3028,7 +3534,7 @@ Branch: REL9_3_STABLE [0e3aadb68] 2016-12-22 17:09:00 -0500
 -->
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -3046,8 +3552,8 @@ Branch: REL9_5_STABLE [7816d1356] 2016-11-24 15:39:55 -0300
 -->
      <para>
       Fix commit timestamp mechanism to not fail when queried about
-      the special XIDs <literal>FrozenTransactionId</>
-      and <literal>BootstrapTransactionId</> (Craig Ringer)
+      the special XIDs <literal>FrozenTransactionId</literal>
+      and <literal>BootstrapTransactionId</literal> (Craig Ringer)
      </para>
     </listitem>
 
@@ -3068,8 +3574,8 @@ Branch: REL9_5_STABLE [6e00ba1e1] 2016-11-10 15:00:58 -0500
 
      <para>
       The symptom was spurious <quote>ON CONFLICT is not supported on table
-      ... used as a catalog table</> errors when the target
-      of <command>INSERT ... ON CONFLICT</> is a view with cascade option.
+      ... used as a catalog table</quote> errors when the target
+      of <command>INSERT ... ON CONFLICT</command> is a view with cascade option.
      </para>
     </listitem>
 
@@ -3081,8 +3587,8 @@ Branch: REL9_6_STABLE [da05d0ebc] 2016-12-04 15:02:46 -0500
 Branch: REL9_5_STABLE [25c06a1ed] 2016-12-04 15:02:48 -0500
 -->
      <para>
-      Fix incorrect <quote>target lists can have at most <replaceable>N</>
-      entries</quote> complaint when using <literal>ON CONFLICT</> with
+      Fix incorrect <quote>target lists can have at most <replaceable>N</replaceable>
+      entries</quote> complaint when using <literal>ON CONFLICT</literal> with
       wide tables (Tom Lane)
      </para>
     </listitem>
@@ -3094,8 +3600,8 @@ Branch: master [da8f3ebf3] 2016-11-02 14:32:13 -0400
 Branch: REL9_6_STABLE [f4d865f22] 2016-11-02 14:32:13 -0400
 -->
      <para>
-      Fix spurious <quote>query provides a value for a dropped column</>
-      errors during <command>INSERT</> or <command>UPDATE</> on a table
+      Fix spurious <quote>query provides a value for a dropped column</quote>
+      errors during <command>INSERT</command> or <command>UPDATE</command> on a table
       with a dropped column (Tom Lane)
      </para>
     </listitem>
@@ -3110,13 +3616,13 @@ Branch: REL9_4_STABLE [44c8b4fcd] 2016-11-20 14:26:19 -0500
 Branch: REL9_3_STABLE [71db302ec] 2016-11-20 14:26:19 -0500
 -->
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -3133,12 +3639,12 @@ Branch: REL9_2_STABLE [082d1fb9e] 2016-12-09 12:01:14 -0500
 -->
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -3162,8 +3668,8 @@ Branch: REL9_2_STABLE [6e2c21ec5] 2016-12-21 17:39:33 -0500
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
@@ -3174,7 +3680,7 @@ Branch: master [db80acfc9] 2016-12-20 09:20:17 +0200
 Branch: REL9_6_STABLE [ce92fc4e2] 2016-12-20 09:20:30 +0200
 -->
      <para>
-      Fix execution of <literal>DISTINCT</> and ordered aggregates when
+      Fix execution of <literal>DISTINCT</literal> and ordered aggregates when
       multiple such aggregates are able to share the same transition state
       (Heikki Linnakangas)
      </para>
@@ -3189,7 +3695,7 @@ Branch: master [260443847] 2016-12-19 13:49:50 -0500
 Branch: REL9_6_STABLE [3f07eff10] 2016-12-19 13:49:45 -0500
 -->
      <para>
-      Fix implementation of phrase search operators in <type>tsquery</>
+      Fix implementation of phrase search operators in <type>tsquery</type>
       (Tom Lane)
      </para>
 
@@ -3218,7 +3724,7 @@ Branch: REL9_2_STABLE [fe6120f9b] 2017-01-26 12:17:47 -0500
 -->
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -3238,7 +3744,7 @@ Branch: REL9_3_STABLE [79e1a9efa] 2016-12-11 13:09:57 -0500
 Branch: REL9_2_STABLE [f4ccee408] 2016-12-11 13:09:57 -0500
 -->
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
@@ -3254,7 +3760,7 @@ Branch: REL9_3_STABLE [407d513df] 2016-10-30 17:35:43 -0400
 Branch: REL9_2_STABLE [606e16a7f] 2016-10-30 17:35:43 -0400
 -->
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
@@ -3269,7 +3775,7 @@ Branch: REL9_3_STABLE [77a22f898] 2016-10-30 15:24:40 -0400
 Branch: REL9_2_STABLE [b0f8a273e] 2016-10-30 15:24:40 -0400
 -->
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
@@ -3283,7 +3789,7 @@ Branch: REL9_5_STABLE [7151e72d7] 2016-10-30 12:27:41 -0400
 -->
      <para>
       Improve speed of user-defined aggregates that
-      use <function>array_append()</> as transition function (Tom Lane)
+      use <function>array_append()</function> as transition function (Tom Lane)
      </para>
     </listitem>
 
@@ -3298,7 +3804,7 @@ Branch: REL9_3_STABLE [ee9cb284a] 2017-01-05 11:33:51 -0500
 Branch: REL9_2_STABLE [e0d59c6ef] 2017-01-05 11:33:51 -0500
 -->
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
@@ -3310,8 +3816,8 @@ Branch: REL9_6_STABLE [79c89f1f4] 2016-12-09 12:42:17 -0300
 Branch: REL9_5_STABLE [581b09c72] 2016-12-09 12:42:17 -0300
 -->
      <para>
-      Fix possible crash in <function>array_position()</>
-      or <function>array_positions()</> when processing arrays of records
+      Fix possible crash in <function>array_position()</function>
+      or <function>array_positions()</function> when processing arrays of records
       (Junseok Yang)
      </para>
     </listitem>
@@ -3327,7 +3833,7 @@ Branch: REL9_3_STABLE [e71fe8470] 2016-12-16 12:53:22 +0200
 Branch: REL9_2_STABLE [c8f8ed5c2] 2016-12-16 12:53:27 +0200
 -->
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -3348,8 +3854,8 @@ Branch: REL9_3_STABLE [f64b11fa0] 2017-01-17 17:32:20 +0900
 Branch: REL9_2_STABLE [c73157ca0] 2017-01-17 17:32:45 +0900
 -->
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -3368,7 +3874,7 @@ Branch: REL9_5_STABLE [74e67bbad] 2017-01-18 15:21:52 -0500
 -->
      <para>
       Disable transform that attempted to remove no-op <literal>AT TIME
-      ZONE</> conversions (Tom Lane)
+      ZONE</literal> conversions (Tom Lane)
      </para>
 
      <para>
@@ -3388,15 +3894,15 @@ Branch: REL9_3_STABLE [583599839] 2016-12-27 15:43:54 -0500
 Branch: REL9_2_STABLE [beae7d5f0] 2016-12-27 15:43:55 -0500
 -->
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -3432,7 +3938,7 @@ Branch: master [4212cb732] 2016-12-06 11:11:54 -0500
 Branch: REL9_6_STABLE [ebe5dc9e0] 2016-12-06 11:43:12 -0500
 -->
      <para>
-      Allow statements prepared with <command>PREPARE</> to be given
+      Allow statements prepared with <command>PREPARE</command> to be given
       parallel plans (Amit Kapila, Tobias Bussmann)
      </para>
     </listitem>
@@ -3501,7 +4007,7 @@ Branch: REL9_6_STABLE [7defc3b97] 2016-11-10 11:31:56 -0500
 -->
      <para>
       Fix the plan generated for sorted partial aggregation with a constant
-      <literal>GROUP BY</> clause (Tom Lane)
+      <literal>GROUP BY</literal> clause (Tom Lane)
      </para>
     </listitem>
 
@@ -3512,8 +4018,8 @@ Branch: master [1f542a2ea] 2016-12-13 13:20:37 -0500
 Branch: REL9_6_STABLE [997a2994e] 2016-12-13 13:20:16 -0500
 -->
      <para>
-      Fix <quote>could not find plan for CTE</> planner error when dealing
-      with a <literal>UNION ALL</> containing CTE references (Tom Lane)
+      Fix <quote>could not find plan for CTE</quote> planner error when dealing
+      with a <literal>UNION ALL</literal> containing CTE references (Tom Lane)
      </para>
     </listitem>
 
@@ -3530,7 +4036,7 @@ Branch: REL9_6_STABLE [b971a98ce] 2017-02-02 19:11:27 -0500
 
      <para>
       The typical consequence of this mistake was a <quote>plan should not
-      reference subplan's variable</> error.
+      reference subplan's variable</quote> error.
      </para>
     </listitem>
 
@@ -3561,7 +4067,7 @@ Branch: master [bec96c82f] 2017-01-19 12:06:21 -0500
 Branch: REL9_6_STABLE [fd081cabf] 2017-01-19 12:06:27 -0500
 -->
      <para>
-      Fix <application>pg_dump</> to emit the data of a sequence that is
+      Fix <application>pg_dump</application> to emit the data of a sequence that is
       marked as an extension configuration table (Michael Paquier)
      </para>
     </listitem>
@@ -3573,14 +4079,14 @@ Branch: master [e2090d9d2] 2017-01-31 16:24:11 -0500
 Branch: REL9_6_STABLE [eb5e9d90d] 2017-01-31 16:24:14 -0500
 -->
      <para>
-      Fix mishandling of <command>ALTER DEFAULT PRIVILEGES ... REVOKE</>
-      in <application>pg_dump</> (Stephen Frost)
+      Fix mishandling of <command>ALTER DEFAULT PRIVILEGES ... REVOKE</command>
+      in <application>pg_dump</application> (Stephen Frost)
      </para>
 
      <para>
-      <application>pg_dump</> missed issuing the
-      required <literal>REVOKE</> commands in cases where <command>ALTER
-      DEFAULT PRIVILEGES</> had been used to reduce privileges to less than
+      <application>pg_dump</application> missed issuing the
+      required <literal>REVOKE</literal> commands in cases where <command>ALTER
+      DEFAULT PRIVILEGES</command> had been used to reduce privileges to less than
       they would normally be.
      </para>
     </listitem>
@@ -3602,7 +4108,7 @@ Branch: REL9_3_STABLE [fc03f7dd1] 2016-12-21 13:47:28 -0500
 Branch: REL9_2_STABLE [59a389891] 2016-12-21 13:47:32 -0500
 -->
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
@@ -3616,15 +4122,15 @@ Branch: REL9_5_STABLE [a7864037d] 2016-11-17 14:59:23 -0500
 Branch: REL9_4_STABLE [e69b532be] 2016-11-17 14:59:26 -0500
 -->
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
@@ -3637,7 +4143,7 @@ Branch: REL9_5_STABLE [bc53d7130] 2016-12-19 10:16:02 +0100
 Branch: REL9_4_STABLE [f6508827a] 2016-12-19 10:16:12 +0100
 -->
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -3656,8 +4162,8 @@ Branch: REL9_5_STABLE [6d779e05a] 2016-11-07 15:03:56 +0100
 Branch: REL9_4_STABLE [5556420d4] 2016-11-07 15:04:23 +0100
 -->
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
@@ -3673,7 +4179,7 @@ Branch: REL9_3_STABLE [92929a3e3] 2016-10-27 12:00:05 -0400
 Branch: REL9_2_STABLE [629575fa2] 2016-10-27 12:14:07 -0400
 -->
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -3685,10 +4191,10 @@ Branch: master [dbdfd114f] 2016-11-25 18:36:10 -0500
 Branch: REL9_6_STABLE [255bcd27f] 2016-11-25 18:36:10 -0500
 -->
      <para>
-      Improve <application>initdb</> to insert the correct
+      Improve <application>initdb</application> to insert the correct
       platform-specific default values for
-      the <replaceable>xxx</><literal>_flush_after</> parameters
-      into <filename>postgresql.conf</> (Fabien Coelho, Tom Lane)
+      the <replaceable>xxx</replaceable><literal>_flush_after</literal> parameters
+      into <filename>postgresql.conf</filename> (Fabien Coelho, Tom Lane)
      </para>
 
      <para>
@@ -3706,7 +4212,7 @@ Branch: REL9_5_STABLE [c472f2a33] 2016-12-22 15:01:39 -0500
 -->
      <para>
       Fix possible mishandling of expanded arrays in domain check
-      constraints and <literal>CASE</> execution (Tom Lane)
+      constraints and <literal>CASE</literal> execution (Tom Lane)
      </para>
 
      <para>
@@ -3762,14 +4268,14 @@ Branch: REL9_3_STABLE [9c0b04f18] 2016-11-06 14:43:14 -0500
 Branch: REL9_2_STABLE [92b7b1058] 2016-11-06 14:43:14 -0500
 -->
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
@@ -3785,7 +4291,7 @@ Branch: REL9_3_STABLE [46b6f3fff] 2016-11-15 16:17:19 -0500
 Branch: REL9_2_STABLE [13aa9af37] 2016-11-15 16:17:19 -0500
 -->
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -3806,7 +4312,7 @@ Branch: REL9_3_STABLE [1df8b3fe8] 2016-12-22 08:32:25 +0100
 Branch: REL9_2_STABLE [501c91074] 2016-12-22 08:34:07 +0100
 -->
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
@@ -3819,11 +4325,11 @@ Branch: REL9_6_STABLE [6a8c67f50] 2016-12-25 16:04:47 -0500
 -->
      <para>
       Fix incorrect error reporting for duplicate data
-      in <application>psql</>'s <command>\crosstabview</> (Tom Lane)
+      in <application>psql</application>'s <command>\crosstabview</command> (Tom Lane)
      </para>
 
      <para>
-      <application>psql</> sometimes quoted the wrong row and/or column
+      <application>psql</application> sometimes quoted the wrong row and/or column
       values when complaining about multiple entries for the same crosstab
       cell.
      </para>
@@ -3840,8 +4346,8 @@ Branch: REL9_3_STABLE [2022d594d] 2016-12-23 21:01:48 -0500
 Branch: REL9_2_STABLE [26b55d669] 2016-12-23 21:01:51 -0500
 -->
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
@@ -3852,8 +4358,8 @@ Branch: master [404e66758] 2016-11-28 11:51:30 -0500
 Branch: REL9_6_STABLE [28735cc72] 2016-11-28 11:51:35 -0500
 -->
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER TABLE t
-      ALTER c DROP ...</> (Kyotaro Horiguchi)
+      Fix <application>psql</application>'s tab completion for <command>ALTER TABLE t
+      ALTER c DROP ...</command> (Kyotaro Horiguchi)
      </para>
     </listitem>
 
@@ -3868,9 +4374,9 @@ Branch: REL9_3_STABLE [82eb5c514] 2016-12-07 12:19:56 -0500
 Branch: REL9_2_STABLE [1ec5cc025] 2016-12-07 12:19:57 -0500
 -->
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -3890,8 +4396,8 @@ Branch: REL9_3_STABLE [9b8507bfa] 2016-12-22 09:47:25 -0800
 Branch: REL9_2_STABLE [44de099f8] 2016-12-22 09:46:46 -0800
 -->
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
@@ -3906,14 +4412,14 @@ Branch: REL9_4_STABLE [cb687e0ac] 2016-12-22 09:19:08 -0800
 Branch: REL9_3_STABLE [bd46cce21] 2016-12-22 09:18:50 -0800
 -->
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -3927,7 +4433,7 @@ Branch: REL9_6_STABLE [2a8783e44] 2016-11-02 00:09:28 -0400
 Branch: REL9_5_STABLE [af636d7b5] 2016-11-02 00:09:28 -0400
 -->
      <para>
-      Fix portability problems in <filename>contrib/pageinspect</>'s
+      Fix portability problems in <filename>contrib/pageinspect</filename>'s
       functions for GIN indexes (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -4016,7 +4522,7 @@ Branch: REL9_3_STABLE [2b133be04] 2017-01-30 11:41:02 -0500
 Branch: REL9_2_STABLE [ef878cc2c] 2017-01-30 11:41:09 -0500
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -4083,7 +4589,7 @@ Branch: REL9_3_STABLE [1c02ee314] 2016-10-19 15:00:34 +0300
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -4091,7 +4597,7 @@ Branch: REL9_3_STABLE [1c02ee314] 2016-10-19 15:00:34 +0300
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -4102,7 +4608,7 @@ Branch: master [5afcd2aa7] 2016-09-30 20:40:55 -0400
 Branch: REL9_6_STABLE [b6d906073] 2016-09-30 20:39:06 -0400
 -->
      <para>
-      Fix possible data corruption when <application>pg_upgrade</> rewrites
+      Fix possible data corruption when <application>pg_upgrade</application> rewrites
       a relation visibility map into 9.6 format (Tom Lane)
      </para>
 
@@ -4112,20 +4618,20 @@ Branch: REL9_6_STABLE [b6d906073] 2016-09-30 20:39:06 -0400
       Windows, the old map was read using text mode, leading to incorrect
       results if the map happened to contain consecutive bytes that matched
       a carriage return/line feed sequence.  The latter error would almost
-      always lead to a <application>pg_upgrade</> failure due to the map
+      always lead to a <application>pg_upgrade</application> failure due to the map
       file appearing to be the wrong length.
      </para>
 
      <para>
       If you are using a big-endian machine (many non-Intel architectures
-      are big-endian) and have used <application>pg_upgrade</> to upgrade
+      are big-endian) and have used <application>pg_upgrade</application> to upgrade
       from a pre-9.6 release, you should assume that all visibility maps are
       incorrect and need to be regenerated.  It is sufficient to truncate
       each relation's visibility map
-      with <filename>contrib/pg_visibility</>'s
-      <function>pg_truncate_visibility_map()</> function.
+      with <filename>contrib/pg_visibility</filename>'s
+      <function>pg_truncate_visibility_map()</function> function.
       For more information see
-      <ulink url="https://wiki.postgresql.org/wiki/Visibility_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Visibility_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -4138,7 +4644,7 @@ Branch: REL9_5_STABLE [65d85b8f9] 2016-10-23 18:36:13 -0400
 -->
      <para>
       Don't throw serialization errors for self-conflicting insertions
-      in <command>INSERT ... ON CONFLICT</> (Thomas Munro, Peter Geoghegan)
+      in <command>INSERT ... ON CONFLICT</command> (Thomas Munro, Peter Geoghegan)
      </para>
     </listitem>
 
@@ -4150,7 +4656,7 @@ Branch: REL9_6_STABLE [a5f0bd77a] 2016-10-17 12:13:35 +0300
 -->
      <para>
       Fix use-after-free hazard in execution of aggregate functions
-      using <literal>DISTINCT</> (Peter Geoghegan)
+      using <literal>DISTINCT</literal> (Peter Geoghegan)
      </para>
 
      <para>
@@ -4185,7 +4691,7 @@ Branch: REL9_6_STABLE [190765a05] 2016-10-03 16:23:02 -0400
 Branch: REL9_5_STABLE [647a86e37] 2016-10-03 16:23:12 -0400
 -->
      <para>
-      Fix <command>COPY</> with a column name list from a table that has
+      Fix <command>COPY</command> with a column name list from a table that has
       row-level security enabled (Adam Brightwell)
      </para>
     </listitem>
@@ -4201,14 +4707,14 @@ Branch: REL9_3_STABLE [edb514306] 2016-10-20 17:18:09 -0400
 Branch: REL9_2_STABLE [f17c26dbd] 2016-10-20 17:18:14 -0400
 -->
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
+      Fix <command>EXPLAIN</command> to emit valid XML when
       <xref linkend="guc-track-io-timing"> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
@@ -4220,7 +4726,7 @@ Branch: REL9_6_STABLE [03f2bf70a] 2016-10-13 19:46:06 -0400
 Branch: REL9_5_STABLE [3cd504254] 2016-10-13 19:45:58 -0400
 -->
      <para>
-      Fix statistics update for <command>TRUNCATE</> in a prepared
+      Fix statistics update for <command>TRUNCATE</command> in a prepared
       transaction (Stas Kelvich)
      </para>
     </listitem>
@@ -4242,16 +4748,16 @@ Branch: REL9_3_STABLE [f0bf0f233] 2016-10-13 17:05:15 -0400
 Branch: REL9_2_STABLE [6f2db29ec] 2016-10-13 17:05:15 -0400
 -->
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
@@ -4264,8 +4770,8 @@ Branch: REL9_5_STABLE [f50fa46cc] 2016-10-03 16:40:27 -0400
 -->
      <para>
       Show a sensible value
-      in <structname>pg_settings</>.<structfield>unit</>
-      for <varname>min_wal_size</> and <varname>max_wal_size</> (Tom Lane)
+      in <structname>pg_settings</structname>.<structfield>unit</structfield>
+      for <varname>min_wal_size</varname> and <varname>max_wal_size</varname> (Tom Lane)
      </para>
     </listitem>
 
@@ -4276,7 +4782,7 @@ Branch: master [9c4cc9e2c] 2016-10-13 00:25:48 -0400
 Branch: REL9_6_STABLE [0e9e64c07] 2016-10-13 00:25:28 -0400
 -->
      <para>
-      Fix replacement of array elements in <function>jsonb_set()</>
+      Fix replacement of array elements in <function>jsonb_set()</function>
       (Tom Lane)
      </para>
 
@@ -4364,7 +4870,7 @@ Branch: REL9_4_STABLE [6d3cbbf59] 2016-10-13 15:07:11 -0400
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -4390,7 +4896,7 @@ Branch: REL9_1_STABLE [e84e4761f] 2016-10-07 12:53:51 +0300
 -->
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -4411,12 +4917,12 @@ Branch: REL9_2_STABLE [7397f62e7] 2016-10-10 10:35:58 -0400
 Branch: REL9_1_STABLE [fb6825fe5] 2016-10-10 10:35:58 -0400
 -->
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
@@ -4428,7 +4934,7 @@ Branch: REL9_6_STABLE [bac56dbe0] 2016-10-03 10:07:39 -0400
 Branch: REL9_5_STABLE [0f259bd17] 2016-10-03 10:07:39 -0400
 -->
      <para>
-      In <application>pg_upgrade</>, check library loadability in name order
+      In <application>pg_upgrade</application>, check library loadability in name order
       (Tom Lane)
      </para>
 
@@ -4446,13 +4952,13 @@ Branch: master [e8bdee277] 2016-10-02 14:31:28 -0400
 Branch: REL9_6_STABLE [f40334b85] 2016-10-02 14:31:28 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to work correctly for extensions
+      Fix <application>pg_upgrade</application> to work correctly for extensions
       containing index access methods (Tom Lane)
      </para>
 
      <para>
       To allow this, the server has been extended to support <command>ALTER
-      EXTENSION ADD/DROP ACCESS METHOD</>.  That functionality should have
+      EXTENSION ADD/DROP ACCESS METHOD</command>.  That functionality should have
       been included in the original patch to support dynamic creation of
       access methods, but it was overlooked.
      </para>
@@ -4465,7 +4971,7 @@ Branch: master [f002ed2b8] 2016-09-30 20:40:56 -0400
 Branch: REL9_6_STABLE [53fbeed40] 2016-09-30 20:40:27 -0400
 -->
      <para>
-      Improve error reporting in <application>pg_upgrade</>'s file
+      Improve error reporting in <application>pg_upgrade</application>'s file
       copying/linking/rewriting steps (Tom Lane, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -4477,7 +4983,7 @@ Branch: master [4806f26f9] 2016-10-07 09:51:18 -0400
 Branch: REL9_6_STABLE [1749332ec] 2016-10-07 09:51:28 -0400
 -->
      <para>
-      Fix <application>pg_dump</> to work against pre-7.4 servers
+      Fix <application>pg_dump</application> to work against pre-7.4 servers
       (Amit Langote, Tom Lane)
      </para>
     </listitem>
@@ -4490,8 +4996,8 @@ Branch: REL9_6_STABLE [2933ed036] 2016-10-07 14:35:41 +0300
 Branch: REL9_5_STABLE [010a1b561] 2016-10-07 14:35:45 +0300
 -->
      <para>
-      Disallow specifying both <option>--source-server</>
-      and <option>--source-target</> options to <application>pg_rewind</>
+      Disallow specifying both <option>--source-server</option>
+      and <option>--source-target</option> options to <application>pg_rewind</application>
       (Michael Banck)
      </para>
     </listitem>
@@ -4504,12 +5010,12 @@ Branch: REL9_6_STABLE [aab809664] 2016-10-06 13:34:38 +0300
 Branch: REL9_5_STABLE [69da71254] 2016-10-06 13:34:32 +0300
 -->
      <para>
-      Make <application>pg_rewind</> turn off <varname>synchronous_commit</>
+      Make <application>pg_rewind</application> turn off <varname>synchronous_commit</varname>
       in its session on the source server (Michael Banck, Michael Paquier)
      </para>
 
      <para>
-      This allows <application>pg_rewind</> to work even when the source
+      This allows <application>pg_rewind</application> to work even when the source
       server is using synchronous replication that is not working for some
       reason.
      </para>
@@ -4525,8 +5031,8 @@ Branch: REL9_4_STABLE [da3f71a08] 2016-09-30 11:22:49 +0200
 Branch: REL9_3_STABLE [4bff35cca] 2016-09-30 11:23:25 +0200
 -->
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -4542,7 +5048,7 @@ Branch: master [9a109452d] 2016-10-01 16:32:54 -0400
 Branch: REL9_6_STABLE [f4e787c82] 2016-10-01 16:32:55 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_visibility</> to report the correct TID for
+      Fix <filename>contrib/pg_visibility</filename> to report the correct TID for
       a corrupt tuple that has been the subject of a rolled-back update
       (Tom Lane)
      </para>
@@ -4556,7 +5062,7 @@ Branch: REL9_6_STABLE [68fb75e10] 2016-10-01 13:35:20 -0400
 -->
      <para>
       Fix makefile dependencies so that parallel make
-      of <application>PL/Python</> by itself will succeed reliably
+      of <application>PL/Python</application> by itself will succeed reliably
       (Pavel Raiskup)
      </para>
     </listitem>
@@ -4594,7 +5100,7 @@ Branch: REL9_2_STABLE [a03339aef] 2016-10-19 17:57:01 -0400
 Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -4607,15 +5113,15 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -4637,7 +5143,7 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.6 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.6 include:
    </para>
 
    <!-- Items in this list summarize one or more items below -->
@@ -4671,15 +5177,15 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 
     <listitem>
      <para>
-      <filename>postgres_fdw</> now supports remote joins, sorts,
-      <command>UPDATE</>s, and <command>DELETE</>s
+      <filename>postgres_fdw</filename> now supports remote joins, sorts,
+      <command>UPDATE</command>s, and <command>DELETE</command>s
      </para>
     </listitem>
 
     <listitem>
      <para>
       Substantial performance improvements, especially in the area of
-      scalability on multi-<acronym>CPU</>-socket servers
+      scalability on multi-<acronym>CPU</acronym>-socket servers
      </para>
     </listitem>
 
@@ -4714,7 +5220,7 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         Improve the <link
-        linkend="pg-stat-activity-view"><structname>pg_stat_activity</></link>
+        linkend="pg-stat-activity-view"><structname>pg_stat_activity</structname></link>
         view's information about what a process is waiting for (Amit
         Kapila, Ildus Kurbangaliev)
        </para>
@@ -4722,10 +5228,10 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
        <para>
         Historically a process has only been shown as waiting if it was
         waiting for a heavyweight lock.  Now waits for lightweight locks
-        and buffer pins are also shown in <structname>pg_stat_activity</>.
+        and buffer pins are also shown in <structname>pg_stat_activity</structname>.
         Also, the type of lock being waited for is now visible.
-        These changes replace the <structfield>waiting</> column with
-        <structfield>wait_event_type</> and <structfield>wait_event</>.
+        These changes replace the <structfield>waiting</structfield> column with
+        <structfield>wait_event_type</structfield> and <structfield>wait_event</structfield>.
        </para>
       </listitem>
 
@@ -4735,14 +5241,14 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         In <link
-        linkend="functions-formatting-table"><function>to_char()</></>,
+        linkend="functions-formatting-table"><function>to_char()</function></link>,
         do not count a minus sign (when needed) as part of the field
         width for time-related fields (Bruce Momjian)
        </para>
 
        <para>
-        For example, <literal>to_char('-4 years'::interval, 'YY')</>
-        now returns <literal>-04</>, rather than <literal>-4</>.
+        For example, <literal>to_char('-4 years'::interval, 'YY')</literal>
+        now returns <literal>-04</literal>, rather than <literal>-4</literal>.
        </para>
       </listitem>
 
@@ -4752,18 +5258,18 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         Make <link
-        linkend="functions-datetime-table"><function>extract()</></> behave
+        linkend="functions-datetime-table"><function>extract()</function></link> behave
         more reasonably with infinite inputs (Vitaly Burovoy)
        </para>
 
        <para>
-        Historically the <function>extract()</> function just returned
+        Historically the <function>extract()</function> function just returned
         zero given an infinite timestamp, regardless of the given
         field name.  Make it return <literal>infinity</literal>
         or <literal>-infinity</literal> as appropriate when the
         requested field is one that is monotonically increasing (e.g,
-        <literal>year</>, <literal>epoch</>), or <literal>NULL</> when
-        it is not (e.g., <literal>day</>, <literal>hour</>).  Also,
+        <literal>year</literal>, <literal>epoch</literal>), or <literal>NULL</literal> when
+        it is not (e.g., <literal>day</literal>, <literal>hour</literal>).  Also,
         throw the expected error for bad field names.
        </para>
       </listitem>
@@ -4774,9 +5280,9 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 This commit is also listed under libpq and psql
 -->
        <para>
-        Remove PL/pgSQL's <quote>feature</> that suppressed the
-        innermost line of <literal>CONTEXT</> for messages emitted by
-        <command>RAISE</> commands (Pavel Stehule)
+        Remove PL/pgSQL's <quote>feature</quote> that suppressed the
+        innermost line of <literal>CONTEXT</literal> for messages emitted by
+        <command>RAISE</command> commands (Pavel Stehule)
        </para>
 
        <para>
@@ -4791,13 +5297,13 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Fix the default text search parser to allow leading digits
-        in <literal>email</> and <literal>host</> tokens (Artur Zakirov)
+        in <literal>email</literal> and <literal>host</literal> tokens (Artur Zakirov)
        </para>
 
        <para>
         In most cases this will result in few changes in the parsing of
         text.  But if you have data where such addresses occur frequently,
-        it may be worth rebuilding dependent <type>tsvector</> columns
+        it may be worth rebuilding dependent <type>tsvector</type> columns
         and indexes so that addresses of this form will be found properly
         by text searches.
        </para>
@@ -4809,8 +5315,8 @@ This commit is also listed under libpq and psql
 2016-03-16 [9a206d063] Improve script generating unaccent rules
 -->
        <para>
-        Extend <link linkend="unaccent"><filename>contrib/unaccent</></>'s
-        standard <filename>unaccent.rules</> file to handle all diacritics
+        Extend <link linkend="unaccent"><filename>contrib/unaccent</filename></link>'s
+        standard <filename>unaccent.rules</filename> file to handle all diacritics
         known to Unicode, and to expand ligatures correctly (Thomas Munro,
         L&eacute;onard Benedetti)
        </para>
@@ -4819,7 +5325,7 @@ This commit is also listed under libpq and psql
         The previous version neglected to convert some less-common letters
         with diacritic marks.  Also, ligatures are now expanded into
         separate letters.  Installations that use this rules file may wish
-        to rebuild <type>tsvector</> columns and indexes that depend on the
+        to rebuild <type>tsvector</type> columns and indexes that depend on the
         result.
        </para>
       </listitem>
@@ -4830,15 +5336,15 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Remove the long-deprecated
-        <literal>CREATEUSER</>/<literal>NOCREATEUSER</> options from
-        <command>CREATE ROLE</> and allied commands (Tom Lane)
+        <literal>CREATEUSER</literal>/<literal>NOCREATEUSER</literal> options from
+        <command>CREATE ROLE</command> and allied commands (Tom Lane)
        </para>
 
        <para>
-        <literal>CREATEUSER</> actually meant <literal>SUPERUSER</>,
+        <literal>CREATEUSER</literal> actually meant <literal>SUPERUSER</literal>,
         for ancient backwards-compatibility reasons.  This has been a
         constant source of confusion for people who (reasonably) expect
-        it to mean <literal>CREATEROLE</>.  It has been deprecated for
+        it to mean <literal>CREATEROLE</literal>.  It has been deprecated for
         ten years now, so fix the problem by removing it.
        </para>
       </listitem>
@@ -4850,13 +5356,13 @@ This commit is also listed under libpq and psql
 2016-05-08 [7df974ee0] Disallow superuser names starting with 'pg_' in initdb
 -->
        <para>
-        Treat role names beginning with <literal>pg_</> as reserved
+        Treat role names beginning with <literal>pg_</literal> as reserved
         (Stephen Frost)
        </para>
 
        <para>
         User creation of such role names is now disallowed.  This prevents
-        conflicts with built-in roles created by <application>initdb</>.
+        conflicts with built-in roles created by <application>initdb</application>.
        </para>
       </listitem>
 
@@ -4866,16 +5372,16 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Change a column name in the
-        <structname>information_schema</>.<structname>routines</>
-        view from <structfield>result_cast_character_set_name</>
-        to <structfield>result_cast_char_set_name</> (Cl&eacute;ment
+        <structname>information_schema</structname>.<structname>routines</structname>
+        view from <structfield>result_cast_character_set_name</structfield>
+        to <structfield>result_cast_char_set_name</structfield> (Cl&eacute;ment
         Pr&eacute;vost)
        </para>
 
        <para>
         The SQL:2011 standard specifies the longer name, but that appears
         to be a mistake, because adjacent column names use the shorter
-        style, as do other <structname>information_schema</> views.
+        style, as do other <structname>information_schema</structname> views.
        </para>
       </listitem>
 
@@ -4884,7 +5390,7 @@ This commit is also listed under libpq and psql
 2015-12-08 [d5563d7df] psql: Support multiple -c and -f options, and allow mixi
 -->
        <para>
-        <application>psql</>'s <option>-c</option> option no longer implies
+        <application>psql</application>'s <option>-c</option> option no longer implies
         <option>--no-psqlrc</option>
         (Pavel Stehule, Catalin Iacob)
        </para>
@@ -4893,7 +5399,7 @@ This commit is also listed under libpq and psql
         Write <option>--no-psqlrc</option> (or its
         abbreviation <option>-X</option>) explicitly to obtain the old
         behavior.  Scripts so modified will still work with old
-        versions of <application>psql</>.
+        versions of <application>psql</application>.
        </para>
       </listitem>
 
@@ -4902,7 +5408,7 @@ This commit is also listed under libpq and psql
 2015-07-02 [5671aaca8] Improve pg_restore's -t switch to match all types of rel
 -->
        <para>
-        Improve <application>pg_restore</>'s <option>-t</option> option to
+        Improve <application>pg_restore</application>'s <option>-t</option> option to
         match all types of relations, not only plain tables (Craig Ringer)
        </para>
       </listitem>
@@ -4912,17 +5418,17 @@ This commit is also listed under libpq and psql
 2016-02-12 [59a884e98] Change delimiter used for display of NextXID
 -->
        <para>
-        Change the display format used for <literal>NextXID</> in
-        <application>pg_controldata</> and related places (Joe Conway,
+        Change the display format used for <literal>NextXID</literal> in
+        <application>pg_controldata</application> and related places (Joe Conway,
         Bruce Momjian)
        </para>
 
        <para>
         Display epoch-and-transaction-ID values in the format
-        <replaceable>number</><literal>:</><replaceable>number</>.
+        <replaceable>number</replaceable><literal>:</literal><replaceable>number</replaceable>.
         The previous format
-        <replaceable>number</><literal>/</><replaceable>number</> was
-        confusingly similar to that used for <acronym>LSN</>s.
+        <replaceable>number</replaceable><literal>/</literal><replaceable>number</replaceable> was
+        confusingly similar to that used for <acronym>LSN</acronym>s.
        </para>
       </listitem>
 
@@ -4940,8 +5446,8 @@ and many others in the same vein
         Many of the standard extensions have been updated to allow their
         functions to be executed within parallel query worker processes.
         These changes will not take effect in
-        databases <application>pg_upgrade</>'d from prior versions unless
-        you apply <command>ALTER EXTENSION UPDATE</> to each such extension
+        databases <application>pg_upgrade</application>'d from prior versions unless
+        you apply <command>ALTER EXTENSION UPDATE</command> to each such extension
         (in each database of a cluster).
        </para>
       </listitem>
@@ -5002,7 +5508,7 @@ and many others in the same vein
        </para>
 
        <para>
-        With 9.6, <productname>PostgreSQL</> introduces initial support
+        With 9.6, <productname>PostgreSQL</productname> introduces initial support
         for parallel execution of large queries.  Only strictly read-only
         queries where the driving table is accessed via a sequential scan
         can be parallelized.  Hash joins and nested loops can be performed
@@ -5048,7 +5554,7 @@ and many others in the same vein
 2015-09-02 [30bb26b5e] Allow usage of huge maintenance_work_mem for GIN build.
 -->
        <para>
-        Allow <link linkend="GIN"><acronym>GIN</></> index builds to
+        Allow <link linkend="gin"><acronym>GIN</acronym></link> index builds to
         make effective use of <xref linkend="guc-maintenance-work-mem">
         settings larger than 1 GB (Robert Abraham, Teodor Sigaev)
        </para>
@@ -5076,7 +5582,7 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-admin-index"><function>gin_clean_pending_list()</></>
+        linkend="functions-admin-index"><function>gin_clean_pending_list()</function></link>
         function to allow manual invocation of pending-list cleanup for a
         GIN index (Jeff Janes)
        </para>
@@ -5094,7 +5600,7 @@ and many others in the same vein
 -->
        <para>
         Improve handling of dead index tuples in <link
-        linkend="GiST">GiST</> indexes (Anastasia Lubennikova)
+        linkend="gist">GiST</link> indexes (Anastasia Lubennikova)
        </para>
 
        <para>
@@ -5110,8 +5616,8 @@ and many others in the same vein
 2016-03-30 [acdf2a8b3] Introduce SP-GiST operator class over box.
 -->
        <para>
-        Add an <link linkend="SPGiST">SP-GiST</link> operator class for
-        type <type>box</> (Alexander Lebedev)
+        Add an <link linkend="spgist">SP-GiST</link> operator class for
+        type <type>box</type> (Alexander Lebedev)
        </para>
       </listitem>
 
@@ -5137,10 +5643,10 @@ and many others in the same vein
        </para>
 
        <para>
-        The new approach makes better use of the <acronym>CPU</> cache
+        The new approach makes better use of the <acronym>CPU</acronym> cache
         for typical cache sizes and data volumes.  Where necessary,
         the behavior can be adjusted via the new configuration parameter
-        <xref linkend="guc-replacement-sort-tuples">.
+        <literal>replacement_sort_tuples</literal>.
        </para>
       </listitem>
 
@@ -5162,17 +5668,17 @@ and many others in the same vein
 2016-02-17 [f1f5ec1ef] Reuse abbreviated keys in ordered [set] aggregates.
 -->
        <para>
-        Speed up sorting of <type>uuid</>, <type>bytea</>, and
-        <type>char(n)</> fields by using <quote>abbreviated</> keys
+        Speed up sorting of <type>uuid</type>, <type>bytea</type>, and
+        <type>char(n)</type> fields by using <quote>abbreviated</quote> keys
         (Peter Geoghegan)
        </para>
 
        <para>
         Support for abbreviated keys has also been
         added to the non-default operator classes <link
-        linkend="indexes-opclass"><literal>text_pattern_ops</></>,
-        <literal>varchar_pattern_ops</>, and
-        <literal>bpchar_pattern_ops</>.  Processing of ordered-set
+        linkend="indexes-opclass"><literal>text_pattern_ops</literal></link>,
+        <literal>varchar_pattern_ops</literal>, and
+        <literal>bpchar_pattern_ops</literal>.  Processing of ordered-set
         aggregates can also now exploit abbreviated keys.
        </para>
       </listitem>
@@ -5182,8 +5688,8 @@ and many others in the same vein
 2015-12-16 [b648b7034] Speed up CREATE INDEX CONCURRENTLY's TID sort.
 -->
        <para>
-        Speed up <command>CREATE INDEX CONCURRENTLY</> by treating
-        <acronym>TID</>s as 64-bit integers during sorting (Peter
+        Speed up <command>CREATE INDEX CONCURRENTLY</command> by treating
+        <acronym>TID</acronym>s as 64-bit integers during sorting (Peter
         Geoghegan)
        </para>
       </listitem>
@@ -5203,7 +5709,7 @@ and many others in the same vein
 2015-09-03 [4aec49899] Assorted code review for recent ProcArrayLock patch.
 -->
        <para>
-        Reduce contention for the <literal>ProcArrayLock</> (Amit Kapila,
+        Reduce contention for the <literal>ProcArrayLock</literal> (Amit Kapila,
         Robert Haas)
        </para>
       </listitem>
@@ -5234,7 +5740,7 @@ and many others in the same vein
 -->
        <para>
         Use atomic operations, rather than a spinlock, to protect an
-        <literal>LWLock</>'s wait queue (Andres Freund)
+        <literal>LWLock</literal>'s wait queue (Andres Freund)
        </para>
       </listitem>
 
@@ -5244,7 +5750,7 @@ and many others in the same vein
 -->
        <para>
         Partition the shared hash table freelist to reduce contention on
-        multi-<acronym>CPU</>-socket servers (Aleksander Alekseev)
+        multi-<acronym>CPU</acronym>-socket servers (Aleksander Alekseev)
        </para>
       </listitem>
 
@@ -5280,14 +5786,14 @@ and many others in the same vein
 2016-04-04 [391159e03] Partially revert commit 3d3bf62f30200500637b24fdb7b992a9
 -->
        <para>
-        Improve <command>ANALYZE</>'s estimates for columns with many nulls
+        Improve <command>ANALYZE</command>'s estimates for columns with many nulls
         (Tomas Vondra, Alex Shulgin)
        </para>
 
        <para>
-        Previously <command>ANALYZE</> tended to underestimate the number
-        of non-<literal>NULL</> distinct values in a column with many
-        <literal>NULL</>s, and was also inaccurate in computing the
+        Previously <command>ANALYZE</command> tended to underestimate the number
+        of non-<literal>NULL</literal> distinct values in a column with many
+        <literal>NULL</literal>s, and was also inaccurate in computing the
         most-common values.
        </para>
       </listitem>
@@ -5314,13 +5820,13 @@ and many others in the same vein
        </para>
 
        <para>
-        If a table <literal>t</> has a foreign key restriction, say
-        <literal>(a,b) REFERENCES r (x,y)</>, then a <literal>WHERE</>
-        condition such as <literal>t.a = r.x AND t.b = r.y</> cannot
-        select more than one <literal>r</> row per <literal>t</> row.
-        The planner formerly considered these <literal>AND</> conditions
+        If a table <literal>t</literal> has a foreign key restriction, say
+        <literal>(a,b) REFERENCES r (x,y)</literal>, then a <literal>WHERE</literal>
+        condition such as <literal>t.a = r.x AND t.b = r.y</literal> cannot
+        select more than one <literal>r</literal> row per <literal>t</literal> row.
+        The planner formerly considered these <literal>AND</literal> conditions
         to be independent and would often drastically misestimate
-        selectivity as a result.  Now it compares the <literal>WHERE</>
+        selectivity as a result.  Now it compares the <literal>WHERE</literal>
         conditions to applicable foreign key constraints and produces
         better estimates.
        </para>
@@ -5331,7 +5837,7 @@ and many others in the same vein
     </sect4>
 
     <sect4>
-     <title><command>VACUUM</></title>
+     <title><command>VACUUM</command></title>
 
      <itemizedlist>
 
@@ -5361,7 +5867,7 @@ and many others in the same vein
 
        <para>
         If necessary, vacuum can be forced to process all-frozen
-        pages using the new <literal>DISABLE_PAGE_SKIPPING</> option.
+        pages using the new <literal>DISABLE_PAGE_SKIPPING</literal> option.
         Normally this should never be needed, but it might help in
         recovering from visibility-map corruption.
        </para>
@@ -5372,7 +5878,7 @@ and many others in the same vein
 2015-12-30 [e84290823] Avoid useless truncation attempts during VACUUM.
 -->
        <para>
-        Avoid useless heap-truncation attempts during <command>VACUUM</>
+        Avoid useless heap-truncation attempts during <command>VACUUM</command>
         (Jeff Janes, Tom Lane)
        </para>
 
@@ -5401,19 +5907,19 @@ and many others in the same vein
 2016-08-07 [9ee1cf04a] Fix TOAST access failure in RETURNING queries.
 -->
        <para>
-        Allow old <acronym>MVCC</> snapshots to be invalidated after a
+        Allow old <acronym>MVCC</acronym> snapshots to be invalidated after a
         configurable timeout (Kevin Grittner)
        </para>
 
        <para>
         Normally, deleted tuples cannot be physically removed by
-        vacuuming until the last transaction that could <quote>see</>
+        vacuuming until the last transaction that could <quote>see</quote>
         them is gone.  A transaction that stays open for a long
         time can thus cause considerable table bloat because
         space cannot be recycled.  This feature allows setting
         a time-based limit, via the new configuration parameter
         <xref linkend="guc-old-snapshot-threshold">, on how long an
-        <acronym>MVCC</> snapshot is guaranteed to be valid.  After that,
+        <acronym>MVCC</acronym> snapshot is guaranteed to be valid.  After that,
         dead tuples are candidates for removal.  A transaction using an
         outdated snapshot will get an error if it attempts to read a page
         that potentially could have contained such data.
@@ -5425,12 +5931,12 @@ and many others in the same vein
 2016-02-11 [d4c3a156c] Remove GROUP BY columns that are functionally dependent
 -->
        <para>
-        Ignore <literal>GROUP BY</> columns that are
+        Ignore <literal>GROUP BY</literal> columns that are
         functionally dependent on other columns (David Rowley)
        </para>
 
        <para>
-        If a <literal>GROUP BY</> clause includes all columns of a
+        If a <literal>GROUP BY</literal> clause includes all columns of a
         non-deferred primary key, as well as other columns of the same
         table, those other columns are redundant and can be dropped
         from the grouping.  This saves computation in many common cases.
@@ -5443,17 +5949,17 @@ and many others in the same vein
 -->
        <para>
         Allow use of an <link linkend="indexes-index-only-scans">index-only
-        scan</link> on a partial index when the index's <literal>WHERE</>
+        scan</link> on a partial index when the index's <literal>WHERE</literal>
         clause references columns that are not indexed (Tomas Vondra,
         Kyotaro Horiguchi)
        </para>
 
        <para>
         For example, an index defined by <command>CREATE INDEX tidx_partial
-        ON t(b) WHERE a &gt; 0</> can now be used for an index-only scan by
-        a query that specifies <literal>WHERE a &gt; 0</> and does not
-        otherwise use <literal>a</>.  Previously this was disallowed
-        because <literal>a</> is not listed as an index column.
+        ON t(b) WHERE a &gt; 0</command> can now be used for an index-only scan by
+        a query that specifies <literal>WHERE a &gt; 0</literal> and does not
+        otherwise use <literal>a</literal>.  Previously this was disallowed
+        because <literal>a</literal> is not listed as an index column.
        </para>
 
       </listitem>
@@ -5493,7 +5999,7 @@ and many others in the same vein
        </para>
 
        <para>
-        <productname>PostgreSQL</> writes data to the kernel's disk cache,
+        <productname>PostgreSQL</productname> writes data to the kernel's disk cache,
         from where it will be flushed to physical storage in due time.
         Many operating systems are not smart about managing this and allow
         large amounts of dirty data to accumulate before deciding to flush
@@ -5504,11 +6010,11 @@ and many others in the same vein
        </para>
 
        <para>
-        On Linux, <function>sync_file_range()</> is used for this purpose,
+        On Linux, <function>sync_file_range()</function> is used for this purpose,
         and the feature is on by default on Linux because that function has
         few downsides.  This flushing capability is also available on other
-        platforms if they have <function>msync()</>
-        or <function>posix_fadvise()</>, but those interfaces have some
+        platforms if they have <function>msync()</function>
+        or <function>posix_fadvise()</function>, but those interfaces have some
         undesirable side-effects so the feature is disabled by default on
         non-Linux platforms.
        </para>
@@ -5533,7 +6039,7 @@ and many others in the same vein
        </para>
 
        <para>
-        For example, <command>SELECT AVG(x), VARIANCE(x) FROM tab</> can use
+        For example, <command>SELECT AVG(x), VARIANCE(x) FROM tab</command> can use
         a single per-row computation for both aggregates.
        </para>
       </listitem>
@@ -5544,7 +6050,7 @@ and many others in the same vein
 -->
        <para>
         Speed up visibility tests for recently-created tuples by checking
-        the current transaction's snapshot, not <structname>pg_clog</>, to
+        the current transaction's snapshot, not <structname>pg_clog</structname>, to
         decide if the source transaction should be considered committed
         (Jeff Janes, Tom Lane)
        </para>
@@ -5570,9 +6076,9 @@ and many others in the same vein
        </para>
 
        <para>
-        Two-phase commit information is now written only to <acronym>WAL</>
-        during <command>PREPARE TRANSACTION</>, and will be read back from
-        <acronym>WAL</> during <command>COMMIT PREPARED</> if that happens
+        Two-phase commit information is now written only to <acronym>WAL</acronym>
+        during <command>PREPARE TRANSACTION</command>, and will be read back from
+        <acronym>WAL</acronym> during <command>COMMIT PREPARED</command> if that happens
         soon thereafter.  A separate state file is created only if the
         pending transaction does not get committed or aborted by the time
         of the next checkpoint.
@@ -5603,8 +6109,8 @@ and many others in the same vein
 2016-02-06 [aa2387e2f] Improve speed of timestamp/time/date output functions.
 -->
        <para>
-        Improve speed of the output functions for <type>timestamp</>,
-        <type>time</>, and <type>date</> data types (David Rowley,
+        Improve speed of the output functions for <type>timestamp</type>,
+        <type>time</type>, and <type>date</type> data types (David Rowley,
         Andres Freund)
        </para>
       </listitem>
@@ -5615,7 +6121,7 @@ and many others in the same vein
 -->
        <para>
         Avoid some unnecessary cancellations of hot-standby queries
-        during replay of actions that take <literal>AccessExclusive</>
+        during replay of actions that take <literal>AccessExclusive</literal>
         locks (Jeff Janes)
        </para>
       </listitem>
@@ -5649,8 +6155,8 @@ and many others in the same vein
 2015-07-05 [6c82d8d1f] Further reduce overhead for passing plpgsql variables to
 -->
        <para>
-        Speed up expression evaluation in <application>PL/pgSQL</> by
-        keeping <literal>ParamListInfo</> entries for simple variables
+        Speed up expression evaluation in <application>PL/pgSQL</application> by
+        keeping <literal>ParamListInfo</literal> entries for simple variables
         valid at all times (Tom Lane)
        </para>
       </listitem>
@@ -5660,7 +6166,7 @@ and many others in the same vein
 2015-07-06 [4f33621f3] Don't set SO_SNDBUF on recent Windows versions that have
 -->
        <para>
-        Avoid reducing the <literal>SO_SNDBUF</> setting below its default
+        Avoid reducing the <literal>SO_SNDBUF</literal> setting below its default
         on recent Windows versions (Chen Huajun)
        </para>
       </listitem>
@@ -5696,8 +6202,8 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="pg-stat-progress-vacuum-view"><structname>pg_stat_progress_vacuum</></link>
-        system view to provide progress reporting for <command>VACUUM</>
+        linkend="pg-stat-progress-vacuum-view"><structname>pg_stat_progress_vacuum</structname></link>
+        system view to provide progress reporting for <command>VACUUM</command>
         operations (Amit Langote, Robert Haas, Vinayak Pokale, Rahila Syed)
        </para>
       </listitem>
@@ -5708,11 +6214,11 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-controldata"><function>pg_control_system()</></>,
-        <function>pg_control_checkpoint()</>,
-        <function>pg_control_recovery()</>, and
-        <function>pg_control_init()</> functions to expose fields of
-        <filename>pg_control</> to <acronym>SQL</> (Joe Conway, Michael
+        linkend="functions-controldata"><function>pg_control_system()</function></link>,
+        <function>pg_control_checkpoint()</function>,
+        <function>pg_control_recovery()</function>, and
+        <function>pg_control_init()</function> functions to expose fields of
+        <filename>pg_control</filename> to <acronym>SQL</acronym> (Joe Conway, Michael
         Paquier)
        </para>
       </listitem>
@@ -5722,15 +6228,15 @@ and many others in the same vein
 2016-02-17 [a5c43b886] Add new system view, pg_config
 -->
        <para>
-        Add <link linkend="view-pg-config"><structname>pg_config</></link>
+        Add <link linkend="view-pg-config"><structname>pg_config</structname></link>
         system view (Joe Conway)
        </para>
 
        <para>
         This view exposes the same information available from
-        the <application>pg_config</> command-line utility,
+        the <application>pg_config</application> command-line utility,
         namely assorted compile-time configuration information for
-        <productname>PostgreSQL</>.
+        <productname>PostgreSQL</productname>.
        </para>
       </listitem>
 
@@ -5739,8 +6245,8 @@ and many others in the same vein
 2015-08-10 [3f811c2d6] Add confirmed_flush column to pg_replication_slots.
 -->
        <para>
-        Add a <structfield>confirmed_flush_lsn</> column to the <link
-        linkend="view-pg-replication-slots"><structname>pg_replication_slots</></link>
+        Add a <structfield>confirmed_flush_lsn</structfield> column to the <link
+        linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
         system view (Marko Tiikkaja)
        </para>
       </listitem>
@@ -5753,9 +6259,9 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="pg-stat-wal-receiver-view"><structname>pg_stat_wal_receiver</></link>
+        linkend="pg-stat-wal-receiver-view"><structname>pg_stat_wal_receiver</structname></link>
         system view to provide information about the state of a hot-standby
-        server's <acronym>WAL</> receiver process (Michael Paquier)
+        server's <acronym>WAL</acronym> receiver process (Michael Paquier)
        </para>
       </listitem>
 
@@ -5765,7 +6271,7 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-info-session-table"><function>pg_blocking_pids()</></>
+        linkend="functions-info-session-table"><function>pg_blocking_pids()</function></link>
         function to reliably identify which sessions block which others
         (Tom Lane)
        </para>
@@ -5774,7 +6280,7 @@ and many others in the same vein
         This function returns an array of the process IDs of any
         sessions that are blocking the session with the given process ID.
         Historically users have obtained such information using a self-join
-        on the <structname>pg_locks</> view.  However, it is unreasonably
+        on the <structname>pg_locks</structname> view.  However, it is unreasonably
         tedious to do it that way with any modicum of correctness, and
         the addition of parallel queries has made the old approach entirely
         impractical, since locks might be held or awaited by child worker
@@ -5788,7 +6294,7 @@ and many others in the same vein
 -->
        <para>
         Add function <link
-        linkend="functions-admin-backup-table"><function>pg_current_xlog_flush_location()</></>
+        linkend="functions-admin-backup-table"><function>pg_current_xlog_flush_location()</function></link>
         to expose the current transaction log flush location (Tomas Vondra)
        </para>
       </listitem>
@@ -5799,8 +6305,8 @@ and many others in the same vein
 -->
        <para>
         Add function <link
-        linkend="functions-info-session-table"><function>pg_notification_queue_usage()</></>
-        to report how full the <command>NOTIFY</> queue is (Brendan Jurd)
+        linkend="functions-info-session-table"><function>pg_notification_queue_usage()</function></link>
+        to report how full the <command>NOTIFY</command> queue is (Brendan Jurd)
        </para>
       </listitem>
 
@@ -5816,7 +6322,7 @@ and many others in the same vein
         The memory usage dump that is output to the postmaster log during an
         out-of-memory failure now summarizes statistics when there are a
         large number of memory contexts, rather than possibly generating
-        a very large report.  There is also a <quote>grand total</>
+        a very large report.  There is also a <quote>grand total</quote>
         summary line now.
        </para>
       </listitem>
@@ -5826,7 +6332,7 @@ and many others in the same vein
     </sect4>
 
     <sect4>
-     <title><acronym>Authentication</></title>
+     <title><acronym>Authentication</acronym></title>
 
      <itemizedlist>
 
@@ -5835,15 +6341,15 @@ and many others in the same vein
 2016-04-08 [34c33a1f0] Add BSD authentication method.
 -->
        <para>
-        Add a <link linkend="auth-bsd"><acronym>BSD</> authentication
+        Add a <link linkend="auth-bsd"><acronym>BSD</acronym> authentication
         method</link> to allow use of
-        the <systemitem class="osname">BSD</> Authentication service for
-        <productname>PostgreSQL</> client authentication (Marisa Emerson)
+        the <systemitem class="osname">BSD</systemitem> Authentication service for
+        <productname>PostgreSQL</productname> client authentication (Marisa Emerson)
        </para>
 
        <para>
         BSD Authentication is currently only available on <systemitem
-        class="osname">OpenBSD</>.
+        class="osname">OpenBSD</systemitem>.
        </para>
       </listitem>
 
@@ -5852,9 +6358,9 @@ and many others in the same vein
 2016-04-08 [2f1d2b7a7] Set PAM_RHOST item for PAM authentication
 -->
        <para>
-        When using <link linkend="auth-pam"><acronym>PAM</>
+        When using <link linkend="auth-pam"><acronym>PAM</acronym>
         authentication</link>, provide the client IP address or host name
-        to <acronym>PAM</> modules via the <literal>PAM_RHOST</> item
+        to <acronym>PAM</acronym> modules via the <literal>PAM_RHOST</literal> item
         (Grzegorz Sampolski)
        </para>
       </listitem>
@@ -5870,7 +6376,7 @@ and many others in the same vein
 
        <para>
         All ordinarily-reachable password authentication failure cases
-        should now provide specific <literal>DETAIL</> fields in the log.
+        should now provide specific <literal>DETAIL</literal> fields in the log.
        </para>
       </listitem>
 
@@ -5879,7 +6385,7 @@ and many others in the same vein
 2015-09-06 [643beffe8] Support RADIUS passwords up to 128 characters
 -->
        <para>
-        Support <link linkend="auth-radius"><acronym>RADIUS</> passwords</>
+        Support <link linkend="auth-radius"><acronym>RADIUS</acronym> passwords</link>
         up to 128 characters long (Marko Tiikkaja)
        </para>
       </listitem>
@@ -5889,11 +6395,11 @@ and many others in the same vein
 2016-04-08 [35e2e357c] Add authentication parameters compat_realm and upn_usena
 -->
        <para>
-        Add new <link linkend="sspi-auth"><acronym>SSPI</>
+        Add new <link linkend="sspi-auth"><acronym>SSPI</acronym>
         authentication</link> parameters
-        <varname>compat_realm</> and <varname>upn_username</> to control
-        whether <productname>NetBIOS</> or <productname>Kerberos</>
-        realm names and user names are used during <acronym>SSPI</>
+        <varname>compat_realm</varname> and <varname>upn_username</varname> to control
+        whether <productname>NetBIOS</productname> or <productname>Kerberos</productname>
+        realm names and user names are used during <acronym>SSPI</acronym>
         authentication (Christian Ullrich)
        </para>
       </listitem>
@@ -5939,7 +6445,7 @@ and many others in the same vein
 2015-09-08 [1aba62ec6] Allow per-tablespace effective_io_concurrency
 -->
        <para>
-        Allow <varname>effective_io_concurrency</> to be set per-tablespace
+        Allow <varname>effective_io_concurrency</varname> to be set per-tablespace
         to support cases where different tablespaces have different I/O
         characteristics (Julien Rouhaud)
        </para>
@@ -5951,7 +6457,7 @@ and many others in the same vein
 2015-09-07 [b1e1862a1] Coordinate log_line_prefix options 'm' and 'n' to share
 -->
        <para>
-        Add <xref linkend="guc-log-line-prefix"> option <literal>%n</> to
+        Add <xref linkend="guc-log-line-prefix"> option <literal>%n</literal> to
         print the current time in Unix epoch form, with milliseconds (Tomas
         Vondra, Jeff Davis)
        </para>
@@ -5966,7 +6472,7 @@ and many others in the same vein
         Add <xref linkend="guc-syslog-sequence-numbers"> and <xref
         linkend="guc-syslog-split-messages"> configuration parameters
         to provide more control over the message format when logging to
-        <systemitem>syslog</> (Peter Eisentraut)
+        <systemitem>syslog</systemitem> (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -5975,16 +6481,16 @@ and many others in the same vein
 2016-03-18 [b555ed810] Merge wal_level "archive" and "hot_standby" into new nam
 -->
        <para>
-        Merge the <literal>archive</> and <literal>hot_standby</> values
+        Merge the <literal>archive</literal> and <literal>hot_standby</literal> values
         of the <xref linkend="guc-wal-level"> configuration parameter
-        into a single new value <literal>replica</> (Peter Eisentraut)
+        into a single new value <literal>replica</literal> (Peter Eisentraut)
        </para>
 
        <para>
         Making a distinction between these settings is no longer useful,
         and merging them is a step towards a planned future simplification
         of replication setup.  The old names are still accepted but are
-        converted to <literal>replica</> internally.
+        converted to <literal>replica</literal> internally.
        </para>
       </listitem>
 
@@ -5993,15 +6499,15 @@ and many others in the same vein
 2016-02-02 [7d17e683f] Add support for systemd service notifications
 -->
        <para>
-        Add configure option <option>--with-systemd</> to enable
-        calling <function>sd_notify()</> at server start and stop (Peter
+        Add configure option <option>--with-systemd</option> to enable
+        calling <function>sd_notify()</function> at server start and stop (Peter
         Eisentraut)
        </para>
 
        <para>
-        This allows the use of <application>systemd</> service units of
-        type <literal>notify</>, which greatly simplifies the management
-        of <productname>PostgreSQL</> under <application>systemd</>.
+        This allows the use of <application>systemd</application> service units of
+        type <literal>notify</literal>, which greatly simplifies the management
+        of <productname>PostgreSQL</productname> under <application>systemd</application>.
        </para>
       </listitem>
 
@@ -6010,17 +6516,17 @@ and many others in the same vein
 2016-03-19 [9a83564c5] Allow SSL server key file to have group read access if o
 -->
        <para>
-        Allow the server's <acronym>SSL</> key file to have group read
-        access if it is owned by <literal>root</> (Christoph Berg)
+        Allow the server's <acronym>SSL</acronym> key file to have group read
+        access if it is owned by <literal>root</literal> (Christoph Berg)
        </para>
 
        <para>
         Formerly, we insisted the key file be owned by the
-        user running the <productname>PostgreSQL</> server, but
+        user running the <productname>PostgreSQL</productname> server, but
         that is inconvenient on some systems (such as <systemitem
-        class="osname">Debian</>) that are configured to manage
+        class="osname">Debian</systemitem>) that are configured to manage
         certificates centrally.  Therefore, allow the case where the key
-        file is owned by <literal>root</> and has group read access.
+        file is owned by <literal>root</literal> and has group read access.
         It is up to the operating system administrator to ensure that
         the group does not include any untrusted users.
        </para>
@@ -6085,8 +6591,8 @@ XXX this is pending backpatch, may need to remove
 2016-04-26 [c6ff84b06] Emit invalidations to standby for transactions without x
 -->
        <para>
-        Ensure that invalidation messages are recorded in <acronym>WAL</>
-        even when issued by a transaction that has no <acronym>XID</>
+        Ensure that invalidation messages are recorded in <acronym>WAL</acronym>
+        even when issued by a transaction that has no <acronym>XID</acronym>
         assigned (Andres Freund)
        </para>
 
@@ -6102,7 +6608,7 @@ XXX this is pending backpatch, may need to remove
 2016-04-28 [e2c79e14d] Prevent multiple cleanup process for pending list in GIN
 -->
        <para>
-        Prevent multiple processes from trying to clean a <acronym>GIN</>
+        Prevent multiple processes from trying to clean a <acronym>GIN</acronym>
         index's pending list concurrently (Teodor Sigaev, Jeff Janes)
        </para>
 
@@ -6147,13 +6653,13 @@ XXX this is pending backpatch, may need to remove
 2016-03-29 [314cbfc5d] Add new replication mode synchronous_commit = 'remote_ap
 -->
        <para>
-        Add new setting <literal>remote_apply</> for configuration
+        Add new setting <literal>remote_apply</literal> for configuration
         parameter <xref linkend="guc-synchronous-commit"> (Thomas Munro)
        </para>
 
        <para>
         In this mode, the master waits for the transaction to be
-        <emphasis>applied</> on the standby server, not just written
+        <emphasis>applied</emphasis> on the standby server, not just written
         to disk.  That means that you can count on a transaction started
         on the standby to see all commits previously acknowledged by
         the master.
@@ -6168,14 +6674,14 @@ XXX this is pending backpatch, may need to remove
        <para>
         Add a feature to the replication
         protocol, and a corresponding option to <link
-        linkend="functions-replication-table"><function>pg_create_physical_replication_slot()</></>,
-        to allow reserving <acronym>WAL</> immediately when creating a
+        linkend="functions-replication-table"><function>pg_create_physical_replication_slot()</function></link>,
+        to allow reserving <acronym>WAL</acronym> immediately when creating a
         replication slot (Gurjeet Singh, Michael Paquier)
        </para>
 
        <para>
         This allows the creation of a replication slot to guarantee
-        that all the <acronym>WAL</> needed for a base backup will be
+        that all the <acronym>WAL</acronym> needed for a base backup will be
         available.
        </para>
       </listitem>
@@ -6186,13 +6692,13 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a <option>--slot</option> option to
-        <link linkend="app-pgbasebackup"><application>pg_basebackup</></>
+        <link linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         (Peter Eisentraut)
        </para>
 
        <para>
-        This lets <application>pg_basebackup</> use a replication
-        slot defined for <acronym>WAL</> streaming.  After the base
+        This lets <application>pg_basebackup</application> use a replication
+        slot defined for <acronym>WAL</acronym> streaming.  After the base
         backup completes, selecting the same slot for regular streaming
         replication allows seamless startup of the new standby server.
        </para>
@@ -6205,8 +6711,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Extend <link
-        linkend="functions-admin-backup-table"><function>pg_start_backup()</></>
-        and <function>pg_stop_backup()</> to support non-exclusive backups
+        linkend="functions-admin-backup-table"><function>pg_start_backup()</function></link>
+        and <function>pg_stop_backup()</function> to support non-exclusive backups
         (Magnus Hagander)
        </para>
       </listitem>
@@ -6226,14 +6732,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow functions that return sets of tuples to return simple
-        <literal>NULL</>s (Andrew Gierth, Tom Lane)
+        <literal>NULL</literal>s (Andrew Gierth, Tom Lane)
        </para>
 
        <para>
-        In the context of <literal>SELECT FROM function(...)</>, a function
+        In the context of <literal>SELECT FROM function(...)</literal>, a function
         that returned a set of composite values was previously not allowed
-        to return a plain <literal>NULL</> value as part of the set.
-        Now that is allowed and interpreted as a row of <literal>NULL</>s.
+        to return a plain <literal>NULL</literal> value as part of the set.
+        Now that is allowed and interpreted as a row of <literal>NULL</literal>s.
         This avoids corner-case errors with, for example, unnesting an
         array of composite values.
        </para>
@@ -6245,14 +6751,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Fully support array subscripts and field selections in the
-        target column list of an <command>INSERT</> with multiple
-        <literal>VALUES</> rows (Tom Lane)
+        target column list of an <command>INSERT</command> with multiple
+        <literal>VALUES</literal> rows (Tom Lane)
        </para>
 
        <para>
         Previously, such cases failed if the same target column was
         mentioned more than once, e.g., <literal>INSERT INTO tab (x[1],
-        x[2]) VALUES (...)</>.
+        x[2]) VALUES (...)</literal>.
        </para>
       </listitem>
 
@@ -6262,16 +6768,16 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [d543170f2] Don't split up SRFs when choosing to postpone SELECT out
 -->
        <para>
-        When appropriate, postpone evaluation of <command>SELECT</>
-        output expressions until after an <literal>ORDER BY</> sort
+        When appropriate, postpone evaluation of <command>SELECT</command>
+        output expressions until after an <literal>ORDER BY</literal> sort
         (Konstantin Knizhnik)
        </para>
 
        <para>
         This change ensures that volatile or expensive functions in the
         output list are executed in the order suggested by <literal>ORDER
-        BY</>, and that they are not evaluated more times than required
-        when there is a <literal>LIMIT</> clause.  Previously, these
+        BY</literal>, and that they are not evaluated more times than required
+        when there is a <literal>LIMIT</literal> clause.  Previously, these
         properties held if the ordering was performed by an index scan or
         pre-merge-join sort, but not if it was performed by a top-level
         sort.
@@ -6289,9 +6795,9 @@ XXX this is pending backpatch, may need to remove
        </para>
 
        <para>
-        This change allows command tags, e.g. <command>SELECT</>, to
+        This change allows command tags, e.g. <command>SELECT</command>, to
         correctly report tuple counts larger than 4 billion.  This also
-        applies to PL/pgSQL's <command>GET DIAGNOSTICS ... ROW_COUNT</>
+        applies to PL/pgSQL's <command>GET DIAGNOSTICS ... ROW_COUNT</command>
         command.
        </para>
       </listitem>
@@ -6302,17 +6808,17 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Avoid doing encoding conversions by converting through the
-        <literal>MULE_INTERNAL</> encoding (Tom Lane)
+        <literal>MULE_INTERNAL</literal> encoding (Tom Lane)
        </para>
 
        <para>
         Previously, many conversions for Cyrillic and Central
         European single-byte encodings were done by converting to a
-        related <literal>MULE_INTERNAL</> coding scheme and then to the
+        related <literal>MULE_INTERNAL</literal> coding scheme and then to the
         destination encoding.  Aside from being inefficient, this meant
         that when the conversion encountered an untranslatable character,
         the error message would confusingly complain about failure to
-        convert to or from <literal>MULE_INTERNAL</>, rather than the
+        convert to or from <literal>MULE_INTERNAL</literal>, rather than the
         user-visible encoding.
        </para>
       </listitem>
@@ -6331,7 +6837,7 @@ XXX this is pending backpatch, may need to remove
        <para>
         Previously, the foreign join pushdown infrastructure left the
         question of security entirely up to individual foreign data
-        wrappers, but that made it too easy for an <acronym>FDW</> to
+        wrappers, but that made it too easy for an <acronym>FDW</acronym> to
         inadvertently create subtle security holes.  So, make it the core
         code's job to determine which role ID will access each table,
         and do not attempt join pushdown unless the role is the same for
@@ -6353,13 +6859,13 @@ XXX this is pending backpatch, may need to remove
 2015-11-27 [92e38182d] COPY (INSERT/UPDATE/DELETE .. RETURNING ..)
 -->
        <para>
-        Allow <command>COPY</> to copy the output of an
-        <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
-        ... <literal>RETURNING</> query (Marko Tiikkaja)
+        Allow <command>COPY</command> to copy the output of an
+        <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
+        ... <literal>RETURNING</literal> query (Marko Tiikkaja)
        </para>
 
        <para>
-        Previously, an intermediate <acronym>CTE</> had to be written to
+        Previously, an intermediate <acronym>CTE</acronym> had to be written to
         get this result.
        </para>
       </listitem>
@@ -6369,16 +6875,16 @@ XXX this is pending backpatch, may need to remove
 2016-04-05 [f2fcad27d] Support ALTER THING .. DEPENDS ON EXTENSION
 -->
        <para>
-        Introduce <command>ALTER <replaceable>object</> DEPENDS ON
+        Introduce <command>ALTER <replaceable>object</replaceable> DEPENDS ON
         EXTENSION</command> (Abhijit Menon-Sen)
        </para>
 
        <para>
         This command allows a database object to be marked as depending
         on an extension, so that it will be dropped automatically if
-        the extension is dropped (without needing <literal>CASCADE</>).
+        the extension is dropped (without needing <literal>CASCADE</literal>).
         However, the object is not part of the extension, and thus will
-        be dumped separately by <application>pg_dump</>.
+        be dumped separately by <application>pg_dump</application>.
        </para>
       </listitem>
 
@@ -6387,7 +6893,7 @@ XXX this is pending backpatch, may need to remove
 2015-11-19 [bc4996e61] Make ALTER .. SET SCHEMA do nothing, instead of throwing
 -->
        <para>
-        Make <command>ALTER <replaceable>object</> SET SCHEMA</> do nothing
+        Make <command>ALTER <replaceable>object</replaceable> SET SCHEMA</command> do nothing
         when the object is already in the requested schema, rather than
         throwing an error as it historically has for most object types
         (Marti Raudsepp)
@@ -6411,8 +6917,8 @@ XXX this is pending backpatch, may need to remove
 2015-07-29 [2cd40adb8] Add IF NOT EXISTS processing to ALTER TABLE ADD COLUMN
 -->
        <para>
-        Add an <option>IF NOT EXISTS</> option to <command>ALTER TABLE
-        ADD COLUMN</> (Fabr&iacute;zio de Royes Mello)
+        Add an <option>IF NOT EXISTS</option> option to <command>ALTER TABLE
+        ADD COLUMN</command> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6422,7 +6928,7 @@ XXX this is pending backpatch, may need to remove
 2016-03-10 [fcb4bfddb] Reduce lock level for altering fillfactor
 -->
        <para>
-        Reduce the lock strength needed by <command>ALTER TABLE</>
+        Reduce the lock strength needed by <command>ALTER TABLE</command>
         when setting fillfactor and autovacuum-related relation options
         (Fabr&iacute;zio de Royes Mello, Simon Riggs)
        </para>
@@ -6434,7 +6940,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Introduce <link linkend="sql-create-access-method"><command>CREATE
-        ACCESS METHOD</></> to allow extensions to create index access
+        ACCESS METHOD</command></link> to allow extensions to create index access
         methods (Alexander Korotkov, Petr Jel&iacute;nek)
        </para>
       </listitem>
@@ -6444,7 +6950,7 @@ XXX this is pending backpatch, may need to remove
 2015-10-03 [b67aaf21e] Add CASCADE support for CREATE EXTENSION.
 -->
        <para>
-        Add a <literal>CASCADE</> option to <command>CREATE
+        Add a <literal>CASCADE</literal> option to <command>CREATE
         EXTENSION</command> to automatically create any extensions the
         requested one depends on (Petr Jel&iacute;nek)
        </para>
@@ -6455,7 +6961,7 @@ XXX this is pending backpatch, may need to remove
 2015-10-05 [b943f502b] Have CREATE TABLE LIKE add OID column if any LIKEd table
 -->
        <para>
-        Make <command>CREATE TABLE ... LIKE</> include an <type>OID</>
+        Make <command>CREATE TABLE ... LIKE</command> include an <type>OID</type>
         column if any source table has one (Bruce Momjian)
        </para>
       </listitem>
@@ -6465,14 +6971,14 @@ XXX this is pending backpatch, may need to remove
 2015-12-16 [f27a6b15e] Mark CHECK constraints declared NOT VALID valid if creat
 -->
        <para>
-        If a <literal>CHECK</> constraint is declared <literal>NOT VALID</>
+        If a <literal>CHECK</literal> constraint is declared <literal>NOT VALID</literal>
         in a table creation command, automatically mark it as valid
         (Amit Langote, Amul Sul)
        </para>
 
        <para>
         This is safe because the table has no existing rows.  This matches
-        the longstanding behavior of <literal>FOREIGN KEY</> constraints.
+        the longstanding behavior of <literal>FOREIGN KEY</literal> constraints.
        </para>
       </listitem>
 
@@ -6481,16 +6987,16 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [c94959d41] Fix DROP OPERATOR to reset oprcom/oprnegate links to the
 -->
        <para>
-        Fix <command>DROP OPERATOR</> to clear
-        <structname>pg_operator</>.<structfield>oprcom</> and
-        <structname>pg_operator</>.<structfield>oprnegate</> links to
+        Fix <command>DROP OPERATOR</command> to clear
+        <structname>pg_operator</structname>.<structfield>oprcom</structfield> and
+        <structname>pg_operator</structname>.<structfield>oprnegate</structfield> links to
         the dropped operator (Roma Sokolov)
        </para>
 
        <para>
         Formerly such links were left as-is, which could pose a problem
         in the somewhat unlikely event that the dropped operator's
-        <type>OID</> was reused for another operator.
+        <type>OID</type> was reused for another operator.
        </para>
       </listitem>
 
@@ -6499,13 +7005,13 @@ XXX this is pending backpatch, may need to remove
 2016-07-11 [4d042999f] Print a given subplan only once in EXPLAIN.
 -->
        <para>
-        Do not show the same subplan twice in <command>EXPLAIN</> output
+        Do not show the same subplan twice in <command>EXPLAIN</command> output
         (Tom Lane)
        </para>
 
        <para>
         In certain cases, typically involving SubPlan nodes in index
-        conditions, <command>EXPLAIN</> would print data for the same
+        conditions, <command>EXPLAIN</command> would print data for the same
         subplan twice.
        </para>
       </listitem>
@@ -6516,7 +7022,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Disallow creation of indexes on system columns, except for
-        <type>OID</> columns (David Rowley)
+        <type>OID</type> columns (David Rowley)
        </para>
 
        <para>
@@ -6550,8 +7056,8 @@ XXX this is pending backpatch, may need to remove
         checks that would throw an error if they were called by a
         non-superuser.  This forced the use of superuser roles for
         some relatively pedestrian tasks.  The hard-wired error checks
-        are now gone in favor of making <application>initdb</> revoke the
-        default public <literal>EXECUTE</> privilege on these functions.
+        are now gone in favor of making <application>initdb</application> revoke the
+        default public <literal>EXECUTE</literal> privilege on these functions.
         This allows installations to choose to grant usage of such
         functions to trusted roles that do not need all superuser
         privileges.
@@ -6569,7 +7075,7 @@ XXX this is pending backpatch, may need to remove
        </para>
 
        <para>
-        Currently the only such role is <literal>pg_signal_backend</>,
+        Currently the only such role is <literal>pg_signal_backend</literal>,
         but more are expected to be added in future.
        </para>
       </listitem>
@@ -6591,19 +7097,19 @@ XXX this is pending backpatch, may need to remove
 2016-06-27 [6734a1cac] Change predecence of phrase operator.
 -->
        <para>
-        Improve <link linkend="textsearch">full-text search</> to support
+        Improve <link linkend="textsearch">full-text search</link> to support
         searching for phrases, that is, lexemes appearing adjacent to each
         other in a specific order, or with a specified distance between
         them (Teodor Sigaev, Oleg Bartunov, Dmitry Ivanov)
        </para>
 
        <para>
-        A phrase-search query can be specified in <type>tsquery</>
-        input using the new operators <literal>&lt;-&gt;</> and
-        <literal>&lt;<replaceable>N</>&gt;</literal>.  The former means
+        A phrase-search query can be specified in <type>tsquery</type>
+        input using the new operators <literal>&lt;-&gt;</literal> and
+        <literal>&lt;<replaceable>N</replaceable>&gt;</literal>.  The former means
         that the lexemes before and after it must appear adjacent to
         each other in that order.  The latter means they must be exactly
-        <replaceable>N</> lexemes apart.
+        <replaceable>N</replaceable> lexemes apart.
        </para>
       </listitem>
 
@@ -6613,7 +7119,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow omitting one or both boundaries in an array slice specifier,
-        e.g. <literal>array_col[3:]</> (Yury Zhuravlev)
+        e.g. <literal>array_col[3:]</literal> (Yury Zhuravlev)
        </para>
 
        <para>
@@ -6634,19 +7140,19 @@ XXX this is pending backpatch, may need to remove
 
        <para>
         This change prevents unexpected out-of-range errors for
-        <type>timestamp with time zone</> values very close to the
-        implementation limits.  Previously, the <quote>same</> value might
-        be accepted or not depending on the <varname>timezone</> setting,
+        <type>timestamp with time zone</type> values very close to the
+        implementation limits.  Previously, the <quote>same</quote> value might
+        be accepted or not depending on the <varname>timezone</varname> setting,
         meaning that a dump and reload could fail on a value that had been
         accepted when presented.  Now the limits are enforced according
-        to the equivalent <acronym>UTC</> time, not local time, so as to
-        be independent of <varname>timezone</>.
+        to the equivalent <acronym>UTC</acronym> time, not local time, so as to
+        be independent of <varname>timezone</varname>.
        </para>
 
        <para>
-        Also, <productname>PostgreSQL</> is now more careful to detect
+        Also, <productname>PostgreSQL</productname> is now more careful to detect
         overflow in operations that compute new date or timestamp values,
-        such as <type>date</> <literal>+</> <type>integer</>.
+        such as <type>date</type> <literal>+</literal> <type>integer</type>.
        </para>
       </listitem>
 
@@ -6655,14 +7161,14 @@ XXX this is pending backpatch, may need to remove
 2016-03-30 [50861cd68] Improve portability of I/O behavior for the geometric ty
 -->
        <para>
-        For geometric data types, make sure <literal>infinity</> and
-        <literal>NaN</> component values are treated consistently during
+        For geometric data types, make sure <literal>infinity</literal> and
+        <literal>NaN</literal> component values are treated consistently during
         input and output (Tom Lane)
        </para>
 
        <para>
         Such values will now always print the same as they would in
-        a simple <type>float8</> column, and be accepted the same way
+        a simple <type>float8</type> column, and be accepted the same way
         on input.  Previously the behavior was platform-dependent.
        </para>
       </listitem>
@@ -6675,8 +7181,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Upgrade
-        the <link linkend="textsearch-ispell-dictionary"><literal>ispell</></>
-        dictionary type to handle modern <productname>Hunspell</> files and
+        the <link linkend="textsearch-ispell-dictionary"><literal>ispell</literal></link>
+        dictionary type to handle modern <productname>Hunspell</productname> files and
         support more languages (Artur Zakirov)
        </para>
       </listitem>
@@ -6687,7 +7193,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Implement look-behind constraints
-        in <link linkend="functions-posix-regexp">regular expressions</>
+        in <link linkend="functions-posix-regexp">regular expressions</link>
         (Tom Lane)
        </para>
 
@@ -6706,12 +7212,12 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In regular expressions, if an apparent three-digit octal escape
-        <literal>\</><replaceable>nnn</> would exceed 377 (255 decimal),
+        <literal>\</literal><replaceable>nnn</replaceable> would exceed 377 (255 decimal),
         assume it is a two-digit octal escape instead (Tom Lane)
        </para>
 
        <para>
-        This makes the behavior match current <application>Tcl</> releases.
+        This makes the behavior match current <application>Tcl</application> releases.
        </para>
       </listitem>
 
@@ -6720,8 +7226,8 @@ XXX this is pending backpatch, may need to remove
 2015-11-07 [c5e86ea93] Add "xid <> xid" and "xid <> int4" operators.
 -->
        <para>
-        Add transaction ID operators <type>xid</> <literal>&lt;&gt;</>
-        <type>xid</> and <type>xid</> <literal>&lt;&gt;</> <type>int4</>,
+        Add transaction ID operators <type>xid</type> <literal>&lt;&gt;</literal>
+        <type>xid</type> and <type>xid</type> <literal>&lt;&gt;</literal> <type>int4</type>,
         for consistency with the corresponding equality operators
         (Michael Paquier)
        </para>
@@ -6742,9 +7248,9 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add <link
-        linkend="functions-json-processing-table"><function>jsonb_insert()</></>
-        function to insert a new element into a <type>jsonb</> array,
-        or a not-previously-existing key into a <type>jsonb</> object
+        linkend="functions-json-processing-table"><function>jsonb_insert()</function></link>
+        function to insert a new element into a <type>jsonb</type> array,
+        or a not-previously-existing key into a <type>jsonb</type> object
         (Dmitry Dolgov)
        </para>
       </listitem>
@@ -6755,9 +7261,9 @@ XXX this is pending backpatch, may need to remove
 2016-05-05 [18a02ad2a] Fix corner-case loss of precision in numeric pow() calcu
 -->
        <para>
-        Improve the accuracy of the <function>ln()</>, <function>log()</>,
-        <function>exp()</>, and <function>pow()</> functions for type
-        <type>numeric</> (Dean Rasheed)
+        Improve the accuracy of the <function>ln()</function>, <function>log()</function>,
+        <function>exp()</function>, and <function>pow()</function> functions for type
+        <type>numeric</type> (Dean Rasheed)
        </para>
       </listitem>
 
@@ -6767,8 +7273,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a <link
-        linkend="functions-math-func-table"><function>scale(numeric)</></>
-        function to extract the display scale of a <type>numeric</> value
+        linkend="functions-math-func-table"><function>scale(numeric)</function></link>
+        function to extract the display scale of a <type>numeric</type> value
         (Marko Tiikkaja)
        </para>
       </listitem>
@@ -6783,8 +7289,8 @@ XXX this is pending backpatch, may need to remove
 
        <para>
         For example, <link
-        linkend="functions-math-trig-table"><function>sind()</></>
-        measures its argument in degrees, whereas <function>sin()</>
+        linkend="functions-math-trig-table"><function>sind()</function></link>
+        measures its argument in degrees, whereas <function>sin()</function>
         measures in radians.  These functions go to some lengths to
         deliver exact results for values where an exact result can be
         expected, for instance <literal>sind(30) = 0.5</literal>.
@@ -6796,15 +7302,15 @@ XXX this is pending backpatch, may need to remove
 2016-01-22 [fd5200c3d] Improve cross-platform consistency of Inf/NaN handling i
 -->
        <para>
-        Ensure that trigonometric functions handle <literal>infinity</>
-        and <literal>NaN</> inputs per the <acronym>POSIX</> standard
+        Ensure that trigonometric functions handle <literal>infinity</literal>
+        and <literal>NaN</literal> inputs per the <acronym>POSIX</acronym> standard
         (Dean Rasheed)
        </para>
 
        <para>
-        The <acronym>POSIX</> standard says that these functions should
-        return <literal>NaN</> for <literal>NaN</> input, and should throw
-        an error for out-of-range inputs including <literal>infinity</>.
+        The <acronym>POSIX</acronym> standard says that these functions should
+        return <literal>NaN</literal> for <literal>NaN</literal> input, and should throw
+        an error for out-of-range inputs including <literal>infinity</literal>.
         Previously our behavior varied across platforms.
        </para>
       </listitem>
@@ -6815,9 +7321,9 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Make <link
-        linkend="functions-datetime-table"><function>to_timestamp(float8)</></>
-        convert float <literal>infinity</> to
-        timestamp <literal>infinity</> (Vitaly Burovoy)
+        linkend="functions-datetime-table"><function>to_timestamp(float8)</function></link>
+        convert float <literal>infinity</literal> to
+        timestamp <literal>infinity</literal> (Vitaly Burovoy)
        </para>
 
        <para>
@@ -6831,15 +7337,15 @@ XXX this is pending backpatch, may need to remove
 2016-05-05 [0b9a23443] Rename tsvector delete() to ts_delete(), and filter() to
 -->
        <para>
-        Add new functions for <type>tsvector</> data (Stas Kelvich)
+        Add new functions for <type>tsvector</type> data (Stas Kelvich)
        </para>
 
        <para>
         The new functions are <link
-        linkend="textsearch-functions-table"><function>ts_delete()</></>,
-        <function>ts_filter()</>, <function>unnest()</>,
-        <function>tsvector_to_array()</>, <function>array_to_tsvector()</>,
-        and a variant of <function>setweight()</> that sets the weight
+        linkend="textsearch-functions-table"><function>ts_delete()</function></link>,
+        <function>ts_filter()</function>, <function>unnest()</function>,
+        <function>tsvector_to_array()</function>, <function>array_to_tsvector()</function>,
+        and a variant of <function>setweight()</function> that sets the weight
         only for specified lexeme(s).
        </para>
       </listitem>
@@ -6849,11 +7355,11 @@ XXX this is pending backpatch, may need to remove
 2015-09-17 [9acb9007d] Fix oversight in tsearch type check
 -->
        <para>
-        Allow <link linkend="textsearch-statistics"><function>ts_stat()</></>
-        and <link linkend="textsearch-update-triggers"><function>tsvector_update_trigger()</></>
+        Allow <link linkend="textsearch-statistics"><function>ts_stat()</function></link>
+        and <link linkend="textsearch-update-triggers"><function>tsvector_update_trigger()</function></link>
         to operate on values that are of types binary-compatible with the
         expected argument type, not just exactly that type; for example
-        allow <type>citext</> where <type>text</> is expected (Teodor
+        allow <type>citext</type> where <type>text</type> is expected (Teodor
         Sigaev)
        </para>
       </listitem>
@@ -6864,14 +7370,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add variadic functions <link
-        linkend="functions-comparison-func-table"><function>num_nulls()</></>
-        and <function>num_nonnulls()</> that count the number of their
+        linkend="functions-comparison-func-table"><function>num_nulls()</function></link>
+        and <function>num_nonnulls()</function> that count the number of their
         arguments that are null or non-null (Marko Tiikkaja)
        </para>
 
        <para>
-        An example usage is <literal>CHECK(num_nonnulls(a,b,c) = 1)</>
-        which asserts that exactly one of a,b,c is not <literal>NULL</>.
+        An example usage is <literal>CHECK(num_nonnulls(a,b,c) = 1)</literal>
+        which asserts that exactly one of a,b,c is not <literal>NULL</literal>.
         These functions can also be used to count the number of null or
         nonnull elements in an array.
        </para>
@@ -6883,8 +7389,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add function <link
-        linkend="functions-string-other"><function>parse_ident()</></>
-        to split a qualified, possibly quoted <acronym>SQL</> identifier
+        linkend="functions-string-other"><function>parse_ident()</function></link>
+        to split a qualified, possibly quoted <acronym>SQL</acronym> identifier
         into its parts (Pavel Stehule)
        </para>
       </listitem>
@@ -6895,15 +7401,15 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link
-        linkend="functions-formatting-table"><function>to_number()</></>,
-        interpret a <literal>V</> format code as dividing by 10 to the
-        power of the number of digits following <literal>V</> (Bruce
+        linkend="functions-formatting-table"><function>to_number()</function></link>,
+        interpret a <literal>V</literal> format code as dividing by 10 to the
+        power of the number of digits following <literal>V</literal> (Bruce
         Momjian)
        </para>
 
        <para>
         This makes it operate in an inverse fashion to
-        <function>to_char()</>.
+        <function>to_char()</function>.
        </para>
       </listitem>
 
@@ -6913,8 +7419,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Make the <link
-        linkend="functions-info-catalog-table"><function>to_reg*()</></>
-        functions accept type <type>text</> not <type>cstring</>
+        linkend="functions-info-catalog-table"><function>to_reg*()</function></link>
+        functions accept type <type>text</type> not <type>cstring</type>
         (Petr Korobeinikov)
        </para>
 
@@ -6930,16 +7436,16 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add <link
-        linkend="functions-admin-dbsize"><function>pg_size_bytes()</></>
+        linkend="functions-admin-dbsize"><function>pg_size_bytes()</function></link>
         function to convert human-readable size strings to numbers (Pavel
         Stehule, Vitaly Burovoy, Dean Rasheed)
        </para>
 
        <para>
         This function converts strings like those produced by
-        <function>pg_size_pretty()</> into bytes.  An example
+        <function>pg_size_pretty()</function> into bytes.  An example
         usage is <literal>SELECT oid::regclass FROM pg_class WHERE
-        pg_total_relation_size(oid) &gt; pg_size_bytes('10 GB')</>.
+        pg_total_relation_size(oid) &gt; pg_size_bytes('10 GB')</literal>.
        </para>
       </listitem>
 
@@ -6949,7 +7455,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link
-        linkend="functions-admin-dbsize"><function>pg_size_pretty()</></>,
+        linkend="functions-admin-dbsize"><function>pg_size_pretty()</function></link>,
         format negative numbers similarly to positive ones (Adrian
         Vondendriesch)
        </para>
@@ -6965,14 +7471,14 @@ XXX this is pending backpatch, may need to remove
 2015-07-02 [10fb48d66] Add an optional missing_ok argument to SQL function curr
 -->
        <para>
-        Add an optional <replaceable>missing_ok</> argument to the <link
-        linkend="functions-admin-set-table"><function>current_setting()</></>
+        Add an optional <replaceable>missing_ok</replaceable> argument to the <link
+        linkend="functions-admin-set-table"><function>current_setting()</function></link>
         function (David Christensen)
        </para>
 
        <para>
         This allows avoiding an error for an unrecognized parameter
-        name, instead returning a <literal>NULL</>.
+        name, instead returning a <literal>NULL</literal>.
        </para>
       </listitem>
 
@@ -6984,16 +7490,16 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Change various catalog-inspection functions to return
-        <literal>NULL</> for invalid input (Michael Paquier)
+        <literal>NULL</literal> for invalid input (Michael Paquier)
        </para>
 
        <para>
         <link
-        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</></>
-        now returns <literal>NULL</> if given an invalid view <type>OID</>,
-        and several similar functions likewise return <literal>NULL</> for
+        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</function></link>
+        now returns <literal>NULL</literal> if given an invalid view <type>OID</type>,
+        and several similar functions likewise return <literal>NULL</literal> for
         bad input.  Previously, such cases usually led to <quote>cache
-        lookup failed</> errors, which are not meant to occur in
+        lookup failed</quote> errors, which are not meant to occur in
         user-facing cases.
        </para>
       </listitem>
@@ -7004,13 +7510,13 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Fix <link
-        linkend="pg-replication-origin-xact-reset"><function>pg_replication_origin_xact_reset()</></>
+        linkend="pg-replication-origin-xact-reset"><function>pg_replication_origin_xact_reset()</function></link>
         to not have any arguments (Fujii Masao)
        </para>
 
        <para>
         The documentation said that it has no arguments, and the C code did
-        not expect any arguments, but the entry in <structname>pg_proc</>
+        not expect any arguments, but the entry in <structname>pg_proc</structname>
         mistakenly specified two arguments.
        </para>
       </listitem>
@@ -7030,7 +7536,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link linkend="plpgsql">PL/pgSQL</link>, detect mismatched
-        <command>CONTINUE</> and <command>EXIT</> statements while
+        <command>CONTINUE</command> and <command>EXIT</command> statements while
         compiling a function, rather than at execution time
         (Jim Nasby)
        </para>
@@ -7043,7 +7549,7 @@ XXX this is pending backpatch, may need to remove
 2016-07-02 [3a4a33ad4] PL/Python: Report argument parsing errors using exceptio
 -->
        <para>
-        Extend <application>PL/Python</>'s error-reporting and
+        Extend <application>PL/Python</application>'s error-reporting and
         message-reporting functions to allow specifying additional message
         fields besides the primary error message (Pavel Stehule)
        </para>
@@ -7055,7 +7561,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow PL/Python functions to call themselves recursively
-        via <application>SPI</>, and fix the behavior when multiple
+        via <application>SPI</application>, and fix the behavior when multiple
         set-returning PL/Python functions are called within one query
         (Alexey Grishchenko, Tom Lane)
        </para>
@@ -7077,14 +7583,14 @@ XXX this is pending backpatch, may need to remove
 2016-03-02 [e2609323e] Make PL/Tcl require Tcl 8.4 or later.
 -->
        <para>
-        Modernize <application>PL/Tcl</> to use Tcl's <quote>object</>
-        <acronym>API</>s instead of simple strings (Jim Nasby, Karl
+        Modernize <application>PL/Tcl</application> to use Tcl's <quote>object</quote>
+        <acronym>API</acronym>s instead of simple strings (Jim Nasby, Karl
         Lehenbauer)
        </para>
 
        <para>
         This can improve performance substantially in some cases.
-        Note that <application>PL/Tcl</> now requires Tcl 8.4 or later.
+        Note that <application>PL/Tcl</application> now requires Tcl 8.4 or later.
        </para>
       </listitem>
 
@@ -7094,8 +7600,8 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [cd37bb785] Improve PL/Tcl errorCode facility by providing decoded n
 -->
        <para>
-        In <application>PL/Tcl</>, make database-reported errors return
-        additional information in Tcl's <varname>errorCode</> global
+        In <application>PL/Tcl</application>, make database-reported errors return
+        additional information in Tcl's <varname>errorCode</varname> global
         variable (Jim Nasby, Tom Lane)
        </para>
 
@@ -7110,15 +7616,15 @@ XXX this is pending backpatch, may need to remove
 2016-03-02 [c8c7c93de] Fix PL/Tcl's encoding conversion logic.
 -->
        <para>
-        Fix <application>PL/Tcl</> to perform encoding conversion between
-        the database encoding and <literal>UTF-8</>, which is what Tcl
+        Fix <application>PL/Tcl</application> to perform encoding conversion between
+        the database encoding and <literal>UTF-8</literal>, which is what Tcl
         expects (Tom Lane)
        </para>
 
        <para>
         Previously, strings were passed through without conversion,
-        leading to misbehavior with non-<literal>ASCII</> characters when
-        the database encoding was not <literal>UTF-8</>.
+        leading to misbehavior with non-<literal>ASCII</literal> characters when
+        the database encoding was not <literal>UTF-8</literal>.
        </para>
       </listitem>
 
@@ -7137,7 +7643,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a nonlocalized version of
-        the <link linkend="protocol-error-fields">severity field</> in
+        the <link linkend="protocol-error-fields">severity field</link> in
         error and notice messages (Tom Lane)
        </para>
 
@@ -7154,17 +7660,17 @@ XXX this is pending backpatch, may need to remove
 This commit is also listed under psql and PL/pgSQL
 -->
        <para>
-        Introduce a feature in <application>libpq</> whereby the
-        <literal>CONTEXT</> field of messages can be suppressed, either
+        Introduce a feature in <application>libpq</application> whereby the
+        <literal>CONTEXT</literal> field of messages can be suppressed, either
         always or only for non-error messages (Pavel Stehule)
        </para>
 
        <para>
         The default behavior of <link
-        linkend="libpq-pqerrormessage"><function>PQerrorMessage()</></>
-        is now to print <literal>CONTEXT</>
+        linkend="libpq-pqerrormessage"><function>PQerrorMessage()</function></link>
+        is now to print <literal>CONTEXT</literal>
         only for errors.  The new function <link
-        linkend="libpq-pqseterrorcontextvisibility"><function>PQsetErrorContextVisibility()</></>
+        linkend="libpq-pqseterrorcontextvisibility"><function>PQsetErrorContextVisibility()</function></link>
         can be used to adjust this.
        </para>
       </listitem>
@@ -7174,14 +7680,14 @@ This commit is also listed under psql and PL/pgSQL
 2016-04-03 [e3161b231] Add libpq support for recreating an error message with d
 -->
        <para>
-        Add support in <application>libpq</> for regenerating an error
+        Add support in <application>libpq</application> for regenerating an error
         message with a different verbosity level (Alex Shulgin)
        </para>
 
        <para>
         This is done with the new function <link
-        linkend="libpq-pqresultverboseerrormessage"><function>PQresultVerboseErrorMessage()</></>.
-        This supports <application>psql</>'s new <literal>\errverbose</>
+        linkend="libpq-pqresultverboseerrormessage"><function>PQresultVerboseErrorMessage()</function></link>.
+        This supports <application>psql</application>'s new <literal>\errverbose</literal>
         feature, and may be useful for other clients as well.
        </para>
       </listitem>
@@ -7191,13 +7697,13 @@ This commit is also listed under psql and PL/pgSQL
 2015-11-27 [40cb21f70] Improve PQhost() to return useful data for default Unix-
 -->
        <para>
-        Improve <application>libpq</>'s <link
-        linkend="libpq-pqhost"><function>PQhost()</></> function to return
+        Improve <application>libpq</application>'s <link
+        linkend="libpq-pqhost"><function>PQhost()</function></link> function to return
         useful data for default Unix-socket connections (Tom Lane)
        </para>
 
        <para>
-        Previously it would return <literal>NULL</> if no explicit host
+        Previously it would return <literal>NULL</literal> if no explicit host
         specification had been given; now it returns the default socket
         directory path.
        </para>
@@ -7208,7 +7714,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-02-16 [fc1ae7d2e] Change ecpg lexer to accept comments with line breaks in
 -->
        <para>
-        Fix <application>ecpg</>'s lexer to handle line breaks within
+        Fix <application>ecpg</application>'s lexer to handle line breaks within
         comments starting on preprocessor directive lines (Michael Meskes)
        </para>
       </listitem>
@@ -7227,9 +7733,9 @@ This commit is also listed under psql and PL/pgSQL
 2015-09-14 [d02426029] Check existency of table/schema for -t/-n option (pg_dum
 -->
        <para>
-        Add a <option>--strict-names</> option
-        to <link linkend="APP-PGDUMP"><application>pg_dump</></>
-        and <link linkend="APP-PGRESTORE"><application>pg_restore</></>
+        Add a <option>--strict-names</option> option
+        to <link linkend="app-pgdump"><application>pg_dump</application></link>
+        and <link linkend="app-pgrestore"><application>pg_restore</application></link>
         (Pavel Stehule)
        </para>
 
@@ -7249,7 +7755,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-05-06 [e1b120a8c] Only issue LOCK TABLE commands when necessary
 -->
        <para>
-        In <application>pg_dump</>, dump locally-made changes of privilege
+        In <application>pg_dump</application>, dump locally-made changes of privilege
         assignments for system objects (Stephen Frost)
        </para>
 
@@ -7257,7 +7763,7 @@ This commit is also listed under psql and PL/pgSQL
         While it has always been possible for a superuser to change
         the privilege assignments for built-in or extension-created
         objects, such changes were formerly lost in a dump and reload.
-        Now, <application>pg_dump</> recognizes and dumps such changes.
+        Now, <application>pg_dump</application> recognizes and dumps such changes.
         (This works only when dumping from a 9.6 or later server, however.)
        </para>
       </listitem>
@@ -7267,7 +7773,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-09-08 [31eb14504] Allow pg_dump to dump non-extension members of an extens
 -->
        <para>
-        Allow <application>pg_dump</> to dump non-extension-owned objects
+        Allow <application>pg_dump</application> to dump non-extension-owned objects
         that are within an extension-owned schema
         (Mart&iacute;n Marqu&eacute;s)
        </para>
@@ -7283,7 +7789,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-04-06 [3b3fcc4ee] pg_dump: Add table qualifications to some tags
 -->
        <para>
-        In <application>pg_dump</> output, include the table name in object
+        In <application>pg_dump</application> output, include the table name in object
         tags for object types that are only uniquely named per-table
         (for example, triggers) (Peter Eisentraut)
        </para>
@@ -7292,7 +7798,7 @@ This commit is also listed under psql and PL/pgSQL
     </itemizedlist>
 
      <sect4>
-      <title><xref linkend="APP-PSQL"></title>
+      <title><xref linkend="app-psql"></title>
 
       <itemizedlist>
 
@@ -7308,7 +7814,7 @@ this commit is also listed in the compatibility section
 
        <para>
         The specified operations are carried out in the order in which the
-        options are given, and then <application>psql</> terminates.
+        options are given, and then <application>psql</application> terminates.
        </para>
       </listitem>
 
@@ -7317,7 +7823,7 @@ this commit is also listed in the compatibility section
 2016-04-08 [c09b18f21] Support \crosstabview in psql
 -->
        <para>
-        Add a <command>\crosstabview</> command that prints the results of
+        Add a <command>\crosstabview</command> command that prints the results of
         a query in a cross-tabulated display (Daniel V&eacute;rit&eacute;)
        </para>
 
@@ -7333,13 +7839,13 @@ this commit is also listed in the compatibility section
 2016-04-03 [3cc38ca7d] Add psql \errverbose command to see last server error at
 -->
        <para>
-        Add an <literal>\errverbose</> command that shows the last server
+        Add an <literal>\errverbose</literal> command that shows the last server
         error at full verbosity (Alex Shulgin)
        </para>
 
        <para>
         This is useful after getting an unexpected error &mdash; you
-        no longer need to adjust the <varname>VERBOSITY</> variable and
+        no longer need to adjust the <varname>VERBOSITY</varname> variable and
         recreate the failure in order to see error fields that are not
         shown by default.
        </para>
@@ -7351,13 +7857,13 @@ this commit is also listed in the compatibility section
 2016-05-06 [9b66aa006] Fix psql's \ev and \sv commands so that they handle view
 -->
        <para>
-        Add <literal>\ev</> and <literal>\sv</> commands for editing and
+        Add <literal>\ev</literal> and <literal>\sv</literal> commands for editing and
         showing view definitions (Petr Korobeinikov)
        </para>
 
        <para>
-        These are parallel to the existing <literal>\ef</> and
-        <literal>\sf</> commands for functions.
+        These are parallel to the existing <literal>\ef</literal> and
+        <literal>\sf</literal> commands for functions.
        </para>
       </listitem>
 
@@ -7366,7 +7872,7 @@ this commit is also listed in the compatibility section
 2016-04-04 [2bbe9112a] Add a \gexec command to psql for evaluation of computed
 -->
        <para>
-        Add a <command>\gexec</> command that executes a query and
+        Add a <command>\gexec</command> command that executes a query and
         re-submits the result(s) as new queries (Corey Huinker)
        </para>
       </listitem>
@@ -7376,9 +7882,9 @@ this commit is also listed in the compatibility section
 2015-10-05 [2145a7660] psql:  allow \pset C in setting the title, matches \C
 -->
        <para>
-        Allow <literal>\pset C <replaceable>string</></literal>
+        Allow <literal>\pset C <replaceable>string</replaceable></literal>
         to set the table title, for consistency with <literal>\C
-        <replaceable>string</></literal> (Bruce Momjian)
+        <replaceable>string</replaceable></literal> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -7387,7 +7893,7 @@ this commit is also listed in the compatibility section
 2016-03-11 [69ab7b9d6] psql: Don't automatically use expanded format when there
 -->
        <para>
-        In <literal>\pset expanded auto</> mode, do not use expanded
+        In <literal>\pset expanded auto</literal> mode, do not use expanded
         format for query results with only one column (Andreas Karlsson,
         Robert Haas)
        </para>
@@ -7399,16 +7905,16 @@ this commit is also listed in the compatibility section
 2016-06-15 [9901d8ac2] Use strftime("%c") to format timestamps in psql's \watch
 -->
        <para>
-        Improve the headers output by the <command>\watch</> command
+        Improve the headers output by the <command>\watch</command> command
         (Michael Paquier, Tom Lane)
        </para>
 
        <para>
-        Include the <command>\pset title</> string if one has
+        Include the <command>\pset title</command> string if one has
         been set, and shorten the prefabricated part of the
-        header to be <literal><replaceable>timestamp</> (every
-        <replaceable>N</>s)</literal>.  Also, the timestamp format now
-        obeys <application>psql</>'s locale environment.
+        header to be <literal><replaceable>timestamp</replaceable> (every
+        <replaceable>N</replaceable>s)</literal>.  Also, the timestamp format now
+        obeys <application>psql</application>'s locale environment.
        </para>
       </listitem>
 
@@ -7456,7 +7962,7 @@ this commit is also listed in the compatibility section
 2015-07-07 [275f05c99] Add psql PROMPT variable showing the pid of the connecte
 -->
        <para>
-        Add a <literal>PROMPT</> option <literal>%p</> to insert the
+        Add a <literal>PROMPT</literal> option <literal>%p</literal> to insert the
         process ID of the connected backend (Julien Rouhaud)
        </para>
       </listitem>
@@ -7467,13 +7973,13 @@ this commit is also listed in the compatibility section
 This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
-        Introduce a feature whereby the <literal>CONTEXT</> field of
+        Introduce a feature whereby the <literal>CONTEXT</literal> field of
         messages can be suppressed, either always or only for non-error
         messages (Pavel Stehule)
        </para>
 
        <para>
-        Printing <literal>CONTEXT</> only for errors is now the default
+        Printing <literal>CONTEXT</literal> only for errors is now the default
         behavior.  This can be changed by setting the special variable
         <varname>SHOW_CONTEXT</varname>.
        </para>
@@ -7484,7 +7990,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-07-11 [a670c24c3] Improve output of psql's \df+ command.
 -->
        <para>
-        Make <command>\df+</> show function access privileges and
+        Make <command>\df+</command> show function access privileges and
         parallel-safety attributes (Michael Paquier)
        </para>
       </listitem>
@@ -7503,7 +8009,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-20 [68ab8e8ba] SQL commands in pgbench scripts are now ended by semicol
 -->
        <para>
-        SQL commands in <application>pgbench</> scripts are now ended by
+        SQL commands in <application>pgbench</application> scripts are now ended by
         semicolons, not newlines (Kyotaro Horiguchi, Tom Lane)
        </para>
 
@@ -7512,7 +8018,7 @@ This commit is also listed under libpq and PL/pgSQL
         Existing custom scripts will need to be modified to add a semicolon
         at the end of each line that does not have one already.  (Doing so
         does not break the script for use with older versions
-        of <application>pgbench</>.)
+        of <application>pgbench</application>.)
        </para>
       </listitem>
 
@@ -7525,7 +8031,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Support floating-point arithmetic, as well as some <link
-        linkend="pgbench-builtin-functions">built-in functions</>, in
+        linkend="pgbench-builtin-functions">built-in functions</link>, in
         expressions in backslash commands (Fabien Coelho)
        </para>
       </listitem>
@@ -7535,18 +8041,18 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-29 [ad9566470] pgbench: Remove \setrandom.
 -->
        <para>
-        Replace <command>\setrandom</> with built-in functions (Fabien
+        Replace <command>\setrandom</command> with built-in functions (Fabien
         Coelho)
        </para>
 
        <para>
         The new built-in functions include <link
-        linkend="pgbench-functions"><function>random()</></>,
-        <function>random_exponential()</>, and
-        <function>random_gaussian()</>, which perform the same work as
-        <command>\setrandom</>, but are easier to use since they can be
+        linkend="pgbench-functions"><function>random()</function></link>,
+        <function>random_exponential()</function>, and
+        <function>random_gaussian()</function>, which perform the same work as
+        <command>\setrandom</command>, but are easier to use since they can be
         embedded in larger expressions.  Since these additions have made
-        <command>\setrandom</> obsolete, remove it.
+        <command>\setrandom</command> obsolete, remove it.
        </para>
       </listitem>
 
@@ -7561,8 +8067,8 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        This is done with the new <option>-b</> switch, which works
-        similarly to <option>-f</> for custom scripts.
+        This is done with the new <option>-b</option> switch, which works
+        similarly to <option>-f</option> for custom scripts.
        </para>
       </listitem>
 
@@ -7577,7 +8083,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        When multiple scripts are specified, each <application>pgbench</>
+        When multiple scripts are specified, each <application>pgbench</application>
         transaction randomly chooses one to execute.  Formerly this was
         always done with uniform probability, but now different selection
         probabilities can be specified for different scripts.
@@ -7604,7 +8110,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-16 [1def9063c] pgbench progress with timestamp
 -->
        <para>
-        Add a <option>--progress-timestamp</> option to report progress
+        Add a <option>--progress-timestamp</option> option to report progress
         with Unix epoch timestamps, instead of time since the run started
         (Fabien Coelho)
        </para>
@@ -7615,8 +8121,8 @@ This commit is also listed under libpq and PL/pgSQL
 2015-07-03 [ba3deeefb] Lift the limitation that # of clients must be a multiple
 -->
        <para>
-        Allow the number of client connections (<option>-c</>) to not
-        be an exact multiple of the number of threads (<option>-j</>)
+        Allow the number of client connections (<option>-c</option>) to not
+        be an exact multiple of the number of threads (<option>-j</option>)
         (Fabien Coelho)
        </para>
       </listitem>
@@ -7626,13 +8132,13 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-09 [accf7616f] pgbench: When -T is used, don't wait for transactions be
 -->
        <para>
-        When the <option>-T</> option is used, stop promptly at the end
+        When the <option>-T</option> option is used, stop promptly at the end
         of the specified time (Fabien Coelho)
        </para>
 
        <para>
         Previously, specifying a low transaction rate could cause
-        <application>pgbench</> to wait significantly longer than
+        <application>pgbench</application> to wait significantly longer than
         specified.
        </para>
       </listitem>
@@ -7653,15 +8159,15 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-17 [66d947b9d] Adjust behavior of single-user -j mode for better initdb
 -->
        <para>
-        Improve error reporting during <application>initdb</>'s
+        Improve error reporting during <application>initdb</application>'s
         post-bootstrap phase (Tom Lane)
        </para>
 
        <para>
         Previously, an error here led to reporting the entire input
-        file as the <quote>failing query</>; now just the current
+        file as the <quote>failing query</quote>; now just the current
         query is reported.  To get the desired behavior, queries in
-        <application>initdb</>'s input files must be separated by blank
+        <application>initdb</application>'s input files must be separated by blank
         lines.
        </para>
       </listitem>
@@ -7672,7 +8178,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-08-30 [d9720e437] Fix initdb misbehavior when user mis-enters superuser pa
 -->
        <para>
-        Speed up <application>initdb</> by using just one
+        Speed up <application>initdb</application> by using just one
         standalone-backend session for all the post-bootstrap steps
         (Tom Lane)
        </para>
@@ -7683,7 +8189,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-01 [e50cda784] Use pg_rewind when target timeline was switched
 -->
        <para>
-        Improve <link linkend="app-pgrewind"><application>pg_rewind</></>
+        Improve <link linkend="app-pgrewind"><application>pg_rewind</application></link>
         so that it can work when the target timeline changes (Alexander
         Korotkov)
        </para>
@@ -7709,7 +8215,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Remove obsolete
-        <function>heap_formtuple</>/<function>heap_modifytuple</>/<function>heap_deformtuple</>
+        <function>heap_formtuple</function>/<function>heap_modifytuple</function>/<function>heap_deformtuple</function>
         functions (Peter Geoghegan)
        </para>
       </listitem>
@@ -7719,16 +8225,16 @@ This commit is also listed under libpq and PL/pgSQL
 2016-08-27 [b9fe6cbc8] Add macros to make AllocSetContextCreate() calls simpler
 -->
        <para>
-        Add macros to make <function>AllocSetContextCreate()</> calls simpler
+        Add macros to make <function>AllocSetContextCreate()</function> calls simpler
         and safer (Tom Lane)
        </para>
 
        <para>
         Writing out the individual sizing parameters for a memory context
         is now deprecated in favor of using one of the new
-        macros <symbol>ALLOCSET_DEFAULT_SIZES</>,
-        <symbol>ALLOCSET_SMALL_SIZES</>,
-        or <symbol>ALLOCSET_START_SMALL_SIZES</>.
+        macros <symbol>ALLOCSET_DEFAULT_SIZES</symbol>,
+        <symbol>ALLOCSET_SMALL_SIZES</symbol>,
+        or <symbol>ALLOCSET_START_SMALL_SIZES</symbol>.
         Existing code continues to work, however.
        </para>
       </listitem>
@@ -7738,7 +8244,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-08-05 [de6fd1c89] Rely on inline functions even if that causes warnings in
 -->
        <para>
-        Unconditionally use <literal>static inline</> functions in header
+        Unconditionally use <literal>static inline</literal> functions in header
         files (Andres Freund)
        </para>
 
@@ -7759,7 +8265,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-05-06 [6bd356c33] Add TAP tests for pg_dump
 -->
        <para>
-        Improve <application>TAP</> testing infrastructure (Michael
+        Improve <application>TAP</application> testing infrastructure (Michael
         Paquier, Craig Ringer, &Aacute;lvaro Herrera, Stephen Frost)
        </para>
 
@@ -7774,7 +8280,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-11 [aa65de042] When trace_lwlocks is used, identify individual lwlocks
 -->
        <para>
-        Make <varname>trace_lwlocks</> identify individual locks by name
+        Make <varname>trace_lwlocks</varname> identify individual locks by name
         (Robert Haas)
        </para>
       </listitem>
@@ -7786,7 +8292,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-01-05 [4f18010af] Convert psql's tab completion for backslash commands to
 -->
        <para>
-        Improve <application>psql</>'s tab-completion code infrastructure
+        Improve <application>psql</application>'s tab-completion code infrastructure
         (Thomas Munro, Michael Paquier)
        </para>
 
@@ -7801,7 +8307,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-01-05 [efa318bcf] Make pg_shseclabel available in early backend startup
 -->
        <para>
-        Nail the <structname>pg_shseclabel</> system catalog into cache,
+        Nail the <structname>pg_shseclabel</structname> system catalog into cache,
         so that it is available for access during connection authentication
         (Adam Brightwell)
        </para>
@@ -7820,21 +8326,21 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Restructure <link linkend="indexam">index access
-        method <acronym>API</></> to hide most of it at
-        the <application>C</> level (Alexander Korotkov, Andrew Gierth)
+        method <acronym>API</acronym></link> to hide most of it at
+        the <application>C</application> level (Alexander Korotkov, Andrew Gierth)
        </para>
 
        <para>
-        This change modernizes the index <acronym>AM API</> to look more
+        This change modernizes the index <acronym>AM API</acronym> to look more
         like the designs we have adopted for foreign data wrappers and
-        tablesample handlers.  This simplifies the <application>C</> code
+        tablesample handlers.  This simplifies the <application>C</application> code
         and makes it much more practical to define index access methods in
         installable extensions.  A consequence is that most of the columns
-        of the <structname>pg_am</> system catalog have disappeared.
+        of the <structname>pg_am</structname> system catalog have disappeared.
         New <link linkend="functions-info-catalog-table">inspection
         functions</link> have been added to allow SQL queries to determine
         index AM properties that used to be discoverable
-        from <structname>pg_am</>.
+        from <structname>pg_am</structname>.
        </para>
       </listitem>
 
@@ -7844,14 +8350,14 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add <link
-        linkend="catalog-pg-init-privs"><structname>pg_init_privs</></>
+        linkend="catalog-pg-init-privs"><structname>pg_init_privs</structname></link>
         system catalog to hold original privileges
-        of <application>initdb</>-created and extension-created objects
+        of <application>initdb</application>-created and extension-created objects
         (Stephen Frost)
        </para>
 
        <para>
-        This infrastructure allows <application>pg_dump</> to dump changes
+        This infrastructure allows <application>pg_dump</application> to dump changes
         that an installation may have made in privileges attached to
         system objects.  Formerly, such changes would be lost in a dump
         and reload, but now they are preserved.
@@ -7863,14 +8369,14 @@ This commit is also listed under libpq and PL/pgSQL
 2016-02-04 [c1772ad92] Change the way that LWLocks for extensions are allocated
 -->
        <para>
-        Change the way that extensions allocate custom <literal>LWLocks</>
+        Change the way that extensions allocate custom <literal>LWLocks</literal>
         (Amit Kapila, Robert Haas)
        </para>
 
        <para>
-        The <function>RequestAddinLWLocks()</> function is removed,
-        and replaced by <function>RequestNamedLWLockTranche()</>.
-        This allows better identification of custom <literal>LWLocks</>,
+        The <function>RequestAddinLWLocks()</function> function is removed,
+        and replaced by <function>RequestNamedLWLockTranche()</function>.
+        This allows better identification of custom <literal>LWLocks</literal>,
         and is less error-prone.
        </para>
       </listitem>
@@ -7894,7 +8400,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        This change allows <application>FDW</>s or custom scan providers
+        This change allows <application>FDW</application>s or custom scan providers
         to store data in a plan tree in a more convenient format than
         was previously possible.
        </para>
@@ -7911,7 +8417,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Make the planner deal with post-scan/join query steps by generating
-        and comparing <literal>Paths</>, replacing a lot of ad-hoc logic
+        and comparing <literal>Paths</literal>, replacing a lot of ad-hoc logic
         (Tom Lane)
        </para>
 
@@ -7961,7 +8467,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-24 [c1156411a] Move psql's psqlscan.l into src/fe_utils.
 -->
        <para>
-        Separate out <application>psql</>'s <application>flex</> lexer to
+        Separate out <application>psql</application>'s <application>flex</application> lexer to
         make it usable by other client programs (Tom Lane, Kyotaro
         Horiguchi)
        </para>
@@ -7970,12 +8476,12 @@ This commit is also listed under libpq and PL/pgSQL
         This eliminates code duplication for programs that need to be able
         to parse SQL commands well enough to identify command boundaries.
         Doing that in full generality is more painful than one could
-        wish, and up to now only <application>psql</> has really gotten
+        wish, and up to now only <application>psql</application> has really gotten
         it right among our supported client programs.
        </para>
 
        <para>
-        A new source-code subdirectory <filename>src/fe_utils/</> has
+        A new source-code subdirectory <filename>src/fe_utils/</filename> has
         been created to hold this and other code that is shared across
         our client programs.  Formerly such sharing was accomplished by
         symbolic linking or copying source files at build time, which
@@ -7988,7 +8494,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-21 [98a64d0bd] Introduce WaitEventSet API.
 -->
        <para>
-        Introduce <literal>WaitEventSet</> <acronym>API</> to allow
+        Introduce <literal>WaitEventSet</literal> <acronym>API</acronym> to allow
         efficient waiting for event sets that usually do not change from
         one wait to the next (Andres Freund, Amit Kapila)
        </para>
@@ -7999,16 +8505,16 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-01 [65578341a] Add Generic WAL interface
 -->
        <para>
-        Add a generic interface for writing <acronym>WAL</> records
+        Add a generic interface for writing <acronym>WAL</acronym> records
         (Alexander Korotkov, Petr Jel&iacute;nek, Markus Nullmeier)
        </para>
 
        <para>
-        This change allows extensions to write <acronym>WAL</> records for
+        This change allows extensions to write <acronym>WAL</acronym> records for
         changes to pages using a standard layout.  The problem of needing to
-        replay <acronym>WAL</> without access to the extension is solved by
+        replay <acronym>WAL</acronym> without access to the extension is solved by
         having generic replay code.  This allows extensions to implement,
-        for example, index access methods and have <acronym>WAL</>
+        for example, index access methods and have <acronym>WAL</acronym>
         support for them.
        </para>
       </listitem>
@@ -8018,13 +8524,13 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-06 [3fe3511d0] Generic Messages for Logical Decoding
 -->
        <para>
-        Support generic <acronym>WAL</> messages for logical decoding
+        Support generic <acronym>WAL</acronym> messages for logical decoding
         (Petr Jel&iacute;nek, Andres Freund)
        </para>
 
        <para>
         This feature allows extensions to insert data into the
-        <acronym>WAL</> stream that can be read by logical-decoding
+        <acronym>WAL</acronym> stream that can be read by logical-decoding
         plugins, but is not connected to physical data restoration.
        </para>
       </listitem>
@@ -8036,12 +8542,12 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Allow SP-GiST operator classes to store an arbitrary
-        <quote>traversal value</> while descending the index (Alexander
+        <quote>traversal value</quote> while descending the index (Alexander
         Lebedev, Teodor Sigaev)
        </para>
 
        <para>
-        This is somewhat like the <quote>reconstructed value</>, but it
+        This is somewhat like the <quote>reconstructed value</quote>, but it
         could be any arbitrary chunk of data, not necessarily of the same
         data type as the indexed column.
        </para>
@@ -8052,12 +8558,12 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-04 [66229ac00] Introduce a LOG_SERVER_ONLY ereport level, which is neve
 -->
        <para>
-        Introduce a <literal>LOG_SERVER_ONLY</> message level for
-        <function>ereport()</> (David Steele)
+        Introduce a <literal>LOG_SERVER_ONLY</literal> message level for
+        <function>ereport()</function> (David Steele)
        </para>
 
        <para>
-        This level acts like <literal>LOG</> except that the message is
+        This level acts like <literal>LOG</literal> except that the message is
         never sent to the client.  It is meant for use in auditing and
         similar applications.
        </para>
@@ -8068,14 +8574,14 @@ This commit is also listed under libpq and PL/pgSQL
 2016-07-01 [548af97fc] Provide and use a makefile target to build all generated
 -->
        <para>
-        Provide a <filename>Makefile</> target to build all generated
+        Provide a <filename>Makefile</filename> target to build all generated
         headers (Michael Paquier, Tom Lane)
        </para>
 
        <para>
-        <literal>submake-generated-headers</> can now be invoked to ensure
+        <literal>submake-generated-headers</literal> can now be invoked to ensure
         that generated backend header files are up-to-date.  This is
-        useful in subdirectories that might be built <quote>standalone</>.
+        useful in subdirectories that might be built <quote>standalone</quote>.
        </para>
       </listitem>
 
@@ -8104,8 +8610,8 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-13 [7a8d87483] Rename auto_explain.sample_ratio to sample_rate
 -->
        <para>
-        Add configuration parameter <literal>auto_explain.sample_rate</> to
-        allow <link linkend="auto-explain"><filename>contrib/auto_explain</></>
+        Add configuration parameter <literal>auto_explain.sample_rate</literal> to
+        allow <link linkend="auto-explain"><filename>contrib/auto_explain</filename></link>
         to capture just a configurable fraction of all queries (Craig
         Ringer, Julien Rouhaud)
        </para>
@@ -8121,7 +8627,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-01 [9ee014fc8] Bloom index contrib module
 -->
        <para>
-        Add <link linkend="bloom"><filename>contrib/bloom</></> module that
+        Add <link linkend="bloom"><filename>contrib/bloom</filename></link> module that
         implements an index access method based on Bloom filtering (Teodor
         Sigaev, Alexander Korotkov)
        </para>
@@ -8139,7 +8645,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-28 [81ee726d8] Code and docs review for cube kNN support.
 -->
        <para>
-        In <link linkend="cube"><filename>contrib/cube</></>, introduce
+        In <link linkend="cube"><filename>contrib/cube</filename></link>, introduce
         distance operators for cubes, and support kNN-style searches in
         GiST indexes on cube columns (Stas Kelvich)
        </para>
@@ -8150,19 +8656,19 @@ This commit is also listed under libpq and PL/pgSQL
 2016-02-03 [41d2c081c] Make hstore_to_jsonb_loose match hstore_to_json_loose on
 -->
        <para>
-        Make <filename>contrib/hstore</>'s <link
-        linkend="hstore-func-table"><function>hstore_to_jsonb_loose()</></>
-        and <function>hstore_to_json_loose()</> functions agree on what
+        Make <filename>contrib/hstore</filename>'s <link
+        linkend="hstore-func-table"><function>hstore_to_jsonb_loose()</function></link>
+        and <function>hstore_to_json_loose()</function> functions agree on what
         is a number (Tom Lane)
        </para>
 
        <para>
-        Previously, <function>hstore_to_jsonb_loose()</> would convert
-        numeric-looking strings to <acronym>JSON</> numbers, rather than
-        strings, even if they did not exactly match the <acronym>JSON</>
+        Previously, <function>hstore_to_jsonb_loose()</function> would convert
+        numeric-looking strings to <acronym>JSON</acronym> numbers, rather than
+        strings, even if they did not exactly match the <acronym>JSON</acronym>
         syntax specification for numbers.  This was inconsistent with
-        <function>hstore_to_json_loose()</>, so tighten the test to match
-        the <acronym>JSON</> syntax.
+        <function>hstore_to_json_loose()</function>, so tighten the test to match
+        the <acronym>JSON</acronym> syntax.
        </para>
       </listitem>
 
@@ -8172,7 +8678,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add selectivity estimation functions for
-        <link linkend="intarray"><filename>contrib/intarray</></> operators
+        <link linkend="intarray"><filename>contrib/intarray</filename></link> operators
         to improve plans for queries using those operators (Yury Zhuravlev,
         Alexander Korotkov)
        </para>
@@ -8184,10 +8690,10 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Make <link
-        linkend="pageinspect"><filename>contrib/pageinspect</></>'s
-        <function>heap_page_items()</> function show the raw data in each
-        tuple, and add new functions <function>tuple_data_split()</> and
-        <function>heap_page_item_attrs()</> for inspection of individual
+        linkend="pageinspect"><filename>contrib/pageinspect</filename></link>'s
+        <function>heap_page_items()</function> function show the raw data in each
+        tuple, and add new functions <function>tuple_data_split()</function> and
+        <function>heap_page_item_attrs()</function> for inspection of individual
         tuple fields (Nikolay Shaplov)
        </para>
       </listitem>
@@ -8197,9 +8703,9 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-09 [188f359d3] pgcrypto: support changing S2K iteration count
 -->
        <para>
-        Add an optional <literal>S2K</> iteration count parameter to
-        <link linkend="pgcrypto"><filename>contrib/pgcrypto</></>'s
-        <function>pgp_sym_encrypt()</> function (Jeff Janes)
+        Add an optional <literal>S2K</literal> iteration count parameter to
+        <link linkend="pgcrypto"><filename>contrib/pgcrypto</filename></link>'s
+        <function>pgp_sym_encrypt()</function> function (Jeff Janes)
        </para>
       </listitem>
 
@@ -8208,8 +8714,8 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-16 [f576b17cd] Add word_similarity to pg_trgm contrib module.
 -->
        <para>
-        Add support for <quote>word similarity</> to
-        <link linkend="pgtrgm"><filename>contrib/pg_trgm</></>
+        Add support for <quote>word similarity</quote> to
+        <link linkend="pgtrgm"><filename>contrib/pg_trgm</filename></link>
         (Alexander Korotkov, Artur Zakirov)
        </para>
 
@@ -8226,14 +8732,14 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add configuration parameter
-        <varname>pg_trgm.similarity_threshold</> for
-        <filename>contrib/pg_trgm</>'s similarity threshold (Artur Zakirov)
+        <varname>pg_trgm.similarity_threshold</varname> for
+        <filename>contrib/pg_trgm</filename>'s similarity threshold (Artur Zakirov)
        </para>
 
        <para>
         This threshold has always been configurable, but formerly it was
-        controlled by special-purpose functions <function>set_limit()</>
-        and <function>show_limit()</>.  Those are now deprecated.
+        controlled by special-purpose functions <function>set_limit()</function>
+        and <function>show_limit()</function>.  Those are now deprecated.
        </para>
       </listitem>
 
@@ -8242,7 +8748,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-07-20 [97f301464] This supports the triconsistent function for pg_trgm GIN
 -->
        <para>
-        Improve <filename>contrib/pg_trgm</>'s GIN operator class to
+        Improve <filename>contrib/pg_trgm</filename>'s GIN operator class to
         speed up index searches in which both common and rare keys appear
         (Jeff Janes)
        </para>
@@ -8254,7 +8760,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Improve performance of similarity searches in
-        <filename>contrib/pg_trgm</> GIN indexes (Christophe Fornaroli)
+        <filename>contrib/pg_trgm</filename> GIN indexes (Christophe Fornaroli)
        </para>
       </listitem>
 
@@ -8265,7 +8771,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add <link
-        linkend="pgvisibility"><filename>contrib/pg_visibility</></> module
+        linkend="pgvisibility"><filename>contrib/pg_visibility</filename></link> module
         to allow examining table visibility maps (Robert Haas)
        </para>
       </listitem>
@@ -8275,9 +8781,9 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-07 [49124613f] contrib/sslinfo: add ssl_extension_info SRF
 -->
        <para>
-        Add <link linkend="sslinfo"><function>ssl_extension_info()</></>
-        function to <filename>contrib/sslinfo</>, to print information
-        about <acronym>SSL</> extensions present in the <literal>X509</>
+        Add <link linkend="sslinfo"><function>ssl_extension_info()</function></link>
+        function to <filename>contrib/sslinfo</filename>, to print information
+        about <acronym>SSL</acronym> extensions present in the <literal>X509</literal>
         certificate used for the current connection (Dmitry Voronin)
        </para>
       </listitem>
@@ -8285,7 +8791,7 @@ This commit is also listed under libpq and PL/pgSQL
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="postgres-fdw"><filename>postgres_fdw</></></title>
+     <title><link linkend="postgres-fdw"><filename>postgres_fdw</filename></link></title>
 
      <itemizedlist>
 
@@ -8332,12 +8838,12 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-18 [0bf3ae88a] Directly modify foreign tables.
 -->
        <para>
-        When feasible, perform <command>UPDATE</> or <command>DELETE</>
+        When feasible, perform <command>UPDATE</command> or <command>DELETE</command>
         entirely on the remote server (Etsuro Fujita)
        </para>
 
        <para>
-        Formerly, remote updates involved sending a <command>SELECT FOR UPDATE</>
+        Formerly, remote updates involved sending a <command>SELECT FOR UPDATE</command>
         command and then updating or deleting the selected rows one-by-one.
         While that is still necessary if the operation requires any local
         processing, it can now be done remotely if all elements of the
@@ -8355,7 +8861,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        Formerly, <filename>postgres_fdw</> always fetched 100 rows at
+        Formerly, <filename>postgres_fdw</filename> always fetched 100 rows at
         a time from remote queries; now that behavior is configurable.
        </para>
       </listitem>