From fc8f4bac0e916b1268c6b099e7f691ca6c0a7b2a Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Sat, 15 Oct 2005 20:12:33 +0000
Subject: [PATCH] Fix assorted typos in the documentation, and use American
 spelling rather than British. Patch from Michael Fuhr.

---
 doc/src/sgml/config.sgml              |  4 +--
 doc/src/sgml/information_schema.sgml  |  4 +--
 doc/src/sgml/planstats.sgml           |  4 +--
 doc/src/sgml/ref/alter_sequence.sgml  |  4 +--
 doc/src/sgml/ref/copy.sgml            |  4 +--
 doc/src/sgml/ref/create_table_as.sgml |  4 +--
 doc/src/sgml/ref/pg_dumpall.sgml      |  4 +--
 doc/src/sgml/release.sgml             | 38 +++++++++++++--------------
 doc/src/sgml/rules.sgml               |  6 ++---
 doc/src/sgml/runtime.sgml             |  4 +--
 doc/src/sgml/user-manag.sgml          |  4 +--
 doc/src/sgml/xfunc.sgml               |  4 +--
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 75e0f05e34..5582f6b778 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.30 2005/10/15 15:29:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.31 2005/10/15 20:12:32 neilc Exp $
 -->
 <chapter Id="runtime-config">
   <title>Run-time Configuration</title>
@@ -2602,7 +2602,7 @@ SELECT * FROM parent WHERE key = 2400;
          Each recognized escape is replaced as outlined 
          below - anything else that looks like an escape is ignored. Other
          characters are copied straight to the log line. Some escapes are
-         only recognised by session processes, and do not apply to
+         only recognized by session processes, and do not apply to
          background processes such as the postmaster. <application>Syslog</>
          produces its own 
          time stamp and process ID information, so you probably do not want to
diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index 9f0f08dacb..7b97c70ed4 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/information_schema.sgml,v 1.21 2005/08/27 14:13:21 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/information_schema.sgml,v 1.22 2005/10/15 20:12:32 neilc Exp $ -->
 
 <chapter id="information-schema">
  <title>The Information Schema</title>
@@ -3272,7 +3272,7 @@ ORDER BY c.ordinal_position;
      </row>
 
      <row>
-      <entry><literal>sql_language_comformance</literal></entry>
+      <entry><literal>sql_language_conformance</literal></entry>
       <entry><type>character_data</type></entry>
       <entry>
        The standard conformance level for the language binding.  For
diff --git a/doc/src/sgml/planstats.sgml b/doc/src/sgml/planstats.sgml
index c770dffc87..4f22b481ed 100644
--- a/doc/src/sgml/planstats.sgml
+++ b/doc/src/sgml/planstats.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/planstats.sgml,v 1.3 2005/03/14 06:49:48 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/planstats.sgml,v 1.4 2005/10/15 20:12:32 neilc Exp $
 -->
 
 <chapter id="planner-stats-details">
@@ -23,7 +23,7 @@ $PostgreSQL: pgsql/doc/src/sgml/planstats.sgml,v 1.3 2005/03/14 06:49:48 neilc E
 
   <para>
    The outputs and algorithms shown below are taken from version 8.0. 
-   The behaviour of earlier (or later) versions may vary.
+   The behavior of earlier (or later) versions may vary.
   </para>
 
  <sect1 id="row-estimation-examples">
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 4ab3db3ead..27e9e7702a 100644
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.11 2005/09/13 15:24:57 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.12 2005/10/15 20:12:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -157,7 +157,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
         specified, any calls to <function>nextval</function> after the
         sequence has reached its maximum value will return an error.
         If neither <literal>CYCLE</literal> or <literal>NO
-        CYCLE</literal> are specified, the old cycle behaviour will be
+        CYCLE</literal> are specified, the old cycle behavior will be
         maintained.
        </para>
       </listitem>
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 5687fe3465..2d8dc94571 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.69 2005/10/13 14:44:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.70 2005/10/15 20:12:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -482,7 +482,7 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla
     Separated Value (<literal>CSV</>) file format used by many other
     programs, such as spreadsheets. Instead of the escaping used by
     <productname>PostgreSQL</productname>'s standard text mode, it
