diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml
index b712b9c34d..7c89a7921c 100644
--- a/doc/src/sgml/array.sgml
+++ b/doc/src/sgml/array.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.43 2005/02/06 20:59:30 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.44 2005/07/14 06:17:35 neilc Exp $ -->
 
 <sect1 id="arrays">
  <title>Arrays</title>
@@ -63,7 +63,7 @@ CREATE TABLE tictactoe (
  </para>
 
  <para>
-  An alternative syntax, which conforms to the SQL:1999 standard, may
+  An alternative syntax, which conforms to the SQL:2003 standard, may
   be used for one-dimensional arrays.
   <structfield>pay_by_quarter</structfield> could have been defined
   as:
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 269f9aab82..3c53973b76 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.41 2005/06/13 02:40:01 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.42 2005/07/14 06:17:35 neilc Exp $ -->
 
 <chapter id="ddl">
  <title>Data Definition</title>
@@ -1122,7 +1122,7 @@ SELECT name, altitude
    <para>
      In previous versions of <productname>PostgreSQL</productname>, the
      default behavior was not to include child tables in queries. This was
-     found to be error prone and is also in violation of the SQL:1999
+     found to be error prone and is also in violation of the SQL:2003
      standard. Under the old syntax, to get the sub-tables you append
      <literal>*</literal> to the table name.
      For example
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index b5b1b913eb..4364ff0fce 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.64 2005/05/20 12:36:48 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.65 2005/07/14 06:17:35 neilc Exp $
 -->
 
 <chapter id="ecpg">
@@ -1146,8 +1146,8 @@ struct
     The fields <literal>sqlca.sqlstate</literal> and
     <literal>sqlca.sqlcode</literal> are two different schemes that
     provide error codes.  Both are specified in the SQL standard, but
-    <literal>SQLCODE</literal> has been marked deprecated in the 1992
-    edition of the standard and has been dropped in the 1999 edition.
+    <literal>SQLCODE</literal> has been marked deprecated in SQL-92
+    edition of the standard and has been dropped in later editions.
     Therefore, new applications are strongly encouraged to use
     <literal>SQLSTATE</literal>.
    </para>
diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml
index 71b4a8cd40..f099a06318 100644
--- a/doc/src/sgml/errcodes.sgml
+++ b/doc/src/sgml/errcodes.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.13 2005/06/26 19:16:04 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/errcodes.sgml,v 1.14 2005/07/14 06:17:35 neilc Exp $ -->
 
 <appendix id="errcodes-appendix">
  <title><productname>PostgreSQL</productname> Error Codes</title>
@@ -127,7 +127,7 @@
 
 <row>
 <entry>Class 02</entry>
-<entry>No Data &mdash; this is also a warning class per SQL:1999</entry>
+<entry>No Data &mdash; this is also a warning class per SQL:2003</entry>
 </row>
 
 <row>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f274e53c55..9c0d8a22bc 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.264 2005/07/10 04:54:30 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.265 2005/07/14 06:17:35 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -2543,8 +2543,8 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
     There are three separate approaches to pattern matching provided
     by <productname>PostgreSQL</productname>: the traditional
     <acronym>SQL</acronym> <function>LIKE</function> operator, the
-    more recent <function>SIMILAR TO</function> operator (added in
-    SQL:1999), and <acronym>POSIX</acronym>-style regular expressions.
+    more recent <function>SIMILAR TO</function> operator (part of 
+    SQL:2003), and <acronym>POSIX</acronym>-style regular expressions.
     Additionally, a pattern matching function,
     <function>substring</function>, is available, using either
     <function>SIMILAR TO</function>-style or POSIX-style regular
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index 66344e33a8..deb4050174 100644
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.15 2005/05/31 14:48:47 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.16 2005/07/14 06:17:36 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -203,7 +203,7 @@ ALTER DOMAIN zipcode DROP CONSTRAINT zipchk;
   <title>Compatibility</title>
     
   <para>
-   The <command>ALTER DOMAIN</command> statement is compatible with SQL:1999,
+   The <command>ALTER DOMAIN</command> statement is compatible with SQL:2003,
    except for the <literal>OWNER</> variant, which is a
    <productname>PostgreSQL</productname> extension.
   </para>
diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index a6461a6525..6adde5e0ab 100644
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.20 2004/12/13 18:05:10 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.21 2005/07/14 06:17:36 neilc Exp $ -->
 
 <refentry id="SQL-CREATECAST">
  <refmeta>
@@ -298,8 +298,8 @@ CREATE CAST (text AS int4) WITH FUNCTION int4(text);
   <title>Compatibility</title>
 
   <para>
-   The <command>CREATE CAST</command> command conforms to SQL:1999,
-   except that SQL:1999 does not make provisions for binary-compatible
+   The <command>CREATE CAST</command> command conforms to SQL:2003,
+   except that SQL:2003 does not make provisions for binary-compatible
    types or extra arguments to implementation functions.
    <literal>AS IMPLICIT</> is a <productname>PostgreSQL</productname> 
    extension, too.
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 768a42846b..785f8bbb70 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.65 2005/03/31 22:45:59 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.66 2005/07/14 06:17:36 neilc Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
@@ -478,7 +478,7 @@ SELECT * FROM dup(42);
   <title>Compatibility</title>
 
   <para>
-   A <command>CREATE FUNCTION</command> command is defined in SQL:1999 and later.
+   A <command>CREATE FUNCTION</command> command is defined in SQL:2003.
    The <productname>PostgreSQL</productname> version is similar but
    not fully compatible.  The attributes are not portable, neither are the
    different available languages.
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 191f29ccd4..71972b470b 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.92 2005/02/02 06:35:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.93 2005/07/14 06:17:36 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -860,7 +860,7 @@ CREATE TABLE cinemas (
 
   <para>
    The <command>CREATE TABLE</command> command conforms to SQL-92 and
-   to a subset of SQL:1999, with exceptions listed below.
+   to a subset of SQL:2003, with exceptions listed below.
   </para>
 
   <refsect2>
@@ -938,8 +938,8 @@ CREATE TABLE cinemas (
    <para>
     Multiple inheritance via the <literal>INHERITS</literal> clause is
     a <productname>PostgreSQL</productname> language extension.
-    SQL:1999 (but not SQL-92) defines single inheritance using a
-    different syntax and different semantics.  SQL:1999-style
+    SQL:2003 defines single inheritance using a
+    different syntax and different semantics.  SQL:2003-style
     inheritance is not yet supported by
     <productname>PostgreSQL</productname>.
    </para>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index f712636f49..83a8edb9ed 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.40 2004/11/27 21:27:07 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.41 2005/07/14 06:17:36 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -208,20 +208,19 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
   <para>
    The <command>CREATE TRIGGER</command> statement in
    <productname>PostgreSQL</productname> implements a subset of the
-   SQL:1999 standard.  (There are no provisions for triggers in SQL-92.)
-   The following functionality is missing:
+   SQL:2003 standard. The following functionality is currently missing:
 
    <itemizedlist>
     <listitem>
      <para>
-      SQL:1999 allows triggers to fire on updates to specific columns
+      SQL:2003 allows triggers to fire on updates to specific columns
       (e.g., <literal>AFTER UPDATE OF col1, col2</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      SQL:1999 allows you to define aliases for the <quote>old</quote>
+      SQL:2003 allows you to define aliases for the <quote>old</quote>
       and <quote>new</quote> rows or tables for use in the definition
       of the triggered action (e.g., <literal>CREATE TRIGGER ... ON
       tablename REFERENCING OLD ROW AS somename NEW ROW AS othername
@@ -235,7 +234,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
     <listitem>
      <para>
       <productname>PostgreSQL</productname> only allows the execution
-      of a user-defined function for the triggered action.  SQL:1999
+      of a user-defined function for the triggered action.  SQL:2003
       allows the execution of a number of other SQL commands, such as
       <command>CREATE TABLE</command> as triggered action.  This
       limitation is not hard to work around by creating a user-defined
@@ -246,7 +245,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
   </para>
 
   <para>
-   SQL:1999 specifies that multiple triggers should be fired in
+   SQL:2003 specifies that multiple triggers should be fired in
    time-of-creation order.  <productname>PostgreSQL</productname> uses
    name order, which was judged more convenient to work with.
   </para>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 4f002b6519..4d05fa98cd 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.56 2005/07/10 21:13:57 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.57 2005/07/14 06:17:36 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -533,7 +533,7 @@ CREATE TABLE big_objs (
   <para>
    This <command>CREATE TYPE</command> command is a
    <productname>PostgreSQL</productname> extension.  There is a
-   <command>CREATE TYPE</command> statement in SQL:1999 and later that is rather
+   <command>CREATE TYPE</command> statement in SQL:2003 that is rather
    different in detail.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 75765a0dab..d29f8e48e0 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.87 2005/05/08 03:08:05 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.88 2005/07/14 06:17:36 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -1082,7 +1082,7 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    <title>Namespace Available to <literal>GROUP BY</literal> and <literal>ORDER BY</literal></title>
 
    <para>
-    In the SQL-92 standard, an <literal>ORDER BY</literal> clause may
+    In the SQL:2003 standard, an <literal>ORDER BY</literal> clause may
     only use result column names or numbers, while a <literal>GROUP
     BY</literal> clause may only use expressions based on input column
     names.  <productname>PostgreSQL</productname> extends each of
@@ -1095,11 +1095,11 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    </para>
 
    <para>
-    SQL:1999 uses a slightly different definition which is not entirely upward
-    compatible 
-    with SQL-92.  In most cases, however, <productname>PostgreSQL</productname>
+    SQL:2003 uses a slightly different definition which is not entirely upward
+    compatible with SQL-92.  
+    In most cases, however, <productname>PostgreSQL</productname>
     will interpret an <literal>ORDER BY</literal> or <literal>GROUP
-    BY</literal> expression the same way SQL:1999 does.
+    BY</literal> expression the same way SQL:2003 does.
    </para>
   </refsect2>
 
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index 04a640929a..070ba7080c 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.36 2005/04/28 21:47:09 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.37 2005/07/14 06:17:35 neilc Exp $
 -->
 
  <chapter id="sql-intro">
@@ -98,8 +98,7 @@ $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.36 2005/04/28 21:47:09 tgl Exp $
    is under development. It is planned to make <acronym>SQL</acronym>
    a Turing-complete
    language, i.e. all computable queries (e.g. recursive queries) will be
-   possible. This is a very complex task and therefore the completion of
-   the new standard can not be expected before 1999.
+   possible. This has now been completed as SQL:2003.
   </para>
 
   <sect1 id="rel-model">