Spell and markup checking

doc/src/sgml/arch-dev.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.34 2010/04/03 07:22:52 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.35 2010/08/17 04:37:20 petere Exp $ -->
 
  <chapter id="overview">
   <title>Overview of PostgreSQL Internals</title>
@@ -463,7 +463,7 @@
      needed, plus any auxiliary steps needed, such as sort nodes or
      aggregate-function calculation nodes.  Most of these plan node
      types have the additional ability to do <firstterm>selection</>
-     (discarding rows that do not meet a specified boolean condition)
+     (discarding rows that do not meet a specified Boolean condition)
      and <firstterm>projection</> (computation of a derived column set
      based on given column values, that is, evaluation of scalar
      expressions where needed).  One of the responsibilities of the

doc/src/sgml/bki.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.23 2010/01/05 01:06:55 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.24 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="bki">
  <title><acronym>BKI</acronym> Backend Interface</title>
@@ -122,7 +122,7 @@
       The table is created as shared if <literal>shared_relation</> is
       specified.
       It will have OIDs unless <literal>without_oids</> is specified.
-      The table's rowtype OID (<structname>pg_type</> OID) can optionally
+      The table's row type OID (<structname>pg_type</> OID) can optionally
       be specified via the <literal>rowtype_oid</> clause; if not specified,
       an OID is automatically generated for it.  (The <literal>rowtype_oid</>
       clause is useless if <literal>bootstrap</> is specified, but it can be

doc/src/sgml/btree-gin.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/btree-gin.sgml,v 1.1 2009/03/25 23:20:01 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/btree-gin.sgml,v 1.2 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="btree-gin">
  <title>btree_gin</title>
@@ -9,7 +9,7 @@
 
  <para>
   <filename>btree_gin</> provides sample GIN operator classes that
-  implement B-Tree equivalent behavior for the data types
+  implement B-tree equivalent behavior for the data types
   <type>int2</>, <type>int4</>, <type>int8</>, <type>float4</>,
   <type>float8</>, <type>timestamp with time zone</>,
   <type>timestamp without time zone</>, <type>time with time zone</>,
@@ -21,12 +21,12 @@
 
  <para>
   In general, these operator classes will not outperform the equivalent
-  standard btree index methods, and they lack one major feature of the
-  standard btree code: the ability to enforce uniqueness.  However,
+  standard B-tree index methods, and they lack one major feature of the
+  standard B-tree code: the ability to enforce uniqueness.  However,
   they are useful for GIN testing and as a base for developing other
   GIN operator classes.  Also, for queries that test both a GIN-indexable
-  column and a btree-indexable column, it might be more efficient to create
-  a multi-column GIN index that uses one of these opclasses than to create
+  column and a B-tree-indexable column, it might be more efficient to create
+  a multicolumn GIN index that uses one of these operator classes than to create
   two separate indexes that would have to be combined via bitmap ANDing.
  </para>
 

doc/src/sgml/btree-gist.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/btree-gist.sgml,v 1.7 2010/08/03 15:15:31 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/btree-gist.sgml,v 1.8 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="btree-gist">
  <title>btree_gist</title>
@@ -9,7 +9,7 @@
 
  <para>
   <filename>btree_gist</> provides sample GiST operator classes that
-  implement B-Tree equivalent behavior for the data types
+  implement B-tree equivalent behavior for the data types
   <type>int2</>, <type>int4</>, <type>int8</>, <type>float4</>,
   <type>float8</>, <type>numeric</>, <type>timestamp with time zone</>,
   <type>timestamp without time zone</>, <type>time with time zone</>,
@@ -21,8 +21,8 @@
 
  <para>
   In general, these operator classes will not outperform the equivalent
-  standard btree index methods, and they lack one major feature of the
-  standard btree code: the ability to enforce uniqueness.  However,
+  standard B-tree index methods, and they lack one major feature of the
+  standard B-tree code: the ability to enforce uniqueness.  However,
   they are useful for GiST testing and as a base for developing other
   GiST operator classes.
  </para>

doc/src/sgml/chkpass.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/chkpass.sgml,v 1.2 2007/12/06 04:12:09 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/chkpass.sgml,v 1.3 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="chkpass">
  <title>chkpass</title>
@@ -32,7 +32,7 @@
   passwords without re-encrypting them.  If you want the encrypted password
   without the colon then use the <function>raw()</> function.
   This allows you to use the
-  type with things like Apache's Auth_PostgreSQL module.
+  type with things like Apache's <literal>Auth_PostgreSQL</> module.
  </para>
 
  <para>
@@ -43,7 +43,7 @@
  </para>
 
  <para>
-  Note that the chkpass data type is not indexable.
+  Note that the <type>chkpass</type> data type is not indexable.
   <!--
   I haven't worried about making this type indexable.  I doubt that anyone
   would ever need to sort a file in order of encrypted password.

doc/src/sgml/citext.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/citext.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/citext.sgml,v 1.6 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="citext">
  <title>citext</title>
@@ -62,7 +62,7 @@ SELECT * FROM tab WHERE lower(col) = LOWER(?);
     lower case characters is dependent on the rules of
     the <literal>LC_CTYPE</> locale setting. Again, this behavior is
     identical to the use of <function>lower</> in queries. But because it's
-    done transparently by the datatype, you don't have to remember to do
+    done transparently by the data type, you don't have to remember to do
     anything special in your queries.
    </para>
 
@@ -90,8 +90,8 @@ SELECT * FROM users WHERE nick = 'Larry';
 </programlisting>
 
    The <command>SELECT</> statement will return one tuple, even though
-   the <structfield>nick</> column was set to <quote>larry</> and the query
-   was for <quote>Larry</>.
+   the <structfield>nick</> column was set to <literal>larry</> and the query
+   was for <literal>Larry</>.
   </para>
  </sect2>
 
@@ -184,7 +184,7 @@ SELECT * FROM users WHERE nick = 'Larry';
     <listitem>
      <para>
        <type>citext</> is not as efficient as <type>text</> because the
-       operator functions and the btree comparison functions must make copies
+       operator functions and the B-tree comparison functions must make copies
        of the data and convert it to lower case for comparisons. It is,
        however, slightly more efficient than using <function>lower</> to get
        case-insensitive matching.

doc/src/sgml/config.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.303 2010/08/03 19:02:21 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.304 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -243,7 +243,7 @@ SET ENABLE_SEQSCAN TO OFF;
       <listitem>
        <para>
          Specifies the configuration file for
-         <xref linkend="auth-username-maps"> username mapping
+         <xref linkend="auth-username-maps"> user name mapping
          (customarily called <filename>pg_ident.conf</>).
          This parameter can only be set at server start.
        </para>
@@ -1495,7 +1495,7 @@ SET ENABLE_SEQSCAN TO OFF;
         one transaction is determined by the setting in effect when it
         commits.  It is therefore possible, and useful, to have some
         transactions commit synchronously and others asynchronously.
-        For example, to make a single multi-statement transaction commit
+        For example, to make a single multistatement transaction commit
         asynchronously when the default is the opposite, issue <command>SET
         LOCAL synchronous_commit TO OFF</> within the transaction.
        </para>
@@ -3407,9 +3407,8 @@ local0.*    /var/log/postgresql
         fields to displayed messages.  <literal>TERSE</> excludes
         the logging of <literal>DETAIL</>, <literal>HINT</>,
         <literal>QUERY</>, and <literal>CONTEXT</> error information.
-        <literal>VERBOSE</> output includes the <link
-        linkend="errcodes-appendix">SQLSTATE</> error
-        code and the source code file name, function name,
+        <literal>VERBOSE</> output includes the <symbol>SQLSTATE</> error
+        code (see also <xref linkend="errcodes-appendix">) and the source code file name, function name,
         and line number that generated the error.
         Only superusers can change this setting.
        </para>
@@ -5492,7 +5491,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         the server. The default value of <literal>NAMEDATALEN</> is
         64; therefore the default
         <varname>max_identifier_length</varname> is 63 bytes, which
-        can be less than 63 characters when using multi-byte encodings.
+        can be less than 63 characters when using multibyte encodings.
        </para>
       </listitem>
      </varlistentry>
@@ -5803,7 +5802,7 @@ plruby.use_strict = true        # generates error: unknown class name
         If on, emit information about lock usage.  Information dumped
         includes the type of lock operation, the type of lock and the unique
         identifier of the object being locked or unlocked.  Also included
-        are bitmasks for the lock types already granted on this object as
+        are bit masks for the lock types already granted on this object as
         well as for the lock types awaited on this object.  For each lock
         type a count of the number of granted locks and waiting locks is
         also dumped as well as the totals.  An example of the log file output
@@ -5823,7 +5822,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
       wait(0) type(INVALID)
 </screen>
         Details of the structure being dumped may be found in
-        src/include/storage/lock.h
+        <filename>src/include/storage/lock.h</filename>.
        </para>
        <para>
         This parameter is only available if the <symbol>LOCK_DEBUG</symbol>
@@ -5917,7 +5916,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
       <listitem>
        <para>
         If set, dumps information about all current locks when a
-        DeadLockTimeout occurs.
+        deadlock timeout occurs.
        </para>
        <para>
         This parameter is only available if the <symbol>LOCK_DEBUG</symbol>
@@ -5935,7 +5934,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
       <listitem>
        <para>
         If set, logs system resource usage statistics (memory and CPU) on
-        various btree operations.
+        various B-tree operations.
        </para>
        <para>
         This parameter is only available if the <symbol>BTREE_BUILD_STATS</symbol>
@@ -5981,7 +5980,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
         to the log.  The default is <literal>WARNING</>.  Note that
         <literal>LOG</> has a different rank here than in
         <varname>client_min_messages</>.
-        Parameter should be set in the postgresql.conf only.
+        Parameter should be set in <filename>postgresql.conf</filename> only.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/contrib-spi.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib-spi.sgml,v 1.2 2007/12/06 04:12:09 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib-spi.sgml,v 1.3 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="contrib-spi">
  <title>spi</title>
@@ -133,8 +133,8 @@ CREATE TABLE mytab (
   <para>
    <function>set_timetravel()</> allows you to turn time-travel on or off for
    a table.
-   <literal>set_timetravel('mytab', 1)</> will turn TT ON for table mytab.
-   <literal>set_timetravel('mytab', 0)</> will turn TT OFF for table mytab.
+   <literal>set_timetravel('mytab', 1)</> will turn TT ON for table <literal>mytab</>.
+   <literal>set_timetravel('mytab', 0)</> will turn TT OFF for table <literal>mytab</>.
    In both cases the old status is reported.  While TT is off, you can modify
    the start_date and stop_date columns freely.  Note that the on/off status
    is local to the current database session &mdash; fresh sessions will

doc/src/sgml/cube.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/cube.sgml,v 1.8 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/cube.sgml,v 1.9 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="cube">
  <title>cube</title>
@@ -9,7 +9,7 @@
 
  <para>
   This module implements a data type <type>cube</> for
-  representing multi-dimensional cubes.
+  representing multidimensional cubes.
  </para>
 
  <sect2>
@@ -98,7 +98,7 @@
   <para>
    The <filename>cube</> module includes a GiST index operator class for
    <type>cube</> values.
-   The operators supported by the GiST opclass are shown in <xref linkend="cube-gist-operators">.
+   The operators supported by the GiST operator class are shown in <xref linkend="cube-gist-operators">.
   </para>
 
   <table id="cube-gist-operators">
@@ -140,7 +140,7 @@
    respectively called <literal>@</> and <literal>~</>.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
-   datatypes!)
+   data types!)
   </para>
 
   <para>
