diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 0f17151bae0..9de3c875fd9 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,15 +1,16 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.612 2009/03/28 22:05:22 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.613 2009/03/29 03:01:56 momjian Exp $ -->
 <!--
 
 Typical markup:
 
 &<>                             use & escapes
+PostgreSQL                      <productname>
+postgresql.conf, pg_hba.conf	<filename>
 [A-Z][A-Z ]+[A-Z]               <command>
 [A-Za-z_][A-Za-z0-9_]+()        <function>
 [A-Za-z_]/[A-Za-z_]+            <filename>
-PostgreSQL                      <productname>
 pg_[A-Za-z0-9_]                 <application>
-[A-Z][A-Z]                      <type>, <envar>, <literal>
+[A-Z][A-Z][A-Z_ ]*              <type>, <envar>, <literal>
 
 non-ASCII characters            convert to HTML4 entity (&) escapes
 
@@ -75,10 +76,11 @@ do it for earlier branch release files.
    <title>Overview</title>
 
    <para>
-    This major PostgreSQL release brings SQL features people have been
-    waiting for for years, as well as performance enhancements
-    and changes to make space reuse more efficient and
-    more automatic.  This release adds the following major features:
+    This major <productname>PostgreSQL</> release brings <acronym>SQL</>
+    features people have been waiting for for years, as well as
+    performance enhancements and changes to make space reuse more
+    efficient and more automatic.  This release adds the following
+    major features:
    </para>
 
    <itemizedlist>