-    produces and recognises the common CSV escaping mechanism.
+    produces and recognizes the common CSV escaping mechanism.
    </para>
 
    <para>
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 16cdba7681..d2dbf0ca3b 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.29 2005/01/09 05:57:45 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.30 2005/10/15 20:12:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -143,7 +143,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable>table_name
   <para>
    Prior to <productname>PostgreSQL</productname> 8.0, <command>CREATE
    TABLE AS</command> always included OIDs in the table it
-   produced.  As of <productname>PostgresSQL</productname> 8.0,
+   produced.  As of <productname>PostgreSQL</productname> 8.0,
    the <command>CREATE TABLE AS</command> command allows the user to
    explicitly specify whether OIDs should be included. If the
    presence of OIDs is not explicitly specified,
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index a89bf89164..6d25f3e3c5 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.53 2005/10/10 22:29:47 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.54 2005/10/15 20:12:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -406,7 +406,7 @@ PostgreSQL documentation
 
   <para>
     <xref linkend="app-pgdump">.  Check there for details on possible
-    error conditions.  Also see suppored environment variables
+    error conditions.  Also see supported environment variables
     (<xref linkend="libpq-envars">).
   </para>
  </refsect1>   
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index aabbc1e2f3..75012d0219 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.390 2005/10/11 21:17:11 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.391 2005/10/15 20:12:32 neilc Exp $
 
 Typical markup:
 
@@ -5631,7 +5631,7 @@ DROP SCHEMA information_schema CASCADE;
 <listitem><para>Fix information schema view <literal>constraint_column_usage</literal> for foreign keys (Peter)</para></listitem>
 <listitem><para>ECPG fixes (Michael)</para></listitem>
 <listitem><para>Fix bug with multiple <literal>IN</literal> subqueries and joins in the subqueries (Tom)</para></listitem>
-<listitem><para>Alllow <literal>COUNT('x')</literal> to work (Tom)</para></listitem>
+<listitem><para>Allow <literal>COUNT('x')</literal> to work (Tom)</para></listitem>
 <listitem><para>Install ECPG include files for Informix compatibility into separate directory (Peter)</para>
 <para>
   Some names of ECPG include files for Informix compatibility conflicted with operating system include files.
@@ -7262,7 +7262,7 @@ DROP SCHEMA information_schema CASCADE;
 
     <listitem>
      <para>
-      Have pg_dumpall use <command>GRANT</>/<command>REVOKE</> to dump database-level privleges (Tom)
+      Have pg_dumpall use <command>GRANT</>/<command>REVOKE</> to dump database-level privileges (Tom)
      </para>
     </listitem>
 
@@ -9782,7 +9782,7 @@ since <productname>PostgreSQL</productname> 7.1.
 
     <para>
      <programlisting>
-Remove unused WAL segements of large transactions (Tom)
+Remove unused WAL segments of large transactions (Tom)
 Multiaction rule fix (Tom)
 PL/pgSQL memory allocation fix (Jan)
 VACUUM buffer fix (Tom)
@@ -10219,7 +10219,7 @@ Fix for psql \l+ when multibyte enabled (Tatsuo)
 Allow PL/pgSQL to accept non ascii identifiers (Tatsuo)
 Make vacuum always flush buffers (Tom)
 Fix to allow cancel while waiting for a lock (Hiroshi)