@@ -339,7 +339,7 @@ cube_inter
 
    <para>
     In all binary operations on differently-dimensioned cubes, I assume the
-    lower-dimensional one to be a cartesian projection, i. e., having zeroes
+    lower-dimensional one to be a Cartesian projection, i. e., having zeroes
     in place of coordinates omitted in the string representation. The above
     examples are equivalent to:
    </para>

doc/src/sgml/cvs.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.52 2009/12/07 19:19:56 mha Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.53 2010/08/17 04:37:20 petere Exp $ -->
 
 <appendix id="cvs">
  <appendixinfo>
@@ -35,14 +35,14 @@
  </para>
 
  <para>
-  Using <productname>git</> is the most flexible way to work with the source, and it
+  Using <productname>Git</> is the most flexible way to work with the source, and it
   allows you to work offline without having constant access to the project servers.
-  <productname>rsync</> based <productname>cvs</> also lets you work offline, but
-  lacks many of the other advantages of <productname>git</>.
+  <productname>rsync</> based <productname>CVS</> also lets you work offline, but
+  lacks many of the other advantages of <productname>Git</>.
  </para>
 
  <para>
-  Our Wiki, <ulink
+  Our wiki, <ulink
   url="http://wiki.postgresql.org/wiki/Working_with_CVS"></ulink> and
   <ulink url="http://wiki.postgresql.org/wiki/Working_with_Git"></ulink>,
   has additional details on working with CVS and Git.
@@ -52,7 +52,7 @@
   <title>Getting The Source Via <productname>Git</></title>
 
   <para>
-   With <productname>git</> you will make a copy of the entire code repository
+   With <productname>Git</> you will make a copy of the entire code repository
    to your local machine, so you will have access to all history and branches
    offline. This is the fastest and most flexible way to develop or test
    patches.
@@ -63,35 +63,35 @@
 
    <step>
     <para>
-     You will need an installed version of <productname>git</>, which you can get
+     You will need an installed version of <productname>Git</>, which you can get
      from <ulink url="http://git-scm.com"></ulink>. Many systems also have a recent
-     version of <application>git</> installed by default, or available in their
+     version of <application>Git</> installed by default, or available in their
      package repository system.
     </para>
    </step>
 
    <step>
     <para>
-     To being using the git repository, make a clone of the official mirror:
+     To being using the Git repository, make a clone of the official mirror:
 
 <programlisting>
 git clone git://git.postgresql.org/git/postgresql.git
 </programlisting>
 
      This will copy the full repository to your local machine, so it may take
-     a while to complete, especially if you have a slow internet connection.
+     a while to complete, especially if you have a slow Internet connection.
     </para>
 
     <para>
-     The git mirror can also be reached via the http protocol in case for example
-     a firewall is blocking access to the git protocol. Just replace the URL
+     The Git mirror can also be reached via the HTTP protocol in case for example
+     a firewall is blocking access to the Git protocol. Just replace the URL
      like:
 
 <programlisting>
 git clone http://git.postgresql.org/git/postgresql.git
 </programlisting>
 
-     The http protocol is less efficient than the git protocol, so it will be
+     The HTTP protocol is less efficient than the Git protocol, so it will be
      slightly slower to use.
     </para>
    </step>
@@ -108,7 +108,7 @@ git fetch
    </step>
   </procedure>
   <para>
-   <productname>git</> can do a lot more things than just fetch the source. For
+   <productname>Git</> can do a lot more things than just fetch the source. For
    more information, consult the man pages for the product, or the website at
    <ulink url="http://git-scm.com"></>.
   </para>
@@ -226,7 +226,7 @@ cvs update
    CVS repository.  To work around that deficiency, use
    <productname>cvsutils</productname>, which is packaged in several
    operating systems, and is available in source form at <ulink
-   url="http://www.red-bean.com/cvsutils/"></ulink>, or use <productname>git</>
+   url="http://www.red-bean.com/cvsutils/"></ulink>, or use <productname>Git</>
    or another system designed to work offline.
   </para>
 
@@ -265,7 +265,7 @@ rsync -avzH --delete anoncvs.postgresql.org::pgsql-cvs cvsroot/
 </programlisting>
    For full instructions, see the "rsync" section in the 
    <ulink url="http://pgfoundry.org/docman/view.php/1000040/4/PGBuildFarm-HOWTO.txt">
-   pgbuildfarm instructions</ulink>.
+   PostgreSQL Build Farm instructions</ulink>.
   </para>
  </sect1>
 </appendix>

doc/src/sgml/datatype.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.256 2010/08/10 20:41:27 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.257 2010/08/17 04:37:20 petere Exp $ -->
 
  <chapter id="datatype">
   <title>Data Types</title>
@@ -3792,7 +3792,7 @@ SELECT to_tsvector('english', 'The Fat Rats');
 
     <para>
      A <type>tsquery</type> value stores lexemes that are to be
-     searched for, and combines them honoring the boolean operators
+     searched for, and combines them honoring the Boolean operators
      <literal>&amp;</literal> (AND), <literal>|</literal> (OR), and
      <literal>!</> (NOT).  Parentheses can be used to enforce grouping
      of the operators:

doc/src/sgml/dblink.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.14 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.15 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="dblink">
  <title>dblink</title>
@@ -413,7 +413,7 @@ SELECT *
     extension.)  This allows the system to understand what
     <literal>*</> should expand to, and what <structname>proname</>
     in the <literal>WHERE</> clause refers to, in advance of trying
-    to execute the function.  At runtime, an error will be thrown
+    to execute the function.  At run time, an error will be thrown
     if the actual query result from the remote database does not
     have the same number of columns shown in the <literal>FROM</> clause.
     The column names need not match, however, and <function>dblink</>
@@ -1320,7 +1320,7 @@ dblink_get_notify(text connname) returns setof (notify_name text, be_pid int, ex
 
   <refsect1>
    <title>Return Value</title>
-    <para>Returns setof (notify_name text, be_pid int, extra text), or an empty set if none.</para>
+    <para>Returns <type>setof (notify_name text, be_pid int, extra text)</type>, or an empty set if none.</para>
   </refsect1>
 
   <refsect1>
@@ -1615,7 +1615,7 @@ dblink_get_pkey(text relname) returns setof dblink_pkey_results
 
    <para>
     Returns one row for each primary key field, or no rows if the relation
-    has no primary key.  The result rowtype is defined as
+    has no primary key.  The result row type is defined as
 
 <programlisting>
 CREATE TYPE dblink_pkey_results AS (position int, colname text);

doc/src/sgml/diskusage.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/diskusage.sgml,v 1.20 2010/02/07 20:48:09 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/diskusage.sgml,v 1.21 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="diskusage">
  <title>Monitoring Disk Usage</title>
@@ -52,7 +52,7 @@ SELECT pg_relation_filepath(oid), relpages FROM pg_class WHERE relname = 'custom
 </programlisting>
    Each page is typically 8 kilobytes. (Remember, <structfield>relpages</>
    is only updated by <command>VACUUM</>, <command>ANALYZE</>, and
-   a few DDL commands such as <command>CREATE INDEX</>.)  The file pathname
+   a few DDL commands such as <command>CREATE INDEX</>.)  The file path name
    is of interest if you want to examine the table's disk file directly.
   </para>
 

doc/src/sgml/docguide.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.85 2010/06/12 09:55:12 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.86 2010/08/17 04:37:20 petere Exp $ -->
 
 <appendix id="docguide">
  <title>Documentation</title>
@@ -241,7 +241,7 @@
    <para>
     It's possible that the ports do not update the main catalog file
     in <filename>/usr/local/share/sgml/catalog.ports</filename> or order 
-    isn't proper .  Be sure to have the following lines in begining of file:
+    isn't proper .  Be sure to have the following lines in beginning of file:
 <programlisting>
 CATALOG "openjade/catalog"
 CATALOG "iso8879/catalog"
