Make SET SESSION CHARACTERISTICS compliant with SQL 99. Remove redundant,

non-standard clauses.  Allow CHARACTERISTICS as unquoted identifier.
Merge related reference pages.

3 files changed, 21 insertions, 105 deletions

diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 3463b02777c..6c9bbc5248d 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.25 2000/11/24 17:44:22 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.26 2000/11/24 20:16:38 petere Exp $
 Postgres documentation
 Complete list of usable sgml source files in this directory.
 -->
@@ -95,7 +95,6 @@ Complete list of usable sgml source files in this directory.
 <!entity select             system "select.sgml">
 <!entity selectInto         system "select_into.sgml">
 <!entity set                system "set.sgml">
-<!entity setSession         system "set_session.sgml">
 <!entity setConstraints     system "set_constraints.sgml">
 <!entity setTransaction     system "set_transaction.sgml">
 <!entity show               system "show.sgml">
diff --git a/doc/src/sgml/ref/set_session.sgml b/doc/src/sgml/ref/set_session.sgml
deleted file mode 100644
index b542d6646e8..00000000000
--- a/doc/src/sgml/ref/set_session.sgml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/set_session.sgml,v 1.1 2000/07/14 15:27:14 thomas Exp $
-Postgres documentation
--->
-
-<refentry id="SQL-SET-SESSION">
- <refmeta>
-  <refentrytitle id="SQL-SET-SESSION-TITLE">SET</refentrytitle>
-  <refmiscinfo>SQL - Language Statements</refmiscinfo>
- </refmeta>
- <refnamediv>
-  <refname>SET SESSION CHARACTERISTICS</refname>
-  <refpurpose>Set per-session run-time parameters</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  <synopsis>
-SET SESSION CHARACTERISTICS TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZABLE }
-SET SESSION CHARACTERISTICS TIME ZONE { '<replaceable class="PARAMETER">timezone</replaceable>' | LOCAL | DEFAULT }
-  </synopsis>
- </refsynopsisdiv>
-
- <refsect1 id="R1-SQL-SET-SESSION-1">
-  <title>Description</title>
-  <para>
-   <command>SET SESSION CHARACTERISTICS</command> changes the run-time
-   environment for the entire <acronym>SQL</acronym>
-   session. Currently, transaction isolation level and time zone can
-   be specified by this command.
-  </para>
-
-  <para>
-   Use <xref linkend="SQL-SHOW" endterm="SQL-SHOW-title"> to show the
-   current setting of a parameters.
-  </para>
-
-  <para>
-   Refer to <xref linkend="SQL-SET-TRANSACTION" endterm="SQL-SET-TRANSACTION-TITLE">
-   and to <xref linkend="SQL-SET" endterm="SQL-SET-TITLE"> for more
-   information on allowed parameters.
-  </para>
- </refsect1>
-
- <refsect1>
-  <title>Examples</title>
-
-  <para>
-   Set the timezone for Berkeley, California, using double quotes to
-   preserve the uppercase attributes of the time zone specifier (note
-   that the date/time format is ISO here):
-
-<screen> 
-SET SESSION CHARACTERISTICS TIME ZONE "PST8PDT";
-SELECT CURRENT_TIMESTAMP AS today;
-   
-         today
-------------------------
- 1998-07-14 07:41:21-07
-</screen>
-  </para>
- </refsect1>
-
- <refsect1 id="R1-SQL-SET-SESSION-3">
-  <title>Compatibility</title>
-
-  <refsect2 id="R2-SQL-SET-SESSION-4">
-   <title>SQL99</title>
-
-   <para>
-    <command>SET SESSION</command> is defined in
-    <acronym>SQL99</acronym>.
-   </para>
-  </refsect2>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode:sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:("/usr/lib/sgml/catalog")
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index a5ca5fac1ff..488ee6ac31c 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -1,19 +1,23 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.2 2000/07/14 15:27:14 thomas Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.3 2000/11/24 20:16:38 petere Exp $ -->
 <refentry id="SQL-SET-TRANSACTION">
+ <docinfo>
+  <date>2000-11-24</date>
+ </docinfo>
+
  <refmeta>
   <refentrytitle id="SQL-SET-TRANSACTION-TITLE">SET TRANSACTION</refentrytitle>
   <refmiscinfo>SQL - Language Statements</refmiscinfo>
  </refmeta>
+
  <refnamediv>
   <refname>SET TRANSACTION</refname>
   <refpurpose>Set the characteristics of the current SQL-transaction</refpurpose>
  </refnamediv>
+
  <refsynopsisdiv>
-  <refsynopsisdivinfo>
-   <date>2000-06-01</date>
-  </refsynopsisdivinfo>
   <synopsis>
 SET TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZABLE }
+SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZABLE }
   </synopsis>
  </refsynopsisdiv>
 
@@ -21,13 +25,17 @@ SET TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZABLE }
   <title>Description</title>
 
   <para>
-   The <command>SET TRANSACTION</command> command sets the
-   characteristics for the current SQL-transaction. It has no effect
-   on any subsequent transactions. This command cannot be used after
-   the first DML statement (<command>SELECT</command>,
-   <command>INSERT</command>, <command>DELETE</command>,
-   <command>UPDATE</command>, <command>FETCH</command>,
-   <command>COPY</command>) of a transaction has been executed.
+   This command sets the transaction isolation level.  The
+   <command>SET TRANSACTION</command> command sets the characteristics
+   for the current SQL-transaction. It has no effect on any subsequent
+   transactions.  This command cannot be used after the first DML
+   statement (<command>SELECT</command>, <command>INSERT</command>,
+   <command>DELETE</command>, <command>UPDATE</command>,
+   <command>FETCH</command>, <command>COPY</command>) of a transaction
+   has been executed.  <command>SET SESSION CHARACTERISTICS</command>
+   sets the default transaction isolation level for each transaction
+   for a session.  <command>SET TRANSACTION</command> can override it
+   for an individual transaction.
   </para>
 
   <para>
@@ -83,7 +91,7 @@ SET TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZABLE }
 
    <para>
     In <acronym>SQL</acronym> there are two other transaction
-    characteristics that can be set with this command: whether the
+    characteristics that can be set with these commands: whether the
     transaction is read-only and the size of the diagnostics area.
     Neither of these concepts are supported in Postgres.
    </para>