@@ -129,16 +131,18 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Change postgresql.conf default for log_min_messages to 'warning'
-       (previously 'notice') to reduce log file volume (Tom)
+       Change <filename>postgresql.conf</> default for log_min_messages
+       to <literal>warning</> (previously <literal>notice</>) to reduce
+       log file volume (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Have debug_print_parse, debug_print_rewritten, and debug_print_plan
-       output appear as LOG message level, not DEBUG1 (Tom) bjm: inconsistency
-       because of var names?
+       output appear as <literal>LOG</> message level, not
+       <literal>DEBUG1</> (Tom) bjm: inconsistency because of var
+       names?
       </para>
      </listitem>
 
@@ -150,40 +154,41 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Make "log_temp_files" super-user set only, like other logging options
-       (Simon)
+       Make <varname>log_temp_files</> super-user set only, like other
+       logging options (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Disable appending of the epoch date/time when no '%' escapes are
-       present in log_filename (Robert Haas)
+       Disable appending of the epoch date/time when no <literal>%</>
+       escapes are present in log_filename (Robert Haas)
       </para>
 
       <para>
-       This change was made because some users wanted a constant log filename,
-       for use with an external log rotation tool.
+       This change was made because some users wanted a constant log
+       filename, for use with an external log rotation tool.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove explain_pretty_print postgresql.conf setting (no longer needed)
-       (Tom)
+       Remove explain_pretty_print <filename>postgresql.conf</> setting
+       (no longer needed) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove log_restartpoints from recovery.conf;  instead use
-       log_checkpoints (Simon Riggs)
+       Remove log_restartpoints from <filename>recovery.conf</>;
+       instead use log_checkpoints (Simon Riggs)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove support for the (insecure) crypt authentication method (Magnus)
+       Remove support for the (insecure) crypt authentication method
+       (Magnus)
       </para>
 
       <para>
@@ -193,8 +198,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Remove krb_realm and krb_server_hostname, now pg_hba.conf-only settings
-       (Magnus)
+       Remove krb_realm and krb_server_hostname, now
+       <filename>pg_hba.conf</>-only settings (Magnus)
       </para>
      </listitem>
 
@@ -204,14 +209,15 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       The utility only worked on a few platforms;  users should use their
-       operating system tools instead.
+       The utility only worked on a few platforms;  users should use
+       their operating system tools instead.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       pg_hba.conf also has extensive changes related to migration. bjm: add markup
+       <filename>pg_hba.conf</> also has extensive changes related to
+       migration. bjm: add markup
       </para>
      </listitem>
 
@@ -226,38 +232,42 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Have children inherit CHECK constraints from parents (Alex Hunsaker,
-       Nikhil Sontakke, Tom Lane)
+       Have children inherit <literal>CHECK</> constraints from parents
+       (Alex Hunsaker, Nikhil Sontakke, Tom Lane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Force child tables to have the same CHECK constraints as parents (Alex
-       Hunsaker, Nikhil Sontakke, Tom Lane) bjm: verify
+       Force child tables to have the same <literal>CHECK</> constraints
+       as parents (Alex Hunsaker, Nikhil Sontakke, Tom Lane) bjm:
+       verify
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change TRUNCATE and LOCK behavior to apply to all child tables (Peter)
+       Change <command>TRUNCATE</> and <command>LOCK</> behavior to
+       apply to all child tables (Peter)
       </para>
 
       <para>
-       There is a new ONLY clause which disables this behavior.
+       There is a new <literal>ONLY</> clause which disables this
+       behavior.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Disallow negative LIMIT or OFFSET values, rather than treating them as
-       zero (Simon)
+       Disallow negative <literal>LIMIT</> or <literal>OFFSET</>
+       values, rather than treating them as zero (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Disallow LOCK TABLE outside a transaction block (Tom)
+       Disallow <command>LOCK TABLE</> outside a transaction block
+       (Tom)
       </para>
 
       <para>
@@ -268,7 +278,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Make DISCARD ALL also discard advisory locks (Marko Kreen)
+       Make <command>DISCARD ALL</> also discard advisory locks (Marko
+       Kreen)
       </para>
      </listitem>
 
@@ -284,8 +295,9 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Have NUMERIC 0 ^ 4.3 return 1, rather than an error, and have 0 ^ 0.0
-       return 1, rather than error (Bruce)
+       Have <literal>NUMERIC 0 ^ 4.3</> return <literal>1</>, rather
+       than an error, and have <literal>0 ^ 0.0</> return <literal>1</>,
+       rather than error (Bruce)
       </para>
 
       <para>
@@ -295,58 +307,66 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Remove code that prevented unary minus of floating-point values from
-       producing '-0' (Tom)
+       Remove code that prevented unary minus of floating-point values
+       from producing <literal>-0</> (Tom)
       </para>
 
       <para>
-        The changed behavior is more IEEE-standards compliant.
+        The changed behavior is more <acronym>IEEE</>-standards
+        compliant.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Throw an error if an escape character is the last character in a LIKE
-       pattern (it has nothing to escape) (Tom)
+       Throw an error if an escape character is the last character in
+       a <literal>LIKE</> pattern (it has nothing to escape) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have to_char()'s localized month/day names depend on LC_TIME, not
-       LC_MESSAGES (Euler Taveira de Oliveira)
+       Have <function>to_char()</>'s localized month/day names depend
+       on <varname>LC_TIME</>, not <varname>LC_MESSAGES</> (Euler
+       Taveira de Oliveira)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Cause to_date() and to_timestamp() to more consistently report errors on
-       invalid input (Brendan Jurd)
+       Cause <function>to_date()</> and <function>to_timestamp()</>
+       to more consistently report errors on invalid input (Brendan
+       Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Provide consistent rounding for fractional seconds (Ron Mayer) bjm:
-       combine with another item?
+       Provide consistent rounding for fractional seconds (Ron Mayer)
+       bjm:  combine with another item?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix to_timestamp() to not require upper/lower case matching for meridian
-       (AM/PM) and era (BC/AD) format designations  (Brendan Jurd)
+       Fix <function>to_timestamp()</> to not require upper/lower case
+       matching for meridian (<literal>AM</>/<literal>PM</>) and era
+       (<literal>BC</>/<literal>AD</>) format designations  (Brendan
+       Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require the existence of periods in to_timestamp() meridian
-       (AM/PM) and era (BC/AD) format designations to match (Brendan Jurd)
+       Require the existence of periods in <function>to_timestamp()</>
+       meridian (<literal>AM</>/<literal>PM</>) and era
+       (<literal>BC</>/<literal>AD</>) format designations to match
+       (Brendan Jurd)
       </para>
 
       <para>
-       For example, input value 'AD' does not match format string 'A.D.'.
+       For example, input value <literal>AD</> does not match format
+       string <literal>A.D.</>.
       </para>
      </listitem>
 
@@ -359,15 +379,15 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Remove ~=~ and ~&lt;&gt;~ operators used for LIKE index comparisons
-       (Tom) bjm: needed?
+       Remove ~=~ and ~&lt;&gt;~ operators used for <literal>LIKE</>
+       index comparisons (Tom) bjm: needed?
       </para>
 
       <para>
-       A not-immediately-obvious incompatibility is that the sort order within
-       bpchar_pattern_ops indexes changes --- it had been identical to plain
-       strcmp, but is now trailing-blank-insensitive.  This will impact
-       in-place upgrades, if those ever happen.
+       A not-immediately-obvious incompatibility is that the sort
+       order within bpchar_pattern_ops indexes changes --- it had been
+       identical to plain strcmp, but is now trailing-blank-insensitive.
+       This will impact in-place upgrades, if those ever happen.
       </para>
      </listitem>
 
@@ -381,9 +401,9 @@ do it for earlier branch release files.
    <title>Changes</title>
 
    <para>
-    Below you will find a detailed account of the
-    changes between <productname>PostgreSQL</productname> 8.4 and
-    the previous major release.
+    Below you will find a detailed account of the changes between
+    <productname>PostgreSQL</productname> 8.4 and the previous major
+    release.
    </para>
 
    <sect3>
@@ -392,8 +412,7 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Improve optimizer statistics calculations (Tom, Jan
-       Urbanski)
+       Improve optimizer statistics calculations (Tom, Jan Urbanski)
       </para>
 
       <para>
@@ -403,13 +422,16 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow SELECT DISTINCT and UNION/INTERSECT/EXCEPT to use hashing (Tom)
+       Allow <command>SELECT DISTINCT</> and
+       <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> to
+       use hashing (Tom)
       </para>
 
       <para>
-       This causes SELECT DISTINCT no longer always produces sorted output;
-       add an ORDER BY clause. The old SELECT DISTINCT behavior can be
-       restored by disabling enable_hashagg. SELECT DISTINCT ON does not use
+       This causes <command>SELECT DISTINCT</> no longer always produces
+       sorted output; add an <literal>ORDER BY</> clause. The old
+       <literal>SELECT DISTINCT</> behavior can be restored by disabling
+       enable_hashagg. <literal>SELECT DISTINCT ON</> does not use
        hashing. bjm: enable_hashagg accurate?
       </para>
      </listitem>
@@ -420,26 +442,29 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       While semi-joins merely replace existing IN joins, anti-joins
-       are a new capability for NOT EXISTS clauses (Tom) This improves
-       optimization possibilities.
+       While semi-joins merely replace existing <literal>IN</> joins,
+       anti-joins are a new capability for <literal>NOT EXISTS</>
+       clauses (Tom) This improves optimization possibilities.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve IN/ANY/EXISTS processing (Tom)
+       Improve <literal>IN</>/<literal>ANY</>/<literal>EXISTS</>
+       processing (Tom)
       </para>
 
       <para>
-       IN and EXISTS now provide similar performance for equivalent clauses.
+       <literal>IN</> and <literal>EXISTS</> now provide similar
+       performance for equivalent clauses.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve the performance of text_position() and related functions by
-       using Boyer-Moore-Horspool searching (David Rowley)
+       Improve the performance of <function>text_position()</> and
+       related functions by using Boyer-Moore-Horspool searching (David
+       Rowley)
       </para>
 
       <para>
@@ -455,8 +480,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Reduce I/O frequency of writing the  backend statistics file by writing
-       the file only when requested (Martin Pihlak)
+       Reduce I/O frequency of writing the  backend statistics file
+       by writing the file only when requested (Martin Pihlak)
       </para>
      </listitem>
 
@@ -468,8 +493,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Increase the default value of default_statistics_target from 10 to 100
-       (Greg Sabino Mullane, Tom)
+       Increase the default value of default_statistics_target from
+       10 to 100 (Greg Sabino Mullane, Tom)
       </para>
 
       <para>
@@ -479,13 +504,14 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Modify 'constraint_exclusion' to check for partitioned tables by default
-       when inheritance or UNION ALL is used (Tom)
+       Modify 'constraint_exclusion' to check for partitioned tables
+       by default when inheritance or <literal>UNION ALL</> is used
+       (Tom)
       </para>
 
       <para>
-       A new constraint_exclusion setting, "partition", was added to match this
-       behavior.
+       A new constraint_exclusion setting, <literal>partition</>, was
+       added to match this behavior.
       </para>
      </listitem>
 
@@ -496,13 +522,15 @@ do it for earlier branch release files.
 
       <para>
        The amount of read-ahead is controlled by effective_io_concurrency.
-       This requires posix_fadvise() support in the kernel.
+       This requires <function>posix_fadvise()</> support in the
+       kernel.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Inline simple set-returning SQL functions in FROM clauses (Richard Rowell)
+       Inline simple set-returning <acronym>SQL</> functions in
+       <literal>FROM</> clauses (Richard Rowell)
       </para>
      </listitem>
 
@@ -511,27 +539,27 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>TOAST</title>
+    <title><acronym>TOAST</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Consider TOAST compression on values as short as 32 bytes (previously
-       256 bytes) (Tom)
+       Consider <acronym>TOAST</> compression on values as short as
+       32 bytes (previously 256 bytes) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require 25% of space savings before using TOAST compression (previously
-       20%) (Tom)
+       Require 25% of space savings before using <acronym>TOAST</>
+       compression (previously 20%) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Be more aggressive in storing EXTERNAL and EXTENDED column values in
-       TOAST (Tom)
+       Be more aggressive in storing <literal>EXTERNAL</> and
+       <literal>EXTENDED</> column values in <acronym>TOAST</>(Tom)
       </para>
      </listitem>
 
@@ -545,22 +573,24 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Convert many postgresql.conf settings to enumerated values so
-       pg_settings can easily display valid values (Magnus)
+       Convert many <filename>postgresql.conf</> settings to enumerated
+       values so <literal>pg_settings</> can easily display valid
+       values (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add postgresql.conf setting cursor_tuple_fraction to control the
-       fraction of a cursor's rows expected to be requested by the user (Robert
-       Hell)
+       Add <filename>postgresql.conf</> setting cursor_tuple_fraction
+       to control the fraction of a cursor's rows expected to be
+       requested by the user (Robert Hell)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow underscores in postgresql.conf custom variable classes (Tom)
+       Allow underscores in <filename>postgresql.conf</> custom variable
+       classes (Tom)
       </para>
      </listitem>
 
@@ -574,34 +604,38 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add pg_conf_load_time() function to report when the Postgres configuration
-       files were last loaded (George Gensure)
+       Add <function>pg_conf_load_time()</> function to report when
+       the Postgres configuration files were last loaded (George
+       Gensure)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_terminate_backend() to safely terminate a backend (the SIGTERM
-       signal also works) (Tom, Bruce)
+       Add <function>pg_terminate_backend()</> to safely terminate a
+       backend (the <literal>SIGTERM</> signal also works) (Tom, Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add ability to track user-defined functions call counts and runtimes via
-       postgresql.conf variable 'track_functions' (Martin Pihlak)
+       Add ability to track user-defined functions call counts and
+       runtimes via <filename>postgresql.conf</> variable 'track_functions'
+       (Martin Pihlak)
       </para>
 
       <para>
-       Function statistics appear in a new system table, pg_stat_user_functions.
-       However, inlined SQL functions are not tracked.
+       Function statistics appear in a new system table,
+       <literal>pg_stat_user_functions</>.  However, inlined
+       <acronym>SQL</> functions are not tracked.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow specification of the maximum pg_stat_activity query string size
-       via postgresql.conf variable track_activity_query_size (Thomas Lee)
+       Allow specification of the maximum <literal>pg_stat_activity</>
+       query string size via <filename>postgresql.conf</> variable
+       track_activity_query_size (Thomas Lee)
       </para>
      </listitem>
 
@@ -614,36 +648,38 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add read-only postgresql.conf variables segment_size, wal_block_size,
-       and wal_segment_size (Bernd Helmle)
+       Add read-only <filename>postgresql.conf</> variables segment_size,
+       wal_block_size, and wal_segment_size (Bernd Helmle)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       When reporting a deadlock, report all session queries involved in the
-       deadlock to the server log  (Itagaki Takahiro)
+       When reporting a deadlock, report all session queries involved
+       in the deadlock to the server log  (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New pg_stat_get_activity(pid) function to return information about a
-       specific process id (Magnus)
+       New <function>pg_stat_get_activity(pid)</> function to return
+       information about a specific process id (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move the server statistics file into the subdirectory pg_stat_tmp
-       and allow its location to be specified via stats_temp_directory (Magnus)
+       Move the server statistics file into the subdirectory
+       <filename>pg_stat_tmp</> and allow its location to be specified
+       via stats_temp_directory (Magnus)
       </para>
 
       <para>
-       This allows the statistics file to be placed in a RAM-resident
-       directory to reduce I/O requirements.  On startup/shutdown, the
-       file is copied to the top-level $PGDATA directory so it is preserved
-       between restarts.
+       This allows the statistics file to be placed in a
+       <acronym>RAM</>-resident directory to reduce I/O requirements.
+       On startup/shutdown, the file is copied to the top-level
+       <literal>$PGDATA</> directory so it is preserved between
+       restarts.
       </para>
      </listitem>
 
@@ -652,39 +688,40 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>pg_hba.conf</title>
+    <title><filename>pg_hba.conf</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Parse pg_hba.conf in the postmaster so errors are reported on reload
-       (Magnus)
+       Parse <filename>pg_hba.conf</> in the postmaster so errors are
+       reported on reload (Magnus)
       </para>
       
       <para>
-       Previously errors in the file wouldn't be detected until clients tried
-       to connect, which could leave the system with a broken file loaded.
+       Previously errors in the file wouldn't be detected until clients
+       tried to connect, which could leave the system with a broken
+       file loaded.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove "sameuser" option from pg_hba.conf, making it the default if
-       no usermap is specified (Magnus)
+       Remove <literal>sameuser</> option from <filename>pg_hba.conf</>,
+       making it the default if no usermap is specified (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change all pg_hba.conf authentication options to be 'name=value'
-       settings (Magnus)
+       Change all <filename>pg_hba.conf</> authentication options to
+       be <literal>name=value</> settings (Magnus)
       </para>
      </listitem>
      
      <listitem>
       <para>
-       Allow usermap parameter in pg_hba.conf for all external authentication
-       methods (Magnus)
+       Allow usermap parameter in <filename>pg_hba.conf</> for all
+       external authentication methods (Magnus)
       </para>
       
       <para>
@@ -694,49 +731,53 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow 'ident' authentication over Unix-domain sockets on Solaris (Garick
-       Hamlin)
+       Allow <literal>ident</> authentication over Unix-domain sockets
+       on Solaris (Garick Hamlin)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_hba.conf option "clientcert" to control requesting of a client
-       certificate (Magnus)
+       Add <filename>pg_hba.conf</> option <literal>clientcert</> to
+       control requesting of a client certificate (Magnus)
       </para>
 
       <para>
-       Previously this was controlled by the presence of a root certificate
-       file in the server's data directory.
+       Previously this was controlled by the presence of a root
+       certificate file in the server's data directory.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_hba.conf "cert" authentication method to allow user
-       authentication via SSL certificates (Magnus)
+       Add <filename>pg_hba.conf</> <literal>cert</> authentication
+       method to allow user authentication via <acronym>SSL</>
+       certificates (Magnus)
       </para>
 
       <para>
-       Previously SSL certificates could only verify that the client had access
-       to a certificate, not authenticate a user.
+       Previously <acronym>SSL</> certificates could only verify that
+       the client had access to a certificate, not authenticate a
+       user.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow krb5, gssapi and sspi realm and krb5 host settings to be specified
-       in pg_hba.conf (Magnus)
+       Allow <literal>krb5</>, <literal>gssapi</> and <literal>sspi</>
+       realm and <literal>krb5</> host settings to be specified in
+       <filename>pg_hba.conf</> (Magnus)
       </para>
 
       <para>
-       These override the settings in postgresql.conf.
+       These override the settings in <filename>postgresql.conf</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Addkrb5, gssapi and sspi 'include_realm' parameter to pg_hba.conf
+       Add <literal>krb5</>, <literal>gssapi</>, and <literal>sspi</>
+       <varname>include_realm</> parameter to <filename>pg_hba.conf</>
        (Magnus)
       </para>
 
@@ -748,8 +789,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Show all parsing errors in pg_hba.conf instead of aborting after the
-       first one (Selena Deckelmann)
+       Show all parsing errors in <filename>pg_hba.conf</> instead of
+       aborting after the first one (Selena Deckelmann)
       </para>
      </listitem>
 
@@ -763,21 +804,22 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Report appropriate error message for combination of MD5 authentication
-       and db_user_namespace enabled (Bruce)
+       Report appropriate error message for combination of <literal>MD5</>
+       authentication and db_user_namespace enabled (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support regular expressions in pg_ident.conf (Magnus)
+       Support regular expressions in <filename>pg_ident.conf</>
+       (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow Kerberos/GSSAPI parameters to be changed without restarting the
-       postmaster (Magnus)
+       Allow Kerberos/<acronym>GSSAPI</> parameters to be changed
+       without restarting the postmaster (Magnus)
       </para>
      </listitem>
 
@@ -791,33 +833,35 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Have pg_stop_backup() wait for modified WAL files to be archived (Simon)
+       Have <function>pg_stop_backup()</> wait for modified <acronym>WAL</>
+       files to be archived (Simon)
       </para>
 
       <para>
-       This guarantees that the backup is valid at the time pg_stop_backup()
-       completes.
+       This guarantees that the backup is valid at the time
+       <function>pg_stop_backup()</> completes.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Prevent normal shutdown if a continuous archiving base backup is in
-       progress (Laurenz Albe)
+       Prevent normal shutdown if a continuous archiving base backup
+       is in progress (Laurenz Albe)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Cancel a continuous archiving base backup if a fast shutdown is requested
-       (Laurenz Albe)
+       Cancel a continuous archiving base backup if a fast shutdown
+       is requested (Laurenz Albe)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow recovery.conf boolean variables to take the same range of string
-       values as postgresql.conf (Bruce)
+       Allow <filename>recovery.conf</> boolean variables to take the
+       same range of string values as <filename>postgresql.conf</>
+       (Bruce)
       </para>
      </listitem>
 
@@ -831,72 +875,77 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add support for WINDOW functions (Hitoshi Harada)
+       Add support for <literal>WINDOW</> functions (Hitoshi Harada)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add WITH clauses support, including WITH RECURSIVE (Yoshiyuki Asaba,
-       Tatsuo Ishii, Tom)
+       Add <literal>WITH</> clauses support, including <literal>WITH
+       RECURSIVE</> (Yoshiyuki Asaba, Tatsuo Ishii, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New TABLE command (Peter)
+       New <command>TABLE</> command (Peter)
       </para>
 
       <para>
-       "TABLE tablename" is a short-hand for "SELECT * FROM tablename".
+       <command>TABLE tablename</> is a short-hand for <command>SELECT
+       * FROM tablename</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow AS to be optional when specifying a SELECT (or RETURNING) column
-       output label (assuming the label is not an SQL keyword) (Hiroshi Saito)
+       Allow <literal>AS</> to be optional when specifying a
+       <command>SELECT</> (or <literal>RETURNING</>) column output
+       label (assuming the label is not an <acronym>SQL</> keyword)
+       (Hiroshi Saito)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support set-returning functions in the target lists of Agg and Group plan
-       nodes.  This is a pretty ugly feature but since we don't yet have a
-       plausible substitute, we'd better support it everywhere (Tom) bjm:
-       details?
+       Support set-returning functions in the target lists of Agg and
+       Group plan nodes.  This is a pretty ugly feature but since we
+       don't yet have a plausible substitute, we'd better support it
+       everywhere (Tom) bjm:  details?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow SELECT FOR UPDATE/SHARE to work on inheritance trees (Tom)
+       Allow <command>SELECT FOR UPDATE</>/<literal>SHARE</> to work
+       on inheritance trees (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add infrastructure for SQL/MED (Martin Pihlak, Peter)
+       Add infrastructure for <acronym>SQL/MED</> (Martin Pihlak,
+       Peter)
       </para>
 
       <para>
-       There are no remote or external SQL/MED capabilities yet. bjm:
-       accurate?
+       There are no remote or external <acronym>SQL/MED</> capabilities
+       yet. bjm:  accurate?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Invalidate cached plans when schemas, operators, or operator classes are
-       modified (Tom) bjm: effect?
+       Invalidate cached plans when schemas, operators, or operator
+       classes are modified (Tom) bjm: effect?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve the plan cache invalidation mechanism to make it invalidate plans
-       when user-defined functions used in a plan are modified (Tom, Martin
-       Pihlak) bjm: explain
+       Improve the plan cache invalidation mechanism to make it
+       invalidate plans when user-defined functions used in a plan
+       are modified (Tom, Martin Pihlak) bjm: explain
       </para>
      </listitem>
 
@@ -907,23 +956,24 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       Specifically this allows 'array[ row(1,2), row(3,4)]' and 'row(1,1.1)
-       = any (array[ row(7,7.7), row(1,1.0)'.  This is particularly useful
-       for recursive queries.
+       Specifically this allows <literal>array[ row(1,2), row(3,4)]</>
+       and <literal>row(1,1.1) = any (array[ row(7,7.7), row(1,1.0)</>.
+       This is particularly useful for recursive queries.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for Unicode string and identifier specifications using code
-       points, e.g. U&'d\0061t\+000061' (Peter)
+       Add support for Unicode string and identifier specifications
+       using code points, e.g. <literal>U&amp;'d\0061t\+000061'</>
+       (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve the parser's ability to report the error location of a query
-       (Tom)
+       Improve the parser's ability to report the error location of
+       a query (Tom)
       </para>
      </listitem>
 
@@ -932,30 +982,32 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>LIMIT/OFFSET</title>
+    <title><literal>LIMIT</>/<literal>OFFSET</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow LIMIT and OFFSET to use subselects as arguments (Tom)
+       Allow <literal>LIMIT</> and <literal>OFFSET</> to use subselects
+       as arguments (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Document that LIMIT NULL and OFFSET NULL have no effect (Tom)
+       Document that <literal>LIMIT NULL</> and <literal>OFFSET NULL</>
+       have no effect (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add SQL-standards syntax for LIMIT/OFFSET capabilities (Peter)
+       Add <acronym>SQL</>-standards syntax for
+       <literal>LIMIT</>/<literal>OFFSET</> capabilities (Peter)
       </para>
-     </listitem>
 
-     <listitem>
       <para>
-       OFFSET num {ROW|ROWS} FETCH {FIRST|NEXT} [num] {ROW|ROWS} ONLY.
+       <literal>OFFSET num {ROW|ROWS} FETCH {FIRST|NEXT} [num] {ROW|ROWS}
+       ONLY</>.
       </para>
      </listitem>
 
@@ -964,89 +1016,91 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>ALTER TABLE</title>
+    <title><command>ALTER TABLE</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Add ALTER TYPE RENAME (Petr Jelinek)
+       Add <command>ALTER TYPE RENAME</> (Petr Jelinek)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add ALTER SEQUENCE ... RESTART (no parameter) to reset a sequence to its
-       initial value (Zoltan Boszormenyi)  bjm: compatibility problem?
+       Add <command>ALTER SEQUENCE ... RESTART</> (no parameter) to
+       reset a sequence to its initial value (Zoltan Boszormenyi)
+       bjm: compatibility problem?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Modify the ALTER TABLE syntax to allow all reasonable combinations for
-       tables, indexes, sequences, and views (Tom)
+       Modify the <command>ALTER TABLE</> syntax to allow all reasonable
+       combinations for tables, indexes, sequences, and views (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New syntax supported (these formerly required "ALTER TABLE")
+       New syntax supported (these formerly required <command>ALTER
+       TABLE</>)
       </para>
-     </listitem>
 
-     <listitem>
       <para>
        <itemizedlist>
         <listitem>
          <para>
-          ALTER SEQUENCE OWNER TO
+          <command>ALTER SEQUENCE OWNER TO</>
          </para>
         </listitem>
         <listitem>
          <para>
-          ALTER VIEW ALTER COLUMN SET/DROP DEFAULT
+          <command>ALTER VIEW ALTER COLUMN SET/DROP DEFAULT</>
          </para>
         </listitem>
         <listitem>
          <para>
-          ALTER VIEW OWNER TO
+          <command>ALTER VIEW OWNER TO</>
          </para>
         </listitem>
         <listitem>
          <para>
-          ALTER VIEW SET SCHEMA
+          <command>ALTER VIEW SET SCHEMA</>
          </para>
         </listitem>
        </itemizedlist>
       </para>
+
      </listitem>
 
      <listitem>
       <para>
-       Add support for the syntax ALTER TABLE ... ALTER COLUMN ... SET DATA
-       TYPE (Peter)
+       Add support for the syntax <command>ALTER TABLE ... ALTER COLUMN
+       ... SET DATA TYPE</> (Peter)
       </para>
 
       <para>
-       This is SQL-standard syntax for functionality that was already
-       supported.
+       This is <acronym>SQL</>-standard syntax for functionality that
+       was already supported.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have ALTER TABLE SET WITHOUT OIDS rewrite the table to remove oid values
-       (Tom)
+       Have <command>ALTER TABLE SET WITHOUT OIDS</> rewrite the table
+       to remove oid values (Tom)
       </para>
 
       <para>
-       Also, add ALTER TABLE SET WITH OIDS to rewrite the table to add oids.
+       Also, add <command>ALTER TABLE SET WITH OIDS</> to rewrite the
+       table to add oids.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add ALTER DATABASE SET TABLESPACE to move a database to a new tablespace
-       (Guillaume Lelarge, Bernd Helmle)
+       Add <command>ALTER DATABASE SET TABLESPACE</> to move a database
+       to a new tablespace (Guillaume Lelarge, Bernd Helmle)
       </para>
      </listitem>
 
@@ -1055,36 +1109,37 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>TRUNCATE</title>
+    <title><command>TRUNCATE</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Support statement-level ON TRUNCATE triggers (Simon)
+       Support statement-level <literal>ON TRUNCATE</> triggers (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add TRUNCATE TABLE ... RESTART/CONTINUE IDENTITY clauses (Zoltan
-       Boszormenyi)
+       Add <command>TRUNCATE TABLE</> ...
+       <literal>RESTART</>/<literal>CONTINUE IDENTITY</> clauses
+       (Zoltan Boszormenyi)
       </para>
 
       <para>
-       The start value of a sequence can be changed by ALTER SEQUENCE START
-       WITH.
+       The start value of a sequence can be changed by <command>ALTER
+       SEQUENCE START WITH</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow TRUNCATE foo, foo to succeed (Bruce)
+       Allow <command>TRUNCATE tab1, tab1</> to succeed (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a separate TRUNCATE permission (Robert Haas)
+       Add a separate <command>TRUNCATE</> permission (Robert Haas)
       </para>
      </listitem>
 
@@ -1098,26 +1153,30 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Improve reporting of CREATE/DROP/RENAME DATABASE failure when
-       uncommitted prepared transactions are the cause (Tom)
+       Improve reporting of
+       <command>CREATE</>/<command>DROP</>/<command>RENAME DATABASE</>
+       failure when uncommitted prepared transactions are the cause
+       (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make LC_COLLATE and LC_CTYPE database-level settings (Radek Strnad, Heikki)
+       Make <varname>LC_COLLATE</> and <varname>LC_CTYPE</> database-level
+       settings (Radek Strnad, Heikki)
       </para>
 
       <para>
-       This makes collation similar to encoding, which was always configurable
-       per database.
+       This makes collation similar to encoding, which was always
+       configurable per database.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve checks that the database encoding, collation (LC_COLLATE), and
-       character classes (LC_CTYPE) match (Heikki)
+       Improve checks that the database encoding, collation
+       (<varname>LC_COLLATE</>), and character classes
+       (<varname>LC_CTYPE</>) match (Heikki)
       </para>
      </listitem>
 
@@ -1131,26 +1190,29 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add support for column-level privileges (Stephen Frost, KaiGai Kohei)
+       Add support for column-level privileges (Stephen Frost, KaiGai
+       Kohei)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve reporting of dependencies during DROP commands (Alex Hunsaker)
+       Improve reporting of dependencies during <command>DROP</>
+       commands (Alex Hunsaker)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Refactor multi-object DROP operations so conflicting dependencies don't
-       generate an error (Alex Hunsaker)
+       Refactor multi-object <command>DROP</> operations so conflicting
+       dependencies don't generate an error (Alex Hunsaker)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add WITH [NO] DATA clause to CREATE TABLE AS, per the SQL standard (Tom, Peter)
+       Add <literal>WITH [NO] DATA</> clause to <command>CREATE TABLE
+       AS</>, per the <acronym>SQL</> standard (Tom, Peter)
       </para>
      </listitem>
 
@@ -1162,14 +1224,14 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow CREATE AGGREGATE to user an "internal" transition datatype (for
-       super-users only)  (Tom)
+       Allow <command>CREATE AGGREGATE</> to use an <type>internal</>
+       transition datatype (for super-users only)  (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add LIKE clause to CREATE TYPE (Tom)
+       Add <literal>LIKE</> clause to <command>CREATE TYPE</> (Tom)
       </para>
 
       <para>
@@ -1179,8 +1241,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow CREATE OR REPLACE VIEW to add columns to the <emphasis>end</>
-       of the view (Robert Haas)
+       Allow <command>CREATE OR REPLACE VIEW</> to add columns to the
+       <emphasis>end</> of the view (Robert Haas)
       </para>
      </listitem>
 
@@ -1189,29 +1251,31 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>EXPLAIN</title>
+    <title><command>EXPLAIN</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Have EXPLAIN VERBOSE show the output columns of a query (Tom)
+       Have <command>EXPLAIN VERBOSE</> show the output columns of a
+       query (Tom)
       </para>
 
       <para>
-       Previously EXPLAIN VERBOSE had output an internal representation of the
-       query plan.  (That behavior is now available via debug_print_plan.)
+       Previously <command>EXPLAIN VERBOSE</> had output an internal
+       representation of the query plan.  (That behavior is now
+       available via debug_print_plan.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have EXPLAIN honor debug_print_plan (Tom)
+       Have <command>EXPLAIN</> honor debug_print_plan (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow EXPLAIN on CREATE TABLE AS (Peter)
+       Allow <command>EXPLAIN</> on <command>CREATE TABLE AS</> (Peter)
       </para>
      </listitem>
 
@@ -1225,20 +1289,20 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Dramatically improve the speed of building and accessing hash indexes
-       (Tom Raney, Shreya Bhargava, Kenneth Marshall)
+       Dramatically improve the speed of building and accessing hash
+       indexes (Tom Raney, Shreya Bhargava, Kenneth Marshall)
       </para>
 
       <para>
-       This allows hash indexes to be sometimes faster than btree indexes.
-       However, hash indexes are still not crash-safe.
+       This allows hash indexes to be sometimes faster than btree
+       indexes.  However, hash indexes are still not crash-safe.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have hash indexes store only the hashed value, not the full indexed
-       columns (Xiao Meng)
+       Have hash indexes store only the hashed value, not the full
+       indexed columns (Xiao Meng)
       </para>
 
       <para>
@@ -1249,41 +1313,42 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Remove requirement to use "@@@" when doing GIN weighted lookups on full
-       text indexes (Tom)
+       Remove requirement to use <literal>@@@</> when doing <acronym>GIN</>
+       weighted lookups on full text indexes (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add optimizer selectivity function for '@@' text search operations (Jan
-       Urbanski)
+       Add optimizer selectivity function for <literal>@@</> text
+       search operations (Jan Urbanski)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add partial match support for GIN indexes (Teodor Sigaev, Oleg Bartunov)
+       Add partial match support for <acronym>GIN</> indexes (Teodor
+       Sigaev, Oleg Bartunov)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow prefix matching in full text searches (Teodor Sigaev, Oleg
-       Bartunov)
+       Allow prefix matching in full text searches (Teodor Sigaev,
+       Oleg Bartunov)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support multi-column GIN indexes (Teodor Sigaev)
+       Support multi-column <acronym>GIN</> indexes (Teodor Sigaev)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Special xxx_pattern_ops LIKE indexes can now be used for simple equality
-       comparisons (Tom)
+       Special xxx_pattern_ops <literal>LIKE</> indexes can now be
+       used for simple equality comparisons (Tom)
       </para>
      </listitem>
 
@@ -1292,7 +1357,7 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title>VACUUM</title>
+    <title><command>VACUUM</></title>
     <itemizedlist>
 
      <listitem>
@@ -1301,22 +1366,22 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       This allows the recording of all free space discovered by vacuum in
-       *.fsm files, rather than having to limit recording to a fixed-sized
-       shared memory area;  max_fsm_pages and max_fsm_relations settings
-       have been removed.
+       This allows the recording of all free space discovered by vacuum
+       in *.fsm files, rather than having to limit recording to a
+       fixed-sized shared memory area;  max_fsm_pages and max_fsm_relations
+       settings have been removed.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New visibility map file to track pages that do not require vacuum
-       (Heikki)
+       New visibility map file to track pages that do not require
+       vacuum (Heikki)
       </para>
 
       <para>
-       This allows VACUUM to avoid sequentially scanning a table when only a
-       portion of the table needs vacuuming.
+       This allows <command>VACUUM</> to avoid sequentially scanning
+       a table when only a portion of the table needs vacuuming.
       </para>
      </listitem>
 
@@ -1333,16 +1398,16 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add vacuum_freeze_table_age to postgresql.conf to control when VACUUM should
-       ignore the visibility map and do a full table scan to set frozen xids
-       (Heikki)
+       Add vacuum_freeze_table_age to <filename>postgresql.conf</> to
+       control when <command>VACUUM</> should ignore the visibility
+       map and do a full table scan to set frozen xids (Heikki)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add ability to specify autovacuum and TOAST parameters in
-       CREATE TABLE (Alvaro, Euler Taveira de Oliveira)
+       Add ability to specify autovacuum and <acronym>TOAST</> parameters
+       in <command>CREATE TABLE</> (Alvaro, Euler Taveira de Oliveira)
       </para>
 
       <para>
@@ -1352,7 +1417,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add --freeze option to vacuumdb (Bruce)
+       Add <literal>--freeze</> option to <application>vacuumdb</>
+       (Bruce)
       </para>
      </listitem>
 
@@ -1366,13 +1432,15 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add verbose option to the CLUSTER command and clusterdb (Jim Cox)
+       Add verbose option to the <command>CLUSTER</> command and
+       <application>clusterdb</> (Jim Cox)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Decrease memory requirements for recording pending trigger events (Tom)
+       Decrease memory requirements for recording pending trigger
+       events (Tom)
       </para>
      </listitem>
 
@@ -1386,19 +1454,21 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add a CaseSensitive option for text search synonym dictionaries (Simon)
+       Add a <literal>CaseSensitive</> option for text search synonym
+       dictionaries (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve the precision of NUMERIC division (Tom)
+       Improve the precision of <type>NUMERIC</> division (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add int2 with int8 basic arithmetic operators (Tom)
+       Add <type>int2</> with <type>int8</> basic arithmetic operators
+       (Tom)
       </para>
 
       <para>
@@ -1408,14 +1478,15 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow UUID input to accept optional hyphens after every four digits
-       (Robert Haas)
+       Allow <type>UUID</> input to accept optional hyphens after
+       every four digits (Robert Haas)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Accept 'on'/'off' as boolean data type values (Itagaki Takahiro)
+       Accept <literal>on</>/<literal>off</> as boolean data type
+       values (Itagaki Takahiro)
       </para>
      </listitem>
 
@@ -1429,60 +1500,66 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Reject year '0 BC' and years '000' and '0000' (Tom)
+       Reject year <literal>0 BC</> and years <literal>000</> and
+       <literal>0000</> (Tom)
       </para>
 
       <para>
-       Previously these were interpreted as 1 BC.  (Years '0' and '00' are
-       assumed to be the year 2000.)
+       Previously these were interpreted as <literal>1 BC</>.  (Years
+       <literal>0</> and <literal>00</> are assumed to be the year
+       2000.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Include SGT (Singapore time) as a valid timezone abbreviation (Tom)
+       Include <acronym>SGT</> (Singapore time) as a valid timezone
+       abbreviation (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support the IS0 8601 time interval syntax (Tom, Kevin Grittner)
+       Support the <acronym>IS0 8601</> <type>interval</> syntax (Tom,
+       Kevin Grittner)
       </para>
 
       <para>
-       For example, INTERVAL 'P1Y2M3DT4H5M6.7S' is now supported.
+       For example, <literal>INTERVAL 'P1Y2M3DT4H5M6.7S'</> is now
+       supported.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow the interval precision to be specified after the last field, for
-       SQL-standards compliance (Tom)
+       Allow <type>INTERVAL</> precision to be specified after the
+       last field, for <acronym>SQL</>-standards compliance (Tom)
       </para>
 
       <para>
-       Formerly the precision had to be specified after the keyword INTERVAL
-       (the old syntax is still supported).  Data type definitions will now
-       be output using the new format.
+       Formerly the precision had to be specified after the keyword
+       <type>INTERVAL</> (the old syntax is still supported).  Data
+       type definitions will now be output using the new format.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support 'infinite' dates (Tom)
+       Support <literal>infinite</> dates (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add postgresql.conf variable IntervalStyle which controls how interval
-       values are output (Ron Mayer)
+       Add <filename>postgresql.conf</> variable IntervalStyle which
+       controls how interval values are output (Ron Mayer)
       </para>
 
       <para>
-       Valid value are:  postgres, postgres_verbose, sql_standard, iso_8601.
-       This also controls handling of negative interval input when only some
-       fields have positive/negative designations.
+       Valid value are:  <literal>postgres</>, <literal>postgres_verbose</>,
+       <literal>sql_standard</>, <literal>iso_8601</>.  This also
+       controls handling of negative <type>INTERVAL</> input when only
+       some fields have positive/negative designations.
       </para>
      </listitem>
 
@@ -1504,74 +1581,81 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Have cast on ARRAY[] apply to all elements, not just the array result
-       (Brendan Jurd)
+       Have cast on <type>ARRAY</> apply to all elements, not just
+       the array result (Brendan Jurd)
       </para>
 
       <para>
-       This allows NULL ARRAY[] entries as long as it is properly cast
+       This allows <literal>NULL</> <type>ARRAY</> entries as long as
+       it is properly cast
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make the SQL ARRAY dimensions optional to match the SQL standard
-       (Peter)
+       Make the <acronym>SQL</> <type>ARRAY</> dimensions optional to
+       match the <acronym>SQL</> standard (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add array_ndims() function to return the number of dimensions of an array (Robert
-       Haas)
+       Add <function>array_ndims()</> function to return the number
+       of dimensions of an array (Robert Haas)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add array_length() function to return the length of an array for the
-       specified dimensions (Jim Nasby, Robert Haas, Peter Eisentraut)
+       Add <function>array_length()</> function to return the length
+       of an array for the specified dimensions (Jim Nasby, Robert
+       Haas, Peter Eisentraut)
       </para>
 
       <para>
-       Also add identically-functioning SQL-standard function cardinality().
+       Also add identically-functioning <acronym>SQL</>-standard
+       function <function>cardinality()</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new aggregate function array_agg(), which returns all aggregated
-       values as a single array (Robert Haas, Jeff Davis, Peter)
+       Add new aggregate function <function>array_agg()</>, which
+       returns all aggregated values as a single array (Robert Haas,
+       Jeff Davis, Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add function unnest(), which converts an array to individual row values
+       Add function <function>unnest()</>, which converts an array to
+       individual row values (Tom)
+      </para>
+
+      <para>
+       This is the opposite of <function>array_agg()</>.
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Add <function>array_fill()</> to create arrays initialized with
+       a value (Pavel Stehule)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Add <function>generate_subscripts()</> to generate array
+       subscripts (Pavel Stehule)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Generate proper error if a <type>SERIAL</> array is specified
        (Tom)
       </para>
-
-      <para>
-       This is the opposite of array_agg().
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Add array_fill() to create arrays initialized with a value (Pavel Stehule)
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Add generate_subscripts() to generate array subscripts (Pavel Stehule)
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Generate proper error if a SERIAL array is specified (Tom)
-      </para>
      </listitem>
 
     </itemizedlist>
@@ -1584,48 +1668,52 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Document that setseed() allows values from -1 to 1 (not 0 to 1), and
-       enforce the valid range (Kris Jurka)
+       Document that <function>setseed()</> allows values from
+       <literal>-1</> to <literal>1</> (not <literal>0</> to
+       <literal>1</>), and enforce the valid range (Kris Jurka)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add server side lo_import(filename, oid) function (Tatsuo)
+       Add server side <function>lo_import(filename, oid)</> function
+       (Tatsuo)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add quote_nullable(), which behaves like quote_literal() but returns
-       'NULL' for a null argument (Brendan Jurd)
+       Add <function>quote_nullable()</>, which behaves like
+       <function>quote_literal()</> but returns <literal>NULL</> for
+       a null argument (Brendan Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve full text search headline() generation to allow several
-       fragments (Sushant Sinha)
+       Improve full text search <function>headline()</> generation to
+       allow several fragments (Sushant Sinha)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add suppress_redundant_updates_trigger() trigger function to avoid
-       non-data-changing updates (Andrew)
+       Add <function>suppress_redundant_updates_trigger()</> trigger
+       function to avoid non-data-changing updates (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add div(NUMERIC, NUMERIC) for NUMERIC division, without rounding (Tom)
+       Add <function>div(NUMERIC, NUMERIC)</> for <type>NUMERIC</>
+       division, without rounding (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add timestamp and timestamptz versions of generate_series() (Hitoshi
-       Harada)
+       Add <type>TIMESTAMP</> and <type>TIMESTAMPTZ</> versions of
+       <function>generate_series()</> (Hitoshi Harada)
       </para>
      </listitem>
 
@@ -1639,104 +1727,111 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Implement current_query() for use by functions that need to know the
-       currently running query (Tomas Doran)
+       Implement <function>current_query()</> for use by functions
+       that need to know the currently running query (Tomas Doran)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_get_keywords() function to return predefined parser keywords
-       (Dave Page)
+       Add <function>pg_get_keywords()</> function to return predefined
+       parser keywords (Dave Page)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add function pg_get_functiondef() to see a functions definition (Abhijit
-       Menon-Sen)
+       Add function <function>pg_get_functiondef()</> to see a functions
+       definition (Abhijit Menon-Sen)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Modify pg_relation_size() to handle free space map (*.fsm) files
+       Modify <function>pg_relation_size()</> to handle free space
+       map (*.fsm) files (Heikki)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Modify <function>pg_relation_size()</> to use <literal>regclass</>
        (Heikki)
       </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Modify pg_relation_size() to use 'regclass' (Heikki)
-      </para>
 
       <para>
-       pg_relation_size(data_type_name) no longer works.
+       <function>pg_relation_size(data_type_name)</> no longer works.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add boot_val and reset_val columns to pg_settings output (Greg Smith)
+       Add <literal>boot_val</> and <literal>reset_val</> columns to
+       <literal>pg_settings</> output (Greg Smith)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for CURRENT_CATALOG, CURRENT_SCHEMA, SET CATALOG, SET SCHEMA
-       (Peter)
+       Add support for <varname>CURRENT_CATALOG</>,
+       <varname>CURRENT_SCHEMA</>, <varname>SET CATALOG</>, <varname>SET
+       SCHEMA</> (Peter)
       </para>
 
       <para>
-       These are SQL-standard capabilities.
+       These are <acronym>SQL</>-standard capabilities.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_typeof() function to return the data type of any value (Brendan
-       Jurd)
+       Add <function>pg_typeof()</> function to return the data type
+       of any value (Brendan Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have version() return information about whether the server is a 32
-       or 64-bit binary (Bruce)
+       Have <function>version()</> return information about whether
+       the server is a 32 or 64-bit binary (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix the behavior of information schema columns is_insertable_into and
-       is_updatable to be consistent (Peter)
+       Fix the behavior of information schema columns
+       <literal>is_insertable_into</> and <literal>is_updatable</> to
+       be consistent (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Convert remaining builtin set-returning functions to use OUT parameters
-       (Jaime Casanova)
+       Convert remaining builtin set-returning functions to use
+       <literal>OUT</> parameters (Jaime Casanova)
       </para>
 
       <para>
        This makes it possible to call these functions without specifying
-       a column list:  pg_show_all_settings(), pg_lock_status(),
-       pg_prepared_xact(), pg_prepared_statement(), pg_cursor()
+       a column list:  <function>pg_show_all_settings()</>,
+       <function>pg_lock_status()</>, <function>pg_prepared_xact()</>,
+       <function>pg_prepared_statement()</>, <function>pg_cursor()</>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have pg_*_is_visible and has_*_privilege functions return NULL for
-       invalid oids, rather than generate an error (Tom)
+       Have <function>pg_*_is_visible()</> and
+       <function>has_*_privilege()</> functions return <literal>NULL</>
+       for invalid oids, rather than generate an error (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add has_column_privilege() and has_any_column_privilege() functions
-       (Stephen Frost, Tom)
+       Add <function>has_column_privilege()</> and
+       <function>has_any_column_privilege()</> functions (Stephen
+       Frost, Tom)
       </para>
      </listitem>
 
@@ -1750,36 +1845,39 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Support variadic functions (functions with a variable number of
-       arguments) (Pavel Stehule)
+       Support variadic functions (functions with a variable number
+       of arguments) (Pavel Stehule)
       </para>
 
       <para>
-       Only trailing arguments can be of variable length, and they all must
-       be of the same data type.
+       Only trailing arguments can be of variable length, and they
+       all must be of the same data type.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow DEFAULT values for function arguments (Pavel Stehule)
+       Allow <literal>DEFAULT</> values for function arguments (Pavel
+       Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add CREATE FUNCTION ... RETURNS TABLE clause (Pavel Stehule)
+       Add <command>CREATE FUNCTION ... RETURNS TABLE</> clause (Pavel
+       Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow SQL-language functions to return the output of an INSERT/UPDATE/DELETE
-       RETURNING clause (Tom)
+       Allow <acronym>SQL</>-language functions to return the output
+       of an <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>
+       <literal>RETURNING</> clause (Tom)
       </para>
 
       <para>
-       Formerly only SELECT was supported.
+       Formerly only <command>SELECT</> was supported.
       </para>
      </listitem>
 
@@ -1793,26 +1891,27 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Support EXECUTE USING in PL/pgSQL (Pavel Stehule)
+       Support <literal>EXECUTE USING</> in PL/pgSQL (Pavel Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow PL/pgSQL to loop over an open cursor using a FOR loop (Pavel
+       Allow PL/pgSQL to loop over an open cursor using a <literal>FOR</>
+       loop (Pavel Stehule)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Support <literal>RETURN QUERY EXECUTE</> in PL/pgSQL (Pavel
        Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support RETURN QUERY EXECUTE in PL/pgSQL (Pavel Stehule)
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Improve the PL/pgSQL RAISE command (Pavel Stehule)
+       Improve the PL/pgSQL <literal>RAISE</> command (Pavel Stehule)
       </para>
      </listitem>
 
@@ -1821,12 +1920,12 @@ do it for earlier branch release files.
        <itemizedlist>
         <listitem>
          <para>
-          Support DETAIL and HINT fields
+          Support <literal>DETAIL</> and <literal>HINT</> fields
          </para>
         </listitem>
         <listitem>
          <para>
-          Support SQLSTATE error codes
+          Support <literal>SQLSTATE</> error codes
          </para>
         </listitem>
         <listitem>
@@ -1836,7 +1935,7 @@ do it for earlier branch release files.
         </listitem>
         <listitem>
          <para>
-          Allow RAISE without parameters in an exception
+          Allow <literal>RAISE</> without parameters in an exception
           block to rethrow the current error
          </para>
         </listitem>
@@ -1846,24 +1945,25 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow the specification of SQLSTATE numeric codes in EXCEPTION lists
-       (Pavel Stehule)
+       Allow the specification of <varname>SQLSTATE</> numeric codes
+       in <literal>EXCEPTION</> lists (Pavel Stehule)
       </para>
 
       <para>
-       This is useful for handling custom SQLSTATE codes.
+       This is useful for handling custom <varname>SQLSTATE</> codes.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support CASE statement in PL/pgSQL (Pavel Stehule)
+       Support <literal>CASE</> statement in PL/pgSQL (Pavel Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add PL/PgSQL FOUND and GET DIAGNOSTICS support for the RETURN QUERY
+       Add PL/PgSQL <literal>FOUND</> and <command>GET DIAGNOSTICS</>
+       support for the <literal>RETURN QUERY</>
         statement (Pavel Stehule)
       </para>
      </listitem>
@@ -1884,20 +1984,24 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Remove psql startup banner;  now just suggest 'help' (Joshua Drake)
+       Remove psql startup banner;  now just suggest <literal>help</>
+       (Joshua Drake)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have psql 'help' show common backslash commands (Greg Sabino Mullane)
+       Have psql <literal>help</> show common backslash commands (Greg
+       Sabino Mullane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add psql '\pset format wrapped' mode to wrap output to screen width, or
-        file/pipe output too if \pset columns' is set (Bryce Nesbitt)
+       Add psql <literal>\pset format wrapped</> mode to wrap output
+       to screen width, or
+        file/pipe output too if <literal>\pset columns</> is set (Bryce
+        Nesbitt)
       </para>
      </listitem>
 
@@ -1909,58 +2013,61 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Require a space between a psql backslash command and the first argument (Bernd
-       Helmle)
+       Require a space between a psql backslash command and the first
+       argument (Bernd Helmle)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Display access control rights on multiple lines in psql (Brendan Jurd,
-       Andreas Scherbaum)
+       Display access control rights on multiple lines in psql (Brendan
+       Jurd, Andreas Scherbaum)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve psql tab completion support for schema qualified and quoted
-       identifiers (Greg Sabino Mullane)
+       Improve psql tab completion support for schema qualified and
+       quoted identifiers (Greg Sabino Mullane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow the normal range of boolean values in \pset, rather than just
-       'on' and 'off' (Bruce)
+       Allow the normal range of boolean values in <command>\pset</>,
+       rather than just <literal>on</> and <literal>off</> (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add optional on/off argument to psql \timing (David Fetter)
+       Add optional <literal>on</>/<literal>off</> argument to psql
+       <command>\timing</> (David Fetter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have psql \l show access privileges (Andrew Gilligan)
+       Have psql <command>\l</> show access privileges (Andrew Gilligan)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have psql \l+ show database sizes, if permissions allow (Andrew Gilligan)
+       Have psql <command>\l+</> show database sizes, if permissions
+       allow (Andrew Gilligan)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add psql \ef command to edit function definitions (Abhijit Menon-Sen)
+       Add psql <command>\ef</> command to edit function definitions
+       (Abhijit Menon-Sen)
       </para>
 
       <para>
-       \ef without a function names creates an empty function template for
-       editing.
+       <command>\ef</> without a function names creates an empty
+       function template for editing.
       </para>
      </listitem>
 
@@ -1974,70 +2081,72 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Have psql \d display references to this table as a foreign-key constraint
-       (Kenneth D'Souza)
+       Have psql <command>\d</> display references to this table as
+       a foreign-key constraint (Kenneth D'Souza)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have psql \d show the value of sequence columns (Euler Taveira de
+       Have psql <command>\d</> show the value of sequence columns
+       (Euler Taveira de Oliveira)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Add column storage type and other relation options to psql
+       <command>\d+</> display (Gregory Stark, Euler Taveira de
        Oliveira)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add column storage type and other relation options to psql \d+ display
-       (Gregory Stark, Euler Taveira de Oliveira)
+       Show relation size in psql <command>\d+</> output (Dickson S.
+       Guedes)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Show relation size in psql \d+ output (Dickson S. Guedes)
+       Have all psql <command>\d*</> commands show system objects only
+       if <literal>S</> is specified (Greg Sabino Mullane)
+      </para>
+
+      <para>
+       psql <command>\dt</> already behaved this way.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have all psql \d* commands show system objects only if 'S' is specified
-       (Greg Sabino Mullane)
+       Make psql <command>\d</> and <command>\dt</> consistent in
+       their display of system tables (Bruce)
       </para>
 
       <para>
-       psql \dt already behaved this way.
+       Previously, <literal>\d pg_class</> would show pg_class while
+       <literal>\dt pg_class</> would not.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make psql \d and \dt consistent in their display of system tables
-       (Bruce)
-      </para>
-
-      <para>
-       Previously, '\d pg_class' would show pg_class while '\dt pg_class'
-       would not.
+       Show enumerated values in psql's <command>\dT+</> (David Fetter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Show enumerated values in psql's \dT+ (David Fetter)
+       Allow psql <command>\dC</> to accept wildcard patterns (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow psql \dC to accept wildcard patterns (Tom)
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Allow psql \d* commands to work with versions of Postgres back to 7.4
-       (Guillaume Lelarge)
+       Allow psql <command>\d*</> commands to work with versions of
+       <productname>PostgreSQL</> back to 7.4 (Guillaume Lelarge)
       </para>
      </listitem>
 
@@ -2051,77 +2160,83 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add --no-tablespaces option to pg_dump/pg_dumpall/pg_restore so dumps
-       can be restored to clusters that have non-matching tablespace layouts
-       (Gavin Roy)
+       Add <literal>--no-tablespaces</> option to
+       <application>pg_dump</>/<application>pg_dumpall</>/<application>pg_restore</>
+       so dumps can be restored to clusters that have non-matching
+       tablespace layouts (Gavin Roy)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove -i/--ignore-version option from pg_dump and pg_dumpall (Tom)
+       Remove <literal>-i</>/<literal>--ignore-version</> option from
+       <application>pg_dump</> and <application>pg_dumpall</> (Tom)
       </para>
 
       <para>
-       Use of the options does not throw an error, but it has no effect.
-       This option was removed because the version checks are considered
-       necessary.
+       Use of the options does not throw an error, but it has no
+       effect.  This option was removed because the version checks
+       are considered necessary.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Disable statement_timeout during dump and restore (Joshua Drake)
+       Disable <varname>statement_timeout</> during dump and restore
+       (Joshua Drake)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_dump/pg_dumpall option --lock-wait-timeout (David Gould)
+       Add <application>pg_dump</>/<application>pg_dumpall</> option
+       <literal>--lock-wait-timeout</> (David Gould)
       </para>
 
       <para>
-       Allows dumps to fail if unable to acquire shared lock within the
-       specified amount of time.
+       Allows dumps to fail if unable to acquire shared lock within
+       the specified amount of time.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Reorder pg_dump --data-only output to dump primary-key tables referenced
-       by foreign keys are dumped before the foreign-key referencing tables
-       (Tom)
+       Reorder <application>pg_dump</> <literal>--data-only</> output
+       to dump primary-key tables referenced by foreign keys are dumped
+       before the foreign-key referencing tables (Tom)
       </para>
 
       <para>
-       This allows data loads when foreign keys are already present.  If
-       circular references make this impossible, issue a NOTICE.
+       This allows data loads when foreign keys are already present.
+       If circular references make this impossible, issue a
+       <literal>NOTICE</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow pg_dump, pg_dumpall, and pg_restore to use a specified role (Benedek
+       Allow <application>pg_dump</>, <application>pg_dumpall</>, and
+       <application>pg_restore</> to use a specified role (Benedek
        László)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow pg_restore of a custom format archive to use multiple concurrent
-       connections to do the restore (Andrew)
+       Allow pg_restore of a custom format archive to use multiple
+       concurrent connections to do the restore (Andrew)
       </para>
 
       <para>
        The number of concurrent connections is controlled by the option
-       --jobs.
+       <literal>--jobs</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new pg_dump --binary-upgrade flag to be used by binary upgrade
-       utilities (Bruce)
+       Add new <application>pg_dump</> <literal>--binary-upgrade</>
+       flag to be used by binary upgrade utilities (Bruce)
       </para>
      </listitem>
 
@@ -2135,24 +2250,28 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Fix 'pg_ctl restart' to preserve command-line arguments (Bruce)
+       Fix <literal>pg_ctl restart</> to preserve command-line arguments
+       (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add -w/--no-password option that suppresses password prompts to all
-       utilities that have a -W/--password option (Peter)
+       Add <literal>-w</>/<literal>--no-password</> option that
+       suppresses password prompts to all utilities that have a
+       <literal>-W</>/<literal>--password</> option (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove -q (quiet) option for create* and drop* utility commands (Peter)
+       Remove <literal>-q</> (quiet) option for create* and drop*
+       utility commands (Peter)
       </para>
 
       <para>
-       These options have had no effect since 8.3.
+       These options have had no effect since <productname>PostgreSQL</>
+       8.3.
       </para>
      </listitem>
 
@@ -2166,8 +2285,8 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow the OID to be specified when importing large objects using
-       libpq lo_import_with_oid() (Tatsuo)
+       Allow the <type>OID</> to be specified when importing large
+       objects using libpq <function>lo_import_with_oid()</> (Tatsuo)
       </para>
      </listitem>
 
@@ -2177,33 +2296,33 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       This adds the ability to register callbacks to handle private data
-       for connection and result creation and destruction.
+       This adds the ability to register callbacks to handle private
+       data for connection and result creation and destruction.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve libpq error handling to allow the return of multiple error
-       messages as multi-line error reports (Magnus)
+       Improve libpq error handling to allow the return of multiple
+       error messages as multi-line error reports (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have libpq PQexecParams() return PGRES_EMPTY_QUERY for an empty query
-       (Tom)
+       Have libpq <function>PQexecParams()</> return
+       <varname>PGRES_EMPTY_QUERY</> for an empty query (Tom)
       </para>
 
       <para>
-        It previously returned PGRES_COMMAND_OK.
+        It previously returned <varname>PGRES_COMMAND_OK</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Document how to avoid the libpq overhead of WSACleanup() overhead on
-       Windows (Andrew Chernow)
+       Document how to avoid the libpq overhead of <function>WSACleanup()</>
+       overhead on Windows (Andrew Chernow)
       </para>
      </listitem>
 
@@ -2212,34 +2331,37 @@ do it for earlier branch release files.
    </sect3>
 
    <sect3>
-    <title><link linkend="libpq"><application>libpq</></link> SSL</title>
+    <title><link linkend="libpq"><application>libpq</></link> <acronym>SSL</></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Fix libpq certificate validation for SSL connections (Magnus)
+       Fix libpq certificate validation for <acronym>SSL</> connections
+       (Magnus)
       </para>
       
       <para>
-       libpq now verifies both the certificate and the name of the server by
-       default when making SSL connections. If a root certificate is not
-       available to use for verification, SSL connections will fail. The
-       "sslverify" parameter can be used to disable the host and certificate
+       libpq now verifies both the certificate and the name of the
+       server by default when making <acronym>SSL</> connections. If
+       a root certificate is not available to use for verification,
+       <acronym>SSL</> connections will fail. The <literal>sslverify</>
+       parameter can be used to disable the host and certificate
        verification if required.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow the file locations for libpq SSL certificates to be specified
-       (Mark Woodward, Alvaro, Magnus)
+       Allow the file locations for libpq <acronym>SSL</> certificates
+       to be specified (Mark Woodward, Alvaro, Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add libpq connection parameter "sslverify" to control the verification
-       of the server's SSL certificate (Magnus)
+       Add libpq connection parameter <literal>sslverify</> to control
+       the verification of the server's <acronym>SSL</> certificate
+       (Magnus)
       </para>
 
       <para>
@@ -2249,13 +2371,13 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Properly unregister OpenSSL callbacks when libpq is done with
-       all connection (Bruce, Magnus, Russell Smith)
+       Properly unregister <application>OpenSSL</> callbacks when
+       libpq is done with all connection (Bruce, Magnus, Russell Smith)
       </para>
 
       <para>
-       This is required for applications that unload the libpq library so
-       no invalid OpenSSL callbacks remain.
+       This is required for applications that unload the libpq library
+       so no invalid <application>OpenSSL</> callbacks remain.
       </para>
      </listitem>
 
@@ -2269,19 +2391,19 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add localization support for ecpg messages (Euler Taveira de Oliveira)
+       Add localization support for ecpg messages (Euler Taveira de
+       Oliveira)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       ecpg parser is now automatically generated from the server parser
-       (Michael)
+       ecpg parser is now automatically generated from the server
+       parser (Michael)
       </para>
 
       <para>
        Previously a separate ecpg parser was maintained.
-
       </para>
      </listitem>
 
@@ -2295,17 +2417,20 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add SPI support for single-use plans with out-of-line parameters (Tom)
+       Add <acronym>SPI</> support for single-use plans with out-of-line
+       parameters (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new SPI_OK_REWRITTEN return code to SPI_execute() (Heikki)
+       Add new <varname>SPI_OK_REWRITTEN</> return code to
+       <function>SPI_execute()</> (Heikki)
       </para>
 
       <para>
-       This is used when a command is rewritten to another type of command.
+       This is used when a command is rewritten to another type of
+       command.
       </para>
      </listitem>
 
@@ -2323,7 +2448,8 @@ do it for earlier branch release files.
       </para>
 
       <para>
-       This adds support for daylight saving time (DST) calculations beyond 2038.
+       This adds support for daylight saving time (<acronym>DST</>)
+       calculations beyond year 2038.
       </para>
      </listitem>
 
@@ -2336,78 +2462,84 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Update build system to use Autoconf 2.61 (Peter)
+       Update build system to use <productname>Autoconf</> 2.61 (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require GNU bison for source code builds (Peter)
+       Require <productname>GNU bison</> for source code builds (Peter)
       </para>
 
       <para>
-       This has been a requirement for several years but this removes the
-       infrastructure for supporting other parser tools.
+       This has been a requirement for several years but this removes
+       the infrastructure for supporting other parser tools.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add pg_config --htmldir option (Peter)
+       Add <application>pg_config</> <literal>--htmldir</> option
+       (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Pass float4 by value inside the server (Zoltan Boszormenyi)
-      </para>
-
-      <para>
-       Add configure option --disable-float4-byval to use the old
-       behavior.
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Pass float8 and int8 by value in the server where possible (Zoltan
+       Pass <type>float4</> by value inside the server (Zoltan
        Boszormenyi)
       </para>
 
       <para>
-       Add configure option --disable-float8-byval to use the old behavior.
+       Add <application>configure</> option
+       <literal>--disable-float4-byval</> to use the old behavior.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add configure options -with-segsize, --with-blocksize,
-       --with-wal-blocksize, --with-wal-segsize (Zdenek Kotala, Tom)
+       Pass <type>float8</> and <type>int8</> by value in the server
+       where possible (Zoltan Boszormenyi)
       </para>
 
       <para>
-       This allows compile-time control over several compile-time constants
-       that control how large tables and WAL are segmented into separate files and
-       their internal block sizes
+       Add <application>configure</> option
+       <literal>--disable-float8-byval</> to use the old behavior.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow threaded builds on Solaris 2.5 (Bruce)
+       Add configure options <literal>--with-segsize</>,
+       <literal>--with-blocksize</>, <literal>--with-wal-blocksize</>,
+       <literal>--with-wal-segsize</> (Zdenek Kotala, Tom)
+      </para>
+
+      <para>
+       This allows compile-time control over several compile-time
+       constants that control how large tables and <acronym>WAL</>
+       are segmented into separate files and their internal block
+       sizes
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for Sun Studio compiler on Linux (Julius Stroffek)
+       Allow threaded builds on <productname>Solaris</> 2.5 (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Append major version number to the gettext domain name, and for
-       libraries the soname major version number (Peter)
+       Add support for <productname>Sun Studio</> compiler on
+       <productname>Linux</> (Julius Stroffek)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Append major version number to the gettext domain name, and
+       for libraries the soname major version number (Peter)
       </para>
 
       <para>
@@ -2417,20 +2549,23 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Allow out-of-tree builds on Mingw and Cygwin (Richard Evans)
+       Allow out-of-tree builds on <productname>Mingw</> and
+       <productname>Cygwin</> (Richard Evans)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix the use of Mingw32 as a cross-compiling source platform (Peter)
+       Fix the use of <productname>Mingw</> as a cross-compiling source
+       platform (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix problem when setting LC_MESSAGES on MSVC-built systems (Hiroshi
-       Inoue, Hiroshi Saito, Magnus)  bjm: details?
+       Fix problem when setting <varname>LC_MESSAGES</> on
+       <application>MSVC</>-built systems (Hiroshi Inoue, Hiroshi
+       Saito, Magnus)  bjm: details?
       </para>
      </listitem>
 
@@ -2444,25 +2579,28 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Link backend object files in one step, rather than in stages (Peter)
+       Link backend object files in one step, rather than in stages
+       (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Additional DTrace probes (Robert Lor)
+       Additional <application>DTrace</> probes (Robert Lor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add DTrace support on Mac OS X Leopard (Robert Lor)
+       Add <application>DTrace</> support on Mac <application>OS X
+       Leopard</> (Robert Lor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new cstring to text conversion functions (Brendan Jurd, Tom)
+       Add new <type>cstring</> to text conversion functions (Brendan
+       Jurd, Tom)
       </para>
      </listitem>
 
@@ -2474,63 +2612,68 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Make "name" char-aligned (Tom) bjm: pg_upgrade?
+       Make <type>name</> char-aligned (Tom) bjm: pg_upgrade?
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add function hook to let plug-ins control the executor (ITAGAKI
+       Add function hook to let plug-ins control the executor (Itagaki
        Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a hook to allow planner statistics lookup behavior to be overridden
-       (Simon Riggs)
+       Add a hook to allow planner statistics lookup behavior to be
+       overridden (Simon Riggs)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add "shmem_startup_hook" for custom shared memory requirements (Tom)
+       Add <function>shmem_startup_hook()</> for custom shared memory
+       requirements (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Replace pg_class column reltriggers with boolean relhastriggers (Simon)
+       Replace <literal>pg_class</> column <literal>reltriggers</>
+       with boolean <literal>relhastriggers</> (Simon)
       </para>
 
       <para>
-       Also remove unused pg_class columns relukeys, relfkeys, and relrefs.
+       Also remove unused <literal>pg_class</> columns <literal>relukeys</>,
+       <literal>relfkeys</>, and <literal>relrefs</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move SQL-command manual pages from the 'manl' (man-el) section to 'man7'
+       Move <acronym>SQL</>-command manual pages from the <filename>manl</>
+       (man-el) section to <filename>man7</> (Peter)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Move platform <acronym>FAQ</>s into the main documentation
        (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move platform FAQs into the main documentation (Peter)
+       Add <literal>%expect 0</> to all parser input files to prevent
+       builds with parser conflicts (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add %expect 0 to all parser input files to prevent builds with parser
-       conflicts (Peter)
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       Add support for the KOI8U (Ukrainian) encoding (Peter)
+       Add support for the <literal>KOI8U</> (Ukrainian) encoding
+       (Peter)
       </para>
      </listitem>
 
@@ -2544,54 +2687,61 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add -M (query mode) to /contrib/pgbench (Takahiro Itagaki)
+       Add <literal>-M</> (query mode) to <filename>/contrib/pgbench</>
+       (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add duration option to /contrib/pgbench (Takahiro Itagaki)
+       Add duration option to <filename>/contrib/pgbench</> (Itagaki
+       Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix /contrib/pgstattuple to handle tables and indexes with over 2
-       billion pages (Tatsuhito Kasahara)
+       Fix <filename>/contrib/pgstattuple</> to handle tables and
+       indexes with over 2 billion pages (Tatsuhito Kasahara)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add Levenshtein string-distance function to /contrib/fuzzystrmatch
-       that allows the user to specify the cost of insertion, deletion,
-       and substitution (Volkan Yazici)
+       Add Levenshtein string-distance function to
+       <filename>/contrib/fuzzystrmatch</> that allows the user to
+       specify the cost of insertion, deletion, and substitution
+       (Volkan Yazici)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove dblink_current_query() from /contrib/dblink;  it should now use
-       current_query() (Tomas Doran)
+       Remove <function>dblink_current_query()</> from
+       <filename>/contrib/dblink</>;  it should now use
+       <function>current_query()</> (Tomas Doran)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have /contrib/ltree support multibyte encodings (laser)
+       Have <filename>/contrib/ltree</> support multibyte encodings
+       (laser)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add /contrib/citext as a case-insensitive, multibyte-capable text data type (David Wheeler)
+       Add <filename>/contrib/citext</> as a case-insensitive,
+       multibyte-capable text data type (David Wheeler)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make sure /contrib/dblink uses a password supplied by the user, and not
-       accidentally from the server .pgpass file (Joe Conway)
+       Make sure <filename>/contrib/dblink</> uses a password supplied
+       by the user, and not accidentally from the server .pgpass file
+       (Joe Conway)
       </para>
 
       <para>
@@ -2601,39 +2751,44 @@ do it for earlier branch release files.
 
      <listitem>
       <para>
-       Add fsm_page_contents() to contrib/pageinspect (Heikki)
+       Add <function>fsm_page_contents()</>
+       to<filename>/contrib/pageinspect</> (Heikki)
       </para>
 
       <para>
-       Modify get_raw_page() to support free space map (*.fsm) files.
-       Also update /contrib/pg_freespacemap.
+       Modify <function>get_raw_page()</> to support free space map
+       (<filename>*.fsm</>) files.  Also update
+       <filename>/contrib/pg_freespacemap</>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for multibyte encodings to /contrib/pg_trgm (Teodor)
+       Add support for multibyte encodings to <filename>/contrib/pg_trgm</>
+       (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Rewrite contrib/intagg to user new server-side functions array_agg() and
-       unnest() (Tom)
+       Rewrite <filename>/contrib/intagg</> to user new server-side
+       functions <function>array_agg()</> and <function>unnest()</>
+       (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add /contrib/auto_explain to automatically run EXPLAIN on queries
-       exceeding a specified duration (Takahiro Itagaki, Tom)
+       Add <filename>/contrib/auto_explain</> to automatically run
+       <command>EXPLAIN</> on queries exceeding a specified duration
+       (Itagaki Takahiro, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add contrib/pg_stat_statements for server-wide tracking of statement execution
-       statistics (Takahiro Itagaki)
+       Add <filename>/contrib/pg_stat_statements</> for server-wide
+       tracking of statement execution statistics (Itagaki Takahiro)
       </para>
      </listitem>