-Fix for memory aloocation problem in user authentication code (Tom)
+Fix for memory allocation problem in user authentication code (Tom)
 Remove bogus use of int4out() (Tom)
 Fixes for multiple subqueries in COALESCE or BETWEEN (Tom)
 Fix for failure of triggers on heap open in certain cases (Jeroen van
@@ -10938,13 +10938,13 @@ Fix for EXPLAIN on inheritance(Tom)
 Patch to allow vacuum on multisegment tables(Hiroshi)
 R-Tree optimizer selectivity fix(Tom)
 ACL file descriptor leak fix(Atsushi Ogawa)
-New expresssion subtree code(Tom)
+New expression subtree code(Tom)
 Avoid disk writes for read-only transactions(Vadim)
 Fix for removal of temp tables if last transaction was aborted(Bruce)
 Fix to prevent too large row from being created(Bruce)
 plpgsql fixes
 Allow port numbers 32k - 64k(Bruce)
-Add ^ precidence(Bruce)
+Add ^ precedence(Bruce)
 Rename sort files called pg_temp to pg_sorttemp(Bruce)
 Fix for microseconds in time values(Tom)
 Tutorial source cleanup
@@ -11326,7 +11326,7 @@ New pg_options: pretty_plan, pretty_parse, pretty_rewritten(Jan)
 Better optimization statistics for system table access(Tom)
 Better handling of non-default block sizes(Massimo)
 Improve GEQO optimizer memory consumption(Tom)
-UNION now suppports ORDER BY of columns not in target list(Jan)
+UNION now supports ORDER BY of columns not in target list(Jan)
 Major libpq++ improvements(Vince Vielhaber)
 pg_dump now uses -z(ACL's) as default(Bruce)
 backend cache, memory speedups(Tom)
@@ -11700,7 +11700,7 @@ New UNLISTEN command(Massimo)
 psql and libpq now compile under Windows using win32.mak(Magnus)
 Lo_read no longer stores trailing NULL(Bruce)
 Identifiers are now truncated to 31 characters internally(Bruce)
-Createuser options now availble on the command line
+Createuser options now available on the command line
 Code for 64-bit integer supported added, configure tested, int8 type(Thomas)
 Prevent file descriptor leaf from failed COPY(Bruce)
 New pg_upgrade command(Bruce)
@@ -11711,7 +11711,7 @@ New DECLARE and FETCH feature(Thomas)
 libpq's internal structures now not exported(Tom)
 Allow up to 8 key indexes(Bruce)
 Remove ARCHIVE key word, that is no longer used(Thomas)
-pg_dump -n flag to supress quotes around indentifiers
+pg_dump -n flag to suppress quotes around indentifiers
 disable system columns for views(Jan)
 new INET and CIDR types for network addresses(TomH, Paul)
 no more double quotes in psql output
@@ -11740,7 +11740,7 @@ NS32K platform fixes(Phil Nelson, John Buller)
 SCO 7/UnixWare 2.x fixes(Billy,others)
 Sparc/Solaris 2.5 fixes(Ryan)
 Pgbuiltin.3 is obsolete, move to doc files(Thomas)
-Even more documention(Thomas)
+Even more documentation(Thomas)
 Nextstep support(Jacek)
 Aix support(David)
 pginterface manual page(Bruce)
@@ -12088,7 +12088,7 @@ Check boolean input literals for 'true','false','yes','no','1','0'
         and throw elog(ERROR) if unrecognized(Thomas)
 Major large objects fix
 Fix for GROUP BY showing duplicates(Vadim)
-Fix for index scans in MergeJion(Vadim)
+Fix for index scans in MergeJoin(Vadim)
 
 Enhancements
 ------------
@@ -12713,7 +12713,7 @@ because the COPY output format was improved from the 1.02 release.
      <programlisting>
 Bug Fixes
 ---------
-ALTER TABLE bug - running postgress process needs to re-read table definition
+ALTER TABLE bug - running postgres process needs to re-read table definition
 Allow vacuum to be run on one table or entire database(Bruce)
 Array fixes
 Fix array over-runs of memory writes(Kurt)
@@ -12721,7 +12721,7 @@ Fix elusive btree range/non-range bug(Dan)
 Fix for hash indexes on some types like time and date
 Fix for pg_log size explosion
 Fix permissions on lo_export()(Bruce)
-Fix unitialized reads of memory(Kurt)
+Fix uninitialized reads of memory(Kurt)
 Fixed ALTER TABLE ... char(3) bug(Bruce)
 Fixed a few small memory leaks
 Fixed EXPLAIN handling of options and changed full_path option name
@@ -12765,7 +12765,7 @@ Change default decimal constant representation from float4 to float8(Bruce)
 European date format now set when postmaster is started
 Execute lowercase function names if not found with exact case
 Fixes for aggregate/GROUP processing, allow 'select sum(func(x),sum(x+y) from z'
-Gist now included in the distrubution(Marc)
+Gist now included in the distribution(Marc)
 Idend authentication of local users(Bryan)
 Implement BETWEEN qualifier(Bruce)
 Implement IN qualifier(Bruce)
@@ -12794,7 +12794,7 @@ Vacuum now had VERBOSE option(Bruce)
 Source tree changes
 -------------------
 All functions now have prototypes that are compared against the calls
-Allow asserts to be disabled easly from Makefile.global(Bruce)
+Allow asserts to be disabled easily from Makefile.global(Bruce)
 Change oid constants used in code to #define names
 Decoupled sparc and solaris defines(Kurt)
 Gcc -Wall compiles cleanly with warnings only from unfixable constructs
@@ -12807,13 +12807,13 @@ Name change from Postgres95 to PostgreSQL
 New config.h file(Marc, Bryan)
 PG_VERSION now set to 6.0 and used by postmaster
 Portability additions, including Ultrix, DG/UX, AIX, and Solaris
-Reduced the number of #define's, centeralized #define's
+Reduced the number of #define's, centralized #define's
 Remove duplicate OIDS in system tables(Dan)
 Remove duplicate system catalog info or report mismatches(Dan)
 Removed many os-specific #define's
 Restructured object file generation/location(Bryan, Marc)
 Restructured port-specific file locations(Bryan, Marc)
-Unused/uninialized variables corrected
+Unused/uninitialized variables corrected
 </programlisting>
 </para>
 </sect2>
@@ -12953,7 +12953,7 @@ New Ports
 </programlisting>
 </para>
 <!--
-Contributors (appologies to any missed)
+Contributors (apologies to any missed)
  * Kurt J. Lidl &lt;lidl@va.pubnix.com&gt; 
         (missed in first run, but no less important)
  * Erich Stamberger &lt;eberger@gewi.kfunigraz.ac.at&gt;
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index f47ac77e69..51fae1dc55 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.42 2005/05/20 01:37:08 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.43 2005/10/15 20:12:33 neilc Exp $ -->
 
 <chapter id="rules">
 <title>The Rule System</title>
@@ -2012,7 +2012,7 @@ Nestloop
     The last command we look at is
 
 <programlisting>
-DELETE FROM computer WHERE manufacurer = 'bim';
+DELETE FROM computer WHERE manufacturer = 'bim';
 </programlisting>
 
     Again this could result in many rows to be deleted from
@@ -2020,7 +2020,7 @@ DELETE FROM computer WHERE manufacurer = 'bim';
     through the executor.  The command generated by the rule will be
 
 <programlisting>
-DELETE FROM software WHERE computer.manufacurer = 'bim'
+DELETE FROM software WHERE computer.manufacturer = 'bim'
                        AND software.hostname = computer.hostname;
 </programlisting>
 
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 3a8745df90..0e88a6c297 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.353 2005/09/12 22:11:38 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.354 2005/10/15 20:12:33 neilc Exp $
 -->
 
 <chapter Id="runtime">
@@ -747,7 +747,7 @@ options "SEMMNS=240"
        </para>
 
        <para>
-        The remaining sempahore settings are read-only as far as
+        The remaining semaphore settings are read-only as far as
         <command>sysctl</command> is concerned, but can be changed
         before boot using the <command>loader</command> prompt:
 <screen>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index fea93aec91..cadca53ace 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.31 2005/10/13 23:26:00 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.32 2005/10/15 20:12:33 neilc Exp $
 -->
 
 <chapter id="user-manag">
@@ -475,7 +475,7 @@ REVOKE ALL ON accounts FROM PUBLIC;
   <para>
    Functions run inside the backend
    server process with the operating system permissions of the
-   database server daemon.  If the programmming language
+   database server daemon.  If the programming language
    used for the function allows unchecked memory accesses, it is
    possible to change the server's internal data structures.
    Hence, among many other things, such functions can circumvent any
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 85e106d74e..ff461884db 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.106 2005/10/15 01:47:12 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.107 2005/10/15 20:12:33 neilc Exp $
 -->
 
  <sect1 id="xfunc">
@@ -1210,7 +1210,7 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
 
     <indexterm zone="xfunc-c-basetype">
      <primary>data type</primary>
-     <secondary>internal organisation</secondary>
+     <secondary>internal organization</secondary>
     </indexterm>
 
     <para>
-- 
GitLab