@@ -306,7 +306,7 @@ make install
         <envar>SGML_CATALOG_FILES</envar> to point to the file
         whenever you use <application>jade</application> later on.
         (This method is also an option if OpenJade is already
-        installed and you want to install the rest of the tool chain
+        installed and you want to install the rest of the toolchain
         locally.)
        </para>
       </step>

doc/src/sgml/earthdistance.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/earthdistance.sgml,v 1.3 2007/12/06 04:12:10 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/earthdistance.sgml,v 1.4 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="earthdistance">
  <title>earthdistance</title>
@@ -12,7 +12,7 @@
   calculating great circle distances on the surface of the Earth. The one
   described first depends on the <filename>cube</> package (which
   <emphasis>must</> be installed before <filename>earthdistance</> can be
-  installed). The second one is based on the built-in <type>point</> datatype,
+  installed). The second one is based on the built-in <type>point</> data type,
   using longitude and latitude for the coordinates.
  </para>
 
@@ -38,7 +38,7 @@
    The radius of the Earth is obtained from the <function>earth()</>
    function. It is given in meters. But by changing this one function you can
    change the module to use some other units, or to use a different value of
-   the radius that you feel is more appropiate.
+   the radius that you feel is more appropriate.
   </para>
 
   <para>

doc/src/sgml/external-projects.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.20 2010/06/07 02:01:08 itagaki Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.21 2010/08/17 04:37:20 petere Exp $ -->
 
  <appendix id="external-projects">
   <title>External Projects</title>
@@ -45,7 +45,7 @@
 
     <listitem>
      <para>
-      <link linkend="ecpg">ecpg</link> is included because it depends on the
+      <link linkend="ecpg">ECPG</link> is included because it depends on the
       server-side SQL grammar, and is therefore sensitive to changes in
       <productname>PostgreSQL</productname> itself.
      </para>

doc/src/sgml/func.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.528 2010/08/15 21:26:36 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.529 2010/08/17 04:37:20 petere Exp $ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
@@ -9658,7 +9658,7 @@ SELECT NULLIF(value, '(none)') ...
 
   <para>
    Array comparisons compare the array contents element-by-element,
-   using the default B-Tree comparison function for the element data type.
+   using the default B-tree comparison function for the element data type.
    In multidimensional arrays the elements are visited in row-major order
    (last subscript varies most rapidly).
    If the contents of two arrays are equal but the dimensionality is
@@ -10179,8 +10179,8 @@ SELECT NULLIF(value, '(none)') ...
 SELECT b1 = ANY((SELECT b2 FROM t2 ...)) FROM t1 ...;
 </programlisting>
       Here <function>ANY</function> can be considered either as introducing
-      a subquery, or as being an aggregate function, if the sub-select
-      returns one row with a boolean value.
+      a subquery, or as being an aggregate function, if the subquery
+      returns one row with a Boolean value.
       Thus the standard name cannot be given to these aggregates.
     </para>
   </note>
@@ -11415,8 +11415,8 @@ AND
    <literal>&gt;</> or
    <literal>&gt;=</>,
    or has semantics similar to one of these.  (To be specific, an operator
-   can be a row comparison operator if it is a member of a B-Tree operator
-   class, or is the negator of the <literal>=</> member of a B-Tree operator
+   can be a row comparison operator if it is a member of a B-tree operator
+   class, or is the negator of the <literal>=</> member of a B-tree operator
    class.)
   </para>
 
@@ -13390,7 +13390,7 @@ postgres=# select pg_start_backup('label_goes_here');
  0/D4445B8
 (1 row)
 </programlisting>
-    There is an optional boolean second parameter.  If <literal>true</>,
+    There is an optional second parameter of type <type>boolean</type>.  If <literal>true</>,
     it specifies executing <function>pg_start_backup</> as quickly as
     possible.  This forces an immediate checkpoint which will cause a
     spike in I/O operations, slowing any concurrently executing queries.
@@ -13767,7 +13767,7 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
 
    <para>
     <function>pg_relation_filepath</> is similar to
-    <function>pg_relation_filenode</>, but it returns the entire file pathname
+    <function>pg_relation_filenode</>, but it returns the entire file path name
     (relative to the database cluster's data directory <varname>PGDATA</>) of
     the relation.
    </para>

doc/src/sgml/fuzzystrmatch.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/fuzzystrmatch.sgml,v 1.7 2010/08/02 23:20:23 rhaas Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/fuzzystrmatch.sgml,v 1.8 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="fuzzystrmatch">
  <title>fuzzystrmatch</title>
@@ -16,7 +16,7 @@
   <para>
    At present, the <function>soundex</>, <function>metaphone</>,
    <function>dmetaphone</>, and <function>dmetaphone_alt</> functions do
-   not work well with multi-byte encodings (such as UTF-8).
+   not work well with multibyte encodings (such as UTF-8).
   </para>
  </caution>
 

doc/src/sgml/gin.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.20 2010/04/03 07:22:54 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.21 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="GIN">
 <title>GIN Indexes</title>
@@ -62,11 +62,10 @@
  <para>
    The four methods that an operator class for
    <acronym>GIN</acronym> must provide are:
- </para>
 
  <variablelist>
     <varlistentry>
-     <term>int compare(Datum a, Datum b)</term>
+     <term><function>int compare(Datum a, Datum b)</></term>
      <listitem>
       <para>
        Compares keys (not indexed values!) and returns an integer less than
@@ -77,7 +76,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>Datum *extractValue(Datum inputValue, int32 *nkeys)</term>
+     <term><function>Datum *extractValue(Datum inputValue, int32 *nkeys)</></term>
      <listitem>
       <para>
        Returns an array of keys given a value to be indexed.  The
@@ -87,8 +86,8 @@
     </varlistentry>
 
     <varlistentry>
-     <term>Datum *extractQuery(Datum query, int32 *nkeys,
-        StrategyNumber n, bool **pmatch, Pointer **extra_data)</term>
+     <term><function>Datum *extractQuery(Datum query, int32 *nkeys,
+        StrategyNumber n, bool **pmatch, Pointer **extra_data)</></term>
      <listitem>
       <para>
        Returns an array of keys given a value to be queried; that is,
@@ -109,7 +108,7 @@
        so the index scan can be skipped entirely.
        <literal>pmatch</> is an output argument for use when partial match
        is supported.  To use it, <function>extractQuery</> must allocate
-       an array of <literal>*nkeys</> booleans and store its address at
+       an array of <literal>*nkeys</> Booleans and store its address at
        <literal>*pmatch</>.  Each element of the array should be set to TRUE
        if the corresponding key requires partial match, FALSE if not.
        If <literal>*pmatch</> is set to NULL then GIN assumes partial match
@@ -133,8 +132,8 @@
     </varlistentry>
 
     <varlistentry>
-     <term>bool consistent(bool check[], StrategyNumber n, Datum query,
-                           int32 nkeys, Pointer extra_data[], bool *recheck)</term>
+     <term><function>bool consistent(bool check[], StrategyNumber n, Datum query,
+                           int32 nkeys, Pointer extra_data[], bool *recheck)</></term>
      <listitem>
       <para>
        Returns TRUE if the indexed value satisfies the query operator with
@@ -156,19 +155,15 @@
       </para>
      </listitem>
     </varlistentry>
-
   </variablelist>
 
- <para>
   Optionally, an operator class for
   <acronym>GIN</acronym> can supply a fifth method:
- </para>
 
   <variablelist>
-
     <varlistentry>
-     <term>int comparePartial(Datum partial_key, Datum key, StrategyNumber n,
-                              Pointer extra_data)</term>
+     <term><function>int comparePartial(Datum partial_key, Datum key, StrategyNumber n,
+                              Pointer extra_data)</></term>
      <listitem>
       <para>
        Compare a partial-match query to an index key.  Returns an integer
@@ -184,8 +179,8 @@
       </para>
      </listitem>
     </varlistentry>
-
   </variablelist>
+ </para>
 
  <para>
   To support <quote>partial match</> queries, an operator class must
@@ -408,37 +403,37 @@
   feature.
   The following <filename>contrib</> modules also contain
   <acronym>GIN</acronym> operator classes:
- </para>
 
  <variablelist>
   <varlistentry>
-   <term>btree-gin</term>
+   <term><filename>btree_gin</></term>
    <listitem>
-    <para>B-Tree equivalent functionality for several data types</para>
+    <para>B-tree equivalent functionality for several data types</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>hstore</term>
+   <term><filename>hstore</></term>
    <listitem>
     <para>Module for storing (key, value) pairs</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>intarray</term>
+   <term><filename>intarray</></term>
    <listitem>
-    <para>Enhanced support for int4[]</para>
+    <para>Enhanced support for <type>int[]</type></para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>pg_trgm</term>
+   <term><filename>pg_trgm</></term>
    <listitem>
     <para>Text similarity using trigram matching</para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </para>
 </sect1>
 
 </chapter>

doc/src/sgml/gist.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/gist.sgml,v 1.31 2009/06/12 19:48:53 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/gist.sgml,v 1.32 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="GiST">
 <title>GiST Indexes</title>
@@ -102,7 +102,7 @@
    <function>decompress</>, which allow an index to have internal tree data of
    a different type than the data it indexes. The leaves are to be of the
    indexed data type, while the other tree nodes can be of any C struct (but
-   you still have to follow <productname>PostgreSQL</> datatype rules here,
+   you still have to follow <productname>PostgreSQL</> data type rules here,
    see about <literal>varlena</> for variable sized data). If the tree's
    internal data type exists at the SQL level, the <literal>STORAGE</> option
    of the <command>CREATE OPERATOR CLASS</> command can be used.
@@ -561,7 +561,7 @@ my_same(PG_FUNCTION_ARGS)
 </programlisting>
 
         For historical reasons, the <function>same</> function doesn't
-        just return a boolean result; instead it has to store the flag
+        just return a Boolean result; instead it has to store the flag
         at the location indicated by the third argument.
       </para>
      </listitem>
@@ -583,58 +583,58 @@ my_same(PG_FUNCTION_ARGS)
   (see <filename>src/backend/access/gist/gistproc.c</>).  The following
   <filename>contrib</> modules also contain <acronym>GiST</acronym>
   operator classes:
- </para>
 
  <variablelist>
   <varlistentry>
-   <term>btree_gist</term>
+   <term><filename>btree_gist</></term>
    <listitem>
-    <para>B-Tree equivalent functionality for several data types</para>
+    <para>B-tree equivalent functionality for several data types</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>cube</term>
+   <term><filename>cube</></term>
    <listitem>
     <para>Indexing for multidimensional cubes</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>hstore</term>
+   <term><filename>hstore</></term>
    <listitem>
     <para>Module for storing (key, value) pairs</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>intarray</term>
+   <term><filename>intarray</></term>
    <listitem>
     <para>RD-Tree for one-dimensional array of int4 values</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>ltree</term>
+   <term><filename>ltree</></term>
    <listitem>
     <para>Indexing for tree-like structures</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>pg_trgm</term>
+   <term><filename>pg_trgm</></term>
    <listitem>
     <para>Text similarity using trigram matching</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term>seg</term>
+   <term><filename>seg</></term>
    <listitem>
     <para>Indexing for <quote>float ranges</quote></para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </para>
 
 </sect1>
 

doc/src/sgml/high-availability.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.78 2010/07/14 22:04:21 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.79 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -449,7 +449,7 @@ protocol to make nodes agree on a serializable transactional order.
      part of the query and return results to a central server where they
      are combined and returned to the user.  <productname>Pgpool-II</>
      has this capability.  Also, this can be implemented using the
-     <productname>PL/Proxy</> toolset.
+     <productname>PL/Proxy</> tool set.
     </para>
 
    </listitem>
@@ -602,21 +602,21 @@ protocol to make nodes agree on a serializable transactional order.
     At startup, the standby begins by restoring all WAL available in the
     archive location, calling <varname>restore_command</>. Once it
     reaches the end of WAL available there and <varname>restore_command</>
-    fails, it tries to restore any WAL available in the pg_xlog directory.
+    fails, it tries to restore any WAL available in the <filename>pg_xlog</> directory.
     If that fails, and streaming replication has been configured, the
     standby tries to connect to the primary server and start streaming WAL
-    from the last valid record found in archive or pg_xlog. If that fails
+    from the last valid record found in archive or <filename>pg_xlog</>. If that fails
     or streaming replication is not configured, or if the connection is
     later disconnected, the standby goes back to step 1 and tries to
     restore the file from the archive again. This loop of retries from the
-    archive, pg_xlog, and via streaming replication goes on until the server
+    archive, <filename>pg_xlog</>, and via streaming replication goes on until the server
     is stopped or failover is triggered by a trigger file.
    </para>
 
    <para>
     Standby mode is exited and the server switches to normal operation,
     when a trigger file is found (<varname>trigger_file</>). Before failover,
-    any WAL immediately available in the archive or in pg_xlog will be
+    any WAL immediately available in the archive or in <filename>pg_xlog</> will be
     restored, but no attempt is made to connect to the master.
    </para>
   </sect2>
@@ -753,7 +753,7 @@ trigger_file = '/path/to/trigger_file'
     too early, while the standby might still need them to catch up. If the
     standby falls behind too much, it needs to be reinitialized from a new
     base backup. If you set up a WAL archive that's accessible from the
-    standby, wal_keep_segments is not required as the standby can always
+    standby, <varname>wal_keep_segments</> is not required as the standby can always
     use the archive to catch up.
    </para>
 
@@ -1743,7 +1743,7 @@ LOG:  database system is ready to accept read only connections
    </para>
 
    <para>
-    New oids cannot be assigned, though some <acronym>UUID</> generators may still
+    New OIDs cannot be assigned, though some <acronym>UUID</> generators may still
     work as long as they do not rely on writing new status to the database.
    </para>
 

doc/src/sgml/hstore.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.13 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.14 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="hstore">
  <title>hstore</title>
@@ -214,7 +214,7 @@ key =&gt; NULL
    and <literal>&lt;@</> were called <literal>@</> and <literal>~</>,
    respectively. These names are still available, but are deprecated and will
    eventually be removed. Notice that the old names are reversed from the
-   convention formerly followed by the core geometric datatypes!
+   convention formerly followed by the core geometric data types!
    </para>
   </note>
 
@@ -409,7 +409,7 @@ b
    <para>
     The function <function>populate_record</function> is actually declared
     with <type>anyelement</>, not <type>record</>, as its first argument,
-    but it will reject non-record types with a runtime error.
+    but it will reject non-record types with a run-time error.
    </para>
   </note>
  </sect2>

doc/src/sgml/indexam.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.34 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.35 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="indexam">
  <title>Index Access Method Interface Definition</title>
@@ -189,7 +189,7 @@ aminsert (Relation indexRelation,
   </para>
 
   <para>
-   The function's boolean result value is significant only when
+   The function's Boolean result value is significant only when
    <literal>checkUnique</> is <literal>UNIQUE_CHECK_PARTIAL</>.
    In this case a TRUE result means the new entry is known unique, whereas
    FALSE means it might be non-unique (and a deferred uniqueness check must
@@ -366,7 +366,7 @@ amgetbitmap (IndexScanDesc scan,
              TIDBitmap *tbm);
 </programlisting>
    Fetch all tuples in the given scan and add them to the caller-supplied
-   TIDBitmap (that is, OR the set of tuple IDs into whatever set is already
+   <type>TIDBitmap</type> (that is, OR the set of tuple IDs into whatever set is already
    in the bitmap).  The number of tuples fetched is returned (this might be
    just an approximate count, for instance some AMs do not detect duplicates).
    While inserting tuple IDs into the bitmap, <function>amgetbitmap</> can
@@ -820,19 +820,19 @@ amrestrpos (IndexScanDesc scan);
   <title>Index Cost Estimation Functions</title>
 
   <para>
-   The amcostestimate function is given a list of WHERE clauses that have
+   The <function>amcostestimate</> function is given a list of WHERE clauses that have
    been determined to be usable with the index.  It must return estimates
    of the cost of accessing the index and the selectivity of the WHERE
    clauses (that is, the fraction of parent-table rows that will be
    retrieved during the index scan).  For simple cases, nearly all the
    work of the cost estimator can be done by calling standard routines
-   in the optimizer; the point of having an amcostestimate function is
+   in the optimizer; the point of having an <function>amcostestimate</> function is
    to allow index access methods to provide index-type-specific knowledge,
    in case it is possible to improve on the standard estimates.
   </para>
 
   <para>
-   Each amcostestimate function must have the signature:
+   Each <function>amcostestimate</> function must have the signature:
 
 <programlisting>
 void
@@ -850,7 +850,7 @@ amcostestimate (PlannerInfo *root,
 
    <variablelist>
     <varlistentry>
-     <term>root</term>
+     <term><parameter>root</></term>
      <listitem>
       <para>
        The planner's information about the query being processed.
@@ -859,7 +859,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term>index</term>
+     <term><parameter>index</></term>
      <listitem>
       <para>
        The index being considered.
@@ -868,23 +868,23 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term>indexQuals</term>
+     <term><parameter>indexQuals</></term>
      <listitem>
       <para>
        List of index qual clauses (implicitly ANDed);
-       a NIL list indicates no qualifiers are available.
+       a <symbol>NIL</> list indicates no qualifiers are available.
        Note that the list contains expression trees, not ScanKeys.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term>outer_rel</term>
+     <term><parameter>outer_rel</></term>
      <listitem>
       <para>
        If the index is being considered for use in a join inner indexscan,
        the planner's information about the outer side of the join.  Otherwise
-       NULL.  When non-NULL, some of the qual clauses will be join clauses
+       <symbol>NULL</>.  When non-<symbol>NULL</>, some of the qual clauses will be join clauses
        with this rel rather than being simple restriction clauses.  Also,
        the cost estimator should expect that the index scan will be repeated
        for each row of the outer rel.
@@ -899,7 +899,7 @@ amcostestimate (PlannerInfo *root,
 
    <variablelist>
     <varlistentry>
-     <term>*indexStartupCost</term>
+     <term><parameter>*indexStartupCost</></term>
      <listitem>
       <para>
        Set to cost of index start-up processing
@@ -908,7 +908,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term>*indexTotalCost</term>
+     <term><parameter>*indexTotalCost</></term>
      <listitem>
       <para>
        Set to total cost of index processing
@@ -917,7 +917,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term>*indexSelectivity</term>
+     <term><parameter>*indexSelectivity</></term>
      <listitem>
       <para>
        Set to index selectivity
@@ -926,7 +926,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term>*indexCorrelation</term>
+     <term><parameter>*indexCorrelation</></term>
      <listitem>
       <para>
        Set to correlation coefficient between index scan order and
@@ -951,7 +951,7 @@ amcostestimate (PlannerInfo *root,
    row should usually be taken as <varname>cpu_index_tuple_cost</>.  In
    addition, an appropriate multiple of <varname>cpu_operator_cost</> should
    be charged for any comparison operators invoked during index processing
-   (especially evaluation of the indexQuals themselves).
+   (especially evaluation of the <literal>indexQuals</> themselves).
   </para>
 
   <para>
@@ -968,14 +968,14 @@ amcostestimate (PlannerInfo *root,
   </para>
 
   <para>
-   The indexSelectivity should be set to the estimated fraction of the parent
+   The <parameter>indexSelectivity</> should be set to the estimated fraction of the parent
    table rows that will be retrieved during the index scan.  In the case
    of a lossy query, this will typically be higher than the fraction of
    rows that actually pass the given qual conditions.
   </para>
 
   <para>
-   The indexCorrelation should be set to the correlation (ranging between
+   The <parameter>indexCorrelation</> should be set to the correlation (ranging between
    -1.0 and 1.0) between the index order and the table order.  This is used
    to adjust the estimate for the cost of fetching rows from the parent
    table.
@@ -1009,16 +1009,16 @@ amcostestimate (PlannerInfo *root,
    <step>
     <para>
      Estimate the number of index rows that will be visited during the
-     scan.  For many index types this is the same as indexSelectivity times
+     scan.  For many index types this is the same as <parameter>indexSelectivity</> times
      the number of rows in the index, but it might be more.  (Note that the
-     index's size in pages and rows is available from the IndexOptInfo struct.)
+     index's size in pages and rows is available from the <structname>IndexOptInfo</> struct.)
     </para>
    </step>
 
    <step>
     <para>
      Estimate the number of index pages that will be retrieved during the scan.
-     This might be just indexSelectivity times the index's size in pages.
+     This might be just <parameter>indexSelectivity</> times the index's size in pages.
     </para>
    </step>
 

doc/src/sgml/indices.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.81 2010/04/03 07:22:54 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/indices.sgml,v 1.82 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="indexes">
  <title>Indexes</title>
@@ -92,9 +92,9 @@ CREATE INDEX test1_id_index ON test1 (id);
 
   <para>
    Creating an index on a large table can take a long time.  By default,
-   <productname>PostgreSQL</productname> allows reads (selects) to occur
-   on the table in parallel with index creation, but writes (INSERTs,
-   UPDATEs, DELETEs) are blocked until the index build is finished.
+   <productname>PostgreSQL</productname> allows reads (<command>SELECT</command> statements) to occur
+   on the table in parallel with index creation, but writes (<command>INSERT</command>,
+   <command>UPDATE</command>, <command>DELETE</command>) are blocked until the index build is finished.
    In production environments this is often unacceptable.
    It is possible to allow writes to occur in parallel with index
    creation, but there are several caveats to be aware of &mdash;

doc/src/sgml/installation.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.350 2010/07/29 18:29:52 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.351 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -2471,7 +2471,7 @@ createlang: language installation failed: ERROR:  could not load library "/opt/d
 
      <listitem>
       <para>
-       The GNU make command is called "make" not "gmake".
+       The GNU make command is called <command>make</command>, not <command>gmake</command>.
       </para>
      </listitem>
 
@@ -2982,7 +2982,7 @@ configure ... LDFLAGS="-R /usr/sfw/lib:/opt/sfw/lib:/usr/local/lib"
      On Solaris 7 and older, the 64-bit version of libc has a buggy
      <function>vsnprintf</function> routine, which leads to erratic
      core dumps in PostgreSQL.  The simplest known workaround is to
-     force PostgreSQL to use its own version of vsnprintf rather than
+     force PostgreSQL to use its own version of <function>vsnprintf</function> rather than
      the library copy.  To do this, after you
      run <command>configure</command> edit a file produced by
      <command>configure</command>:
@@ -3044,7 +3044,7 @@ LIBOBJS = snprintf.o
     </para>
 
     <para>
-     If you see the linking of the postgres executable abort with an
+     If you see the linking of the <command>postgres</command> executable abort with an
      error message like:
 <screen>
 Undefined                       first referenced

doc/src/sgml/intarray.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.11 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.12 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="intarray">
  <title>intarray</title>
@@ -207,7 +207,7 @@
    <literal>&lt;@</> were respectively called <literal>@</> and <literal>~</>.
    These names are still available, but are deprecated and will eventually be
    retired.  Notice that the old names are reversed from the convention
-   formerly followed by the core geometric datatypes!)
+   formerly followed by the core geometric data types!)
   </para>
 
   <para>

doc/src/sgml/isn.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/isn.sgml,v 1.7 2010/08/10 20:42:01 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/isn.sgml,v 1.8 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="isn">
  <title>isn</title>
@@ -214,7 +214,7 @@
 
   <para>
    The <filename>isn</> module provides the standard comparison operators,
-   plus btree and hash indexing support for all these datatypes.  In
+   plus B-tree and hash indexing support for all these data types.  In
    addition there are several specialized functions; shown in <xref linkend="isn-functions">.
    In this table,
    <type>isn</> means any one of the module's data types.
@@ -375,7 +375,7 @@ SELECT isbn13(id) FROM test;
 
   <para>
    This module was inspired by Garrett A. Wollman's
-   isbn_issn code.
+   <filename>isbn_issn</> code.
   </para>
  </sect2>
 

doc/src/sgml/lo.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/lo.sgml,v 1.4 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/lo.sgml,v 1.5 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="lo">
  <title>lo</title>
@@ -19,7 +19,7 @@
   <para>
    One of the problems with the JDBC driver (and this affects the ODBC driver
    also), is that the specification assumes that references to BLOBs (Binary
-   Large OBjects) are stored within a table, and if that entry is changed, the
+   Large Objects) are stored within a table, and if that entry is changed, the
    associated BLOB is deleted from the database.
   </para>
 

doc/src/sgml/ltree.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/ltree.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ltree.sgml,v 1.6 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="ltree">
  <title>ltree</title>
@@ -42,7 +42,7 @@
   </para>
 
   <para>
-   The <filename>ltree</> module provides several datatypes:
+   The <filename>ltree</> module provides several data types:
   </para>
 
   <itemizedlist>

doc/src/sgml/monitoring.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.83 2010/08/14 02:22:10 rhaas Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.84 2010/08/17 04:37:20 petere Exp $ -->
 
 <chapter id="monitoring">
  <title>Monitoring Database Activity</title>
@@ -807,7 +807,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_activity</function>(<type>integer</type>)</literal></entry>
       <entry><type>setof record</type></entry>
       <entry>
-       Returns a record of information about the backend with the specified pid, or
+       Returns a record of information about the backend with the specified PID, or
        one record for each active backend in the system if <symbol>NULL</symbol> is
        specified. The fields returned are a subset of those in the
        <structname>pg_stat_activity</structname> view.

doc/src/sgml/oid2name.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/oid2name.sgml,v 1.9 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/oid2name.sgml,v 1.10 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="oid2name">
  <title>oid2name</title>
@@ -105,7 +105,7 @@
 
     <varlistentry>
      <term><option>-U</option> <replaceable>username</></term>
-     <listitem><para>username to connect as</para></listitem>
+     <listitem><para>user name to connect as</para></listitem>
     </varlistentry>
 
     <varlistentry>
@@ -122,8 +122,8 @@
    using <option>-o</>, <option>-f</> and/or <option>-t</>.
    <option>-o</> takes an OID,
    <option>-f</> takes a filenode,
-   and <option>-t</> takes a tablename (actually, it's a LIKE
-   pattern, so you can use things like <option>foo%</>).
+   and <option>-t</> takes a table name (actually, it's a <literal>LIKE</>
+   pattern, so you can use things like <literal>foo%</>).
    You can use as many
    of these options as you like, and the listing will include all objects
    matched by any of the options.  But note that these options can only

doc/src/sgml/pageinspect.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pageinspect.sgml,v 1.7 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pageinspect.sgml,v 1.8 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="pageinspect">
  <title>pageinspect</title>
@@ -107,7 +107,7 @@ test=# SELECT * FROM heap_page_items(get_raw_page('pg_class', 0));
 
     <listitem>
      <para>
-      <function>bt_metap</function> returns information about a btree
+      <function>bt_metap</function> returns information about a B-tree
       index's metapage.  For example:
 <screen>
 test=# SELECT * FROM bt_metap('pg_cast_oid_index');
@@ -131,7 +131,7 @@ fastlevel | 0
     <listitem>
      <para>
       <function>bt_page_stats</function> returns summary information about
-      single pages of btree indexes.  For example:
+      single pages of B-tree indexes.  For example:
 <screen>
 test=# SELECT * FROM bt_page_stats('pg_cast_oid_index', 1);
 -[ RECORD 1 ]-+-----
@@ -159,7 +159,7 @@ btpo_flags    | 3
     <listitem>
      <para>
       <function>bt_page_items</function> returns detailed information about
-      all of the items on a btree index page.  For example:
+      all of the items on a B-tree index page.  For example:
 <screen>
 test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
  itemoffset |  ctid   | itemlen | nulls | vars |    data
@@ -185,7 +185,7 @@ test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
     <listitem>
      <para>
       <function>fsm_page_contents</function> shows the internal node structure
-      of a FSM page. The output is a multi-line string, with one line per
+      of a FSM page. The output is a multiline string, with one line per
       node in the binary tree within the page. Only those nodes that are not
       zero are printed. The so-called "next" pointer, which points to the
       next slot to be returned from the page, is also printed.

doc/src/sgml/pgarchivecleanup.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgarchivecleanup.sgml,v 1.3 2010/08/15 20:20:30 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgarchivecleanup.sgml,v 1.4 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="pgarchivecleanup">
  <title>pg_archivecleanup</title>
@@ -61,11 +61,11 @@ pg_archivecleanup <optional> <replaceable>option</> ... </optional> <replaceable
 </synopsis>
    When used as a standalone program all WAL files logically preceding the 
    <literal>restartwalfile</> will be removed <replaceable>archivelocation</>.
-   In this mode, if you specify a .backup filename, then only the file prefix
+   In this mode, if you specify a <filename>.backup</> file name, then only the file prefix
    will be used as the <literal>restartwalfile</>. This allows you to remove
    all WAL files archived prior to a specific base backup without error.
    For example, the following example will remove all files older than
-   WAL filename 000000010000003700000010:
+   WAL file name <filename>000000010000003700000010</>:
 <programlisting>
 pg_archivecleanup -d archive 000000010000003700000010.00000020.backup
 

doc/src/sgml/pgbench.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbench.sgml,v 1.19 2010/08/15 19:46:24 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbench.sgml,v 1.20 2010/08/17 04:37:20 petere Exp $ -->
 
 <sect1 id="pgbench">
  <title>pgbench</title>
@@ -242,7 +242,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <term><option>-l</option></term>
       <listitem>
        <para>
-        Write the time taken by each transaction to a logfile.
+        Write the time taken by each transaction to a log file.
         See below for details.
        </para>
       </listitem>
@@ -380,7 +380,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <term><option>-h</option> <replaceable>hostname</></term>
       <listitem>
        <para>
-        The database server's hostname
+        The database server's host name
        </para>
       </listitem>
      </varlistentry>
@@ -398,7 +398,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <term><option>-U</option> <replaceable>login</></term>
       <listitem>
        <para>
-        The username to connect as
+        The user name to connect as
        </para>
       </listitem>
      </varlistentry>
@@ -447,7 +447,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   </para>
 
   <para>
-   The format of a script file is one SQL command per line; multi-line
+   The format of a script file is one SQL command per line; multiline
    SQL commands are not supported.  Empty lines and lines beginning with
    <literal>--</> are ignored.  Script file lines can also be
    <quote>meta commands</>, which are interpreted by <application>pgbench</>
@@ -626,7 +626,7 @@ END;
 
   <para>
    With the <literal>-l</> option, <application>pgbench</> writes the time
-   taken by each transaction to a logfile.  The logfile will be named
+   taken by each transaction to a log file.  The log file will be named
    <filename>pgbench_log.<replaceable>nnn</></filename>, where
    <replaceable>nnn</> is the PID of the pgbench process.
    If the <literal>-j</> option is 2 or higher, creating multiple worker

doc/src/sgml/pgcrypto.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.12 2010/08/15 01:57:03 rhaas Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.13 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="pgcrypto">
  <title>pgcrypto</title>
@@ -519,7 +519,7 @@ pgp_sym_decrypt_bytea(msg bytea, psw text [, options text ]) returns bytea
     Decrypt a symmetric-key-encrypted PGP message.
    </para>
    <para>
-    Decrypting bytea data with <function>pgp_sym_decrypt</> is disallowed.
+    Decrypting <type>bytea</> data with <function>pgp_sym_decrypt</> is disallowed.
     This is to avoid outputting invalid character data.  Decrypting
     originally textual data with <function>pgp_sym_decrypt_bytea</> is fine.
    </para>
@@ -561,7 +561,7 @@ pgp_pub_decrypt_bytea(msg bytea, key bytea [, psw text [, options text ]]) retur
     options, you need to give an empty password.
    </para>
    <para>
-    Decrypting bytea data with <function>pgp_pub_decrypt</> is disallowed.
+    Decrypting <type>bytea</> data with <function>pgp_pub_decrypt</> is disallowed.
     This is to avoid outputting invalid character data.  Decrypting
     originally textual data with <function>pgp_pub_decrypt_bytea</> is fine.
    </para>
@@ -621,7 +621,7 @@ armor(data bytea) returns text
 dearmor(data text) returns bytea
 </synopsis>
    <para>
-    These functions wrap/unwrap binary data into PGP Ascii Armor format,
+    These functions wrap/unwrap binary data into PGP ASCII-armor format,
     which is basically Base64 with CRC and additional formatting.
    </para>
   </sect3>
@@ -825,13 +825,13 @@ gpg --list-secret-keys
 </programlisting>
   </para>
   <para>
-   To export a public key in ascii-armor format:
+   To export a public key in ASCII-armor format:
 <programlisting>
 gpg -a --export KEYID > public.key
 </programlisting>
   </para>
   <para>
-   To export a secret key in ascii-armor format:
+   To export a secret key in ASCII-armor format:
 <programlisting>
 gpg -a --export-secret-keys KEYID > secret.key
 </programlisting>
@@ -1206,7 +1206,7 @@ gen_random_bytes(count integer) returns bytea
     </listitem>
     <listitem>
      <para><ulink url="http://jlcooke.ca/random/"></ulink></para>
-     <para>Jean-Luc Cooke Fortuna-based /dev/random driver for Linux.</para>
+     <para>Jean-Luc Cooke Fortuna-based <filename>/dev/random</> driver for Linux.</para>
     </listitem>
     <listitem>
      <para><ulink url="http://research.cyber.ee/~lipmaa/crypto/"></ulink></para>

doc/src/sgml/pgfreespacemap.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgfreespacemap.sgml,v 2.7 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgfreespacemap.sgml,v 2.8 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="pgfreespacemap">
  <title>pg_freespacemap</title>
@@ -33,7 +33,6 @@
      <para>
       Returns the amount of free space on the page of the relation, specified
       by <literal>blkno</>, according to the FSM.
-      (blkno).
      </para>
     </listitem>
    </varlistentry>
@@ -56,7 +55,7 @@
 
   <para>
    The values stored in the free space map are not exact. They're rounded
-   to precision of 1/256th of BLCKSZ (32 bytes with default BLCKSZ), and
+   to precision of 1/256th of <symbol>BLCKSZ</> (32 bytes with default <symbol>BLCKSZ</>), and
    they're not kept fully up-to-date as tuples are inserted and updated.
   </para>
 

doc/src/sgml/pgstandby.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.12 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.13 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="pgstandby">
  <title>pg_standby</title>
@@ -202,7 +202,7 @@ pg_standby <optional> <replaceable>option</> ... </optional> <replaceable>archiv
       <listitem>
        <para>
         Specify a trigger file whose presence should cause failover.
-        It is recommended that you use a structured filename to
+        It is recommended that you use a structured file name to
         avoid confusion as to which server is being triggered
         when multiple servers exist on the same system; for example
         <filename>/tmp/pgsql.trigger.5432</>.
@@ -326,7 +326,7 @@ recovery_end_command = 'del C:\pgsql.trigger.5442'
 
   <para>
    The <literal>copy</> command on Windows sets the final file size
-   before the file is completely copied, which would ordinarly confuse
+   before the file is completely copied, which would ordinarily confuse
    <application>pg_standby</application>.  Therefore
    <application>pg_standby</application> waits <literal>sleeptime</>
    seconds once it sees the proper file size.  GNUWin32's <literal>cp</>

doc/src/sgml/pgstattuple.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstattuple.sgml,v 1.7 2010/08/10 20:42:01 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstattuple.sgml,v 1.8 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="pgstattuple">
  <title>pgstattuple</title>
@@ -140,7 +140,7 @@ free_percent       | 1.95
     <listitem>
      <para>
       <function>pgstatindex</function> returns a record showing information
-      about a btree index.  For example:
+      about a B-tree index.  For example:
 <programlisting>
 test=> SELECT * FROM pgstatindex('pg_cast_oid_index');
 -[ RECORD 1 ]------+------
@@ -174,7 +174,7 @@ leaf_fragmentation | 0
        <row>
         <entry><structfield>version</structfield></entry>
         <entry><type>integer</type></entry>
-        <entry>Btree version number</entry>
+        <entry>B-tree version number</entry>
        </row>
 
        <row>

doc/src/sgml/pgtrgm.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgtrgm.sgml,v 2.3 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgtrgm.sgml,v 2.4 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="pgtrgm">
  <title>pg_trgm</title>
@@ -130,7 +130,7 @@
    operator classes that allow you to create an index over a text column for
    the purpose of very fast similarity searches.  These index types support
    the <literal>%</> similarity operator (and no other operators, so you may
-   want a regular btree index too).
+   want a regular B-tree index too).
   </para>
 
   <para>

doc/src/sgml/planstats.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/planstats.sgml,v 1.10 2010/07/13 20:57:19 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/planstats.sgml,v 1.11 2010/08/17 04:37:21 petere Exp $ -->
 
 <chapter id="planner-stats-details">
  <title>How the Planner Uses Statistics</title>
@@ -428,7 +428,7 @@ rows = (outer_cardinality * inner_cardinality) * selectivity
    the unmodified size of <structname>tenk2</>.  It might appear from
    inspection of the <command>EXPLAIN</> output that the estimate of
    join rows comes from 50 * 1, that is, the number of outer rows times
-   the estimated number of rows obtained by each inner indexscan on
+   the estimated number of rows obtained by each inner index scan on
    <structname>tenk2</>.  But this is not the case: the join relation size
    is estimated before any particular join plan has been considered.  If
    everything is working well then the two ways of estimating the join

doc/src/sgml/plperl.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.87 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.88 2010/08/17 04:37:21 petere Exp $ -->
 
  <chapter id="plperl">
   <title>PL/Perl - Perl Procedural Language</title>
@@ -694,7 +694,7 @@ SELECT release_hosts_query();
      <listitem>
       <para>
         Return the unescaped binary data represented by the contents of the given string,
-        which should be bytea encoded.
+        which should be <type>bytea</type> encoded.
         </para>
      </listitem>
     </varlistentry>
@@ -708,7 +708,7 @@ SELECT release_hosts_query();
      <term><literal><function>encode_bytea</>(<replaceable>string</replaceable>)</literal></term>
      <listitem>
       <para>
-        Return the bytea encoded form of the binary data contents of the given string.
+        Return the <type>bytea</type> encoded form of the binary data contents of the given string.
         </para>
      </listitem>
     </varlistentry>

doc/src/sgml/plpgsql.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.157 2010/08/09 02:25:05 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.158 2010/08/17 04:37:21 petere Exp $ -->
 
 <chapter id="plpgsql">
   <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
@@ -1842,7 +1842,7 @@ END CASE;
 
       <para>
        The searched form of <command>CASE</> provides conditional execution
-       based on truth of boolean expressions.  Each <literal>WHEN</> clause's
+       based on truth of Boolean expressions.  Each <literal>WHEN</> clause's
        <replaceable>boolean-expression</replaceable> is evaluated in turn,
        until one is found that yields <literal>true</>.  Then the
        corresponding <replaceable>statements</replaceable> are executed, and

doc/src/sgml/ref/alter_opfamily.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.7 2010/04/03 07:22:57 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.8 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -240,7 +240,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
    Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</>
    clause could include a <literal>RECHECK</> option.  This is no longer
    supported because whether an index operator is <quote>lossy</> is now
-   determined on-the-fly at runtime.  This allows efficient handling of
+   determined on-the-fly at run time.  This allows efficient handling of
    cases where an operator might or might not be lossy.
   </para>
  </refsect1>

doc/src/sgml/ref/alter_role.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.17 2010/04/21 20:54:19 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.18 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -86,7 +86,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ IN DATABASE <repl
    the named database. Whenever the role subsequently
    starts a new session, the specified value becomes the session
    default, overriding whatever setting is present in
-   <filename>postgresql.conf</> or has been received from the postgres
+   <filename>postgresql.conf</> or has been received from the <command>postgres</command>
    command line. This only happens at login time; executing
    <xref linkend="sql-set-role"> or
    <xref linkend="sql-set-session-authorization"> does not cause new

doc/src/sgml/ref/create_opclass.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.25 2010/04/03 07:22:58 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.26 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -250,7 +250,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
    Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</>
    clause could include a <literal>RECHECK</> option.  This is no longer
    supported because whether an index operator is <quote>lossy</> is now
-   determined on-the-fly at runtime.  This allows efficient handling of
+   determined on-the-fly at run time.  This allows efficient handling of
    cases where an operator might or might not be lossy.
   </para>
  </refsect1>

doc/src/sgml/ref/create_table.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.130 2010/07/26 01:43:52 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.131 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -512,7 +512,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE [ IF NOT EXISTS ] <repl
       The access method must support <literal>amgettuple</> (see <xref
       linkend="indexam">); at present this means <acronym>GIN</>
       cannot be used.  Although it's allowed, there is little point in using
-      btree or hash indexes with an exclusion constraint, because this
+      B-tree or hash indexes with an exclusion constraint, because this
       does nothing that an ordinary unique constraint doesn't do better.
       So in practice the access method will always be <acronym>GiST</>.
      </para>

doc/src/sgml/ref/create_trigger.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.53 2010/04/03 07:23:00 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.54 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -74,7 +74,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
   </para>
 
   <para>
-   Also, a trigger definition can specify a boolean <literal>WHEN</>
+   Also, a trigger definition can specify a Boolean <literal>WHEN</>
    condition, which will be tested to see whether the trigger should
    be fired.  In row-level triggers the <literal>WHEN</> condition can
    examine the old and/or new values of columns of the row.  Statement-level

doc/src/sgml/ref/pg_ctl-ref.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.51 2010/06/22 16:19:36 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.52 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -402,8 +402,8 @@ PostgreSQL documentation
 
     <listitem>
      <para>
-      Default hostname or Unix-domain socket location for <xref
-      linkend="app-psql"> (used by the -w option).
+      Default host name or Unix-domain socket location for <xref
+      linkend="app-psql"> (used by the <option>-w</option> option).
      </para>
     </listitem>
    </varlistentry>
@@ -413,7 +413,7 @@ PostgreSQL documentation
 
     <listitem>
      <para>
-      Default port number for <xref linkend="app-psql"> (used by the -w option).
+      Default port number for <xref linkend="app-psql"> (used by the <option>-w</option> option).
      </para>
     </listitem>
    </varlistentry>

doc/src/sgml/ref/pg_dumpall.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.83 2010/07/22 01:22:33 rhaas Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.84 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -406,8 +406,8 @@ PostgreSQL documentation
        <para>
          Specifies the name of the database to connect to to dump global
          objects and discover what other databases should be dumped. If
-         not specified, the <quote>postgres</quote> database will be used,
-         and if that does not exist, <quote>template1</quote> will be used.
+         not specified, the <literal>postgres</literal> database will be used,
+         and if that does not exist, <literal>template1</literal> will be used.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/pg_restore.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.87 2010/05/15 18:11:07 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.88 2010/08/17 04:37:21 petere Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -221,7 +221,7 @@
         create indexes, or create constraints &mdash; using multiple
         concurrent jobs.  This option can dramatically reduce the time
         to restore a large database to a server running on a
-        multi-processor machine.
+        multiprocessor machine.
        </para>
 
        <para>

doc/src/sgml/ref/psql-ref.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.249 2010/08/14 13:59:49 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.250 2010/08/17 04:37:21 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -1043,7 +1043,7 @@ testdb=&gt;
         If <replaceable class="parameter">pattern</replaceable> is
         specified, only those servers whose name matches the pattern
         are listed.  If the form <literal>\des+</literal> is used, a
-        full desription of each server is shown, including the
+        full description of each server is shown, including the
         server's ACL, type, version, and options.
         </para>
         </listitem>
@@ -1706,8 +1706,8 @@ lo_import 152801
         <para>
          Prompts the user to set variable <replaceable
          class="parameter">name</>.  An optional prompt, <replaceable
-         class="parameter">text</>, can be specified.  (For multi-word
-         prompts, use single-quotes.)
+         class="parameter">text</>, can be specified.  (For multiword
+         prompts, use single quotes.)
         </para>
 
         <para>
@@ -2836,7 +2836,7 @@ testdb=&gt; <userinput>SELECT * FROM :"foo";</userinput>
 testdb=&gt; <userinput>\set content `cat my_file.txt`</userinput>
 testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
 </programlisting>
-    (Note that this still won't work if my_file.txt contains NUL bytes.
+    (Note that this still won't work if <filename>my_file.txt</filename> contains NUL bytes.
     psql does not support embedded NUL bytes in variable values.)
     </para>
 

doc/src/sgml/regress.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.67 2010/05/02 12:22:40 sriggs Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.68 2010/08/17 04:37:21 petere Exp $ -->
 
  <chapter id="regress">
   <title>Regression Tests</title>
@@ -165,8 +165,8 @@ psql -h primary -c "CREATE DATABASE regression"
 psql -h primary -f src/test/regress/sql/hs_primary_setup.sql regression
 </screen>
    Now confirm that the default connection for the tester is the standby
-   server under test and then run standbycheck from the regression
-   directory.
+   server under test and then run the <literal>standbycheck</> target from the regression
+   directory:
 <screen>
 cd src/test/regress
 gmake standbycheck

doc/src/sgml/release.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.638 2010/03/21 22:12:27 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.639 2010/08/17 04:37:21 petere Exp $ -->
 <!--
 
 Typical markup:
@@ -51,7 +51,7 @@ can be created without links to the main documentation.  Don't use <xref>.
    A complete list of changes for each release can be obtained by
    viewing the <link linkend="cvs">CVS</link> logs for each release.
    The <ulink
-   url="http://archives.postgresql.org/pgsql-committers/">pgsql-committers
+   url="http://archives.postgresql.org/pgsql-committers/"><literal>pgsql-committers</literal>
    email list</ulink> records all source code changes as well.  There is also
    a <ulink url="http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/">web
    interface</ulink> that shows changes to specific files.

doc/src/sgml/seg.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/seg.sgml,v 1.8 2010/08/10 20:42:01 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/seg.sgml,v 1.9 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="seg">
  <title>seg</title>
@@ -237,7 +237,7 @@ test=> select '6.25 .. 6.50'::seg as "pH";
   <para>
    The <filename>seg</> module includes a GiST index operator class for
    <type>seg</> values.
-   The operators supported by the GiST opclass are shown in <xref linkend="seg-gist-operators">.
+   The operators supported by the GiST operator class are shown in <xref linkend="seg-gist-operators">.
   </para>
 
   <table id="seg-gist-operators">
@@ -308,7 +308,7 @@ test=> select '6.25 .. 6.50'::seg as "pH";
    respectively called <literal>@</> and <literal>~</>.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
-   datatypes!)
+   data types!)
   </para>
 
   <para>

doc/src/sgml/spi.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.67 2010/04/03 07:22:55 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.68 2010/08/17 04:37:21 petere Exp $ -->
 
 <chapter id="spi">
  <title>Server Programming Interface</title>
@@ -987,7 +987,7 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
   <para>
    <function>SPI_prepare_cursor</function> is identical to
    <function>SPI_prepare</function>, except that it also allows specification
-   of the planner's <quote>cursor options</> parameter.  This is a bitmask
+   of the planner's <quote>cursor options</> parameter.  This is a bit mask
    having the values shown in <filename>nodes/parsenodes.h</filename>
    for the <structfield>options</> field of <structname>DeclareCursorStmt</>.
    <function>SPI_prepare</function> always takes the cursor options as zero.
@@ -1030,7 +1030,7 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
     <term><literal>int <parameter>cursorOptions</parameter></literal></term>
     <listitem>
      <para>
-      integer bitmask of cursor options; zero produces default behavior
+      integer bit mask of cursor options; zero produces default behavior
      </para>
     </listitem>
    </varlistentry>
@@ -1130,7 +1130,7 @@ SPIPlanPtr SPI_prepare_params(const char * <parameter>command</parameter>,
     <term><literal>int <parameter>cursorOptions</parameter></literal></term>
     <listitem>
      <para>
-      integer bitmask of cursor options; zero produces default behavior
+      integer bit mask of cursor options; zero produces default behavior
      </para>
     </listitem>
    </varlistentry>
@@ -1925,7 +1925,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
     <term><literal>int <parameter>cursorOptions</parameter></literal></term>
     <listitem>
      <para>
-      integer bitmask of cursor options; zero produces default behavior
+      integer bit mask of cursor options; zero produces default behavior
      </para>
     </listitem>
    </varlistentry>

doc/src/sgml/storage.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/storage.sgml,v 1.33 2010/08/13 20:10:50 rhaas Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/storage.sgml,v 1.34 2010/08/17 04:37:21 petere Exp $ -->
 
 <chapter id="storage">
 
@@ -821,7 +821,7 @@ data. Empty in ordinary tables.</entry>
   the next. Then make sure you have the right alignment.  If the field is a
   fixed width field, then all the bytes are simply placed. If it's a
   variable length field (attlen = -1) then it's a bit more complicated.
-  All variable-length datatypes share the common header structure
+  All variable-length data types share the common header structure
   <type>struct varlena</type>, which includes the total length of the stored
   value and some flag bits.  Depending on the flags, the data can be either
   inline or in a <acronym>TOAST</> table;

doc/src/sgml/tablefunc.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/tablefunc.sgml,v 1.6 2010/08/10 20:42:01 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/tablefunc.sgml,v 1.7 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="tablefunc">
  <title>tablefunc</title>
@@ -46,7 +46,7 @@
       <entry>
        Produces a <quote>pivot table</> containing
        row names plus <replaceable>N</> value columns, where
-       <replaceable>N</> is determined by the rowtype specified in the calling
+       <replaceable>N</> is determined by the row type specified in the calling
        query
       </entry>
      </row>
@@ -219,9 +219,9 @@ SELECT * FROM crosstab('...') AS ct(row_name text, category_1 text, category_2 t
 
    <para>
     The <literal>FROM</> clause must define the output as one
-    <structfield>row_name</> column (of the same datatype as the first result
+    <structfield>row_name</> column (of the same data type as the first result
     column of the SQL query) followed by N <structfield>value</> columns
-    (all of the same datatype as the third result column of the SQL query).
+    (all of the same data type as the third result column of the SQL query).
     You can set up as many output value columns as you wish.  The names of the
     output columns are up to you.
    </para>
@@ -299,7 +299,7 @@ crosstab<replaceable>N</>(text sql)
      so that you need not write out column names and types in the calling
      <command>SELECT</> query.  The <filename>tablefunc</> module includes
      <function>crosstab2</>, <function>crosstab3</>, and
-     <function>crosstab4</>, whose output rowtypes are defined as
+     <function>crosstab4</>, whose output row types are defined as
     </para>
 
 <programlisting>

doc/src/sgml/trigger.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.63 2010/04/03 07:22:56 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.64 2010/08/17 04:37:21 petere Exp $ -->
 
  <chapter id="triggers">
   <title>Triggers</title>
@@ -141,7 +141,7 @@
    </para>
 
    <para>
-    A trigger definition can also specify a boolean <literal>WHEN</>
+    A trigger definition can also specify a Boolean <literal>WHEN</>
     condition, which will be tested to see whether the trigger should
     be fired.  In row-level triggers the <literal>WHEN</> condition can
     examine the old and/or new values of columns of the row.  (Statement-level

doc/src/sgml/unaccent.sgml

@@ -9,7 +9,7 @@
   <filename>unaccent</> removes accents (diacritic signs) from a lexeme.
   It's a filtering dictionary, that means its output is 
   always passed to the next dictionary (if any), contrary to the standard 
-  behavior. Currently, it supports most important accents from european 
+  behavior. Currently, it supports most important accents from European 
   languages. 
  </para>
 

doc/src/sgml/vacuumlo.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/vacuumlo.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/vacuumlo.sgml,v 1.6 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="vacuumlo">
  <title>vacuumlo</title>
@@ -52,7 +52,7 @@ vacuumlo [options] database [database2 ... databaseN]
    <varlistentry>
     <term><option>-U</option> <replaceable>username</></term>
     <listitem>
-     <para>Username to connect as.</para>
+     <para>User name to connect as.</para>
     </listitem>
    </varlistentry>
 

doc/src/sgml/wal.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/wal.sgml,v 1.71 2010/07/27 19:01:16 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/wal.sgml,v 1.72 2010/08/17 04:37:21 petere Exp $ -->
 
 <chapter id="wal">
  <title>Reliability and the Write-Ahead Log</title>
@@ -116,7 +116,7 @@
    write caches.  At the drive level, disable write-back caching if the
    drive cannot guarantee the data will be written before shutdown.
    You can test for reliable I/O subsystem behavior using <ulink
-   url="http://brad.livejournal.com/2116715.html">diskchecker.pl</ulink>.
+   url="http://brad.livejournal.com/2116715.html"><filename>diskchecker.pl</filename></ulink>.
   </para>
 
   <para>

doc/src/sgml/xindex.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/xindex.sgml,v 1.66 2010/02/24 15:54:31 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xindex.sgml,v 1.67 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="xindex">
  <title>Interfacing Extensions To Indexes</title>
@@ -416,39 +416,47 @@
 
    <table tocentry="1" id="xindex-gin-support-table">
     <title>GIN Support Functions</title>
-    <tgroup cols="2">
+    <tgroup cols="3">
      <thead>
       <row>
        <entry>Function</entry>
+       <entry>Description</entry>
        <entry>Support Number</entry>
       </row>
      </thead>
      <tbody>
       <row>
+       <entry><function>compare</></entry>
        <entry>
-        compare - compare two keys and return an integer less than zero, zero,
+        compare two keys and return an integer less than zero, zero,
         or greater than zero, indicating whether the first key is less than,
         equal to, or greater than the second
        </entry>
        <entry>1</entry>
       </row>
       <row>
-       <entry>extractValue - extract keys from a value to be indexed</entry>
+       <entry><function>extractValue</></entry>
+       <entry>extract keys from a value to be indexed</entry>
        <entry>2</entry>
       </row>
       <row>
-       <entry>extractQuery - extract keys from a query condition</entry>
+       <entry><function>extractQuery</></entry>
+       <entry>extract keys from a query condition</entry>
        <entry>3</entry>
       </row>
       <row>
-       <entry>consistent - determine whether value matches query condition</entry>
+       <entry><function>consistent</></entry>
+       <entry>determine whether value matches query condition</entry>
        <entry>4</entry>
       </row>
       <row>
-       <entry>comparePartial - (optional method) compare partial key from
+       <entry><function>comparePartial</></entry>
+       <entry>
+        (optional method) compare partial key from
         query and key from index, and return an integer less than zero, zero,
         or greater than zero, indicating whether GIN should ignore this index
-        entry, treat the entry as a match, or stop the index scan</entry>
+        entry, treat the entry as a match, or stop the index scan
+       </entry>
        <entry>5</entry>
       </row>
      </tbody>

doc/src/sgml/xml2.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.10 2010/08/10 20:42:01 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.11 2010/08/17 04:37:21 petere Exp $ -->
 
 <sect1 id="xml2">
  <title>xml2</title>
@@ -90,7 +90,7 @@ xpath_nodeset(document, query, toptag, itemtag) returns text
 &lt;itemtag&gt;Value 2....&lt;/itemtag&gt;
 &lt;/toptag&gt;
 </synopsis>
-        If either toptag or itemtag is an empty string, the relevant tag is omitted.
+        If either <literal>toptag</> or <literal>itemtag</> is an empty string, the relevant tag is omitted.
        </para>
       </entry>
      </row>
@@ -102,7 +102,7 @@ xpath_nodeset(document, query) returns text
       </entry>
       <entry>
        <para>
-        Like xpath_nodeset(document,query,toptag,itemtag) but result omits both tags.
+        Like <function>xpath_nodeset(document, query, toptag, itemtag)</> but result omits both tags.
        </para>
       </entry>
      </row>
@@ -114,7 +114,7 @@ xpath_nodeset(document, query, itemtag) returns text
       </entry>
       <entry>
        <para>
-        Like xpath_nodeset(document,query,toptag,itemtag) but result omits toptag.
+        Like <function>xpath_nodeset(document, query, toptag, itemtag)</> but result omits toptag.
        </para>
       </entry>
      </row>
@@ -295,7 +295,7 @@ WHERE t.author_id = p.person_id;
     may not be the same as the number of input documents. The first row
     returned contains the first result from each query, the second row the
     second result from each query. If one of the queries has fewer values
-    than the others, NULLs will be returned instead.
+    than the others, null values will be returned instead.
    </para>
 
    <para>
@@ -337,8 +337,8 @@ WHERE id = 1 ORDER BY doc_num, line_num
    </para>
 
    <para>
-    To get doc_num on every line, the solution is to use two invocations
-    of xpath_table and join the results:
+    To get <literal>doc_num</> on every line, the solution is to use two invocations
+    of <function>xpath_table</> and join the results:
 
 <programlisting>
 SELECT t.*,i.doc_num FROM
@@ -377,7 +377,7 @@ xslt_process(text document, text stylesheet, text paramlist) returns text
 
    <para>
     This function applies the XSL stylesheet to the document and returns
-    the transformed result. The paramlist is a list of parameter
+    the transformed result. The <literal>paramlist</> is a list of parameter
     assignments to be used in the transformation, specified in the form
     <literal>a=1,b=2</>. Note that the
     parameter parsing is very simple-minded: parameter values cannot

doc/src/sgml/xoper.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.43 2007/11/28 15:42:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.44 2010/08/17 04:37:21 petere Exp $ -->
 
  <sect1 id="xoper">
   <title>User-Defined Operators</title>
@@ -435,7 +435,7 @@ table1.column1 OP table2.column2
 
     <para>
      To be marked <literal>MERGES</literal>, the join operator must appear
-     as an equality member of a btree index operator family.
+     as an equality member of a <literal>btree</> index operator family.
      This is not enforced when you create
      the operator, since of course the referencing operator family couldn't
      exist yet.  But the operator will not actually be used for merge joins
@@ -450,7 +450,7 @@ table1.column1 OP table2.column2
      if they are different) that appears in the same operator family.
      If this is not the case, planner errors might occur when the operator
      is used.  Also, it is a good idea (but not strictly required) for
-     a btree operator family that supports multiple data types to provide
+     a <literal>btree</> operator family that supports multiple data types to provide
      equality operators for every combination of the data types; this
      allows better optimization.
     </para>