diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 1900b513bea7d0097ddb6a62a7d8467876bdc71a..8dda7ec5d633d0270c427bd68ef27da76419c199 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.30 2000/05/02 20:01:51 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.31 2000/07/14 15:26:21 thomas Exp $
-->
<chapter id="datatype">
@@ -159,7 +159,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.30 2000/05/02 20:01:51 th
</row>
<row>
<entry>time</entry>
- <entry>time</entry>
+ <entry>time [ without time zone ]</entry>
<entry>time of day</entry>
</row>
<row>
@@ -169,7 +169,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.30 2000/05/02 20:01:51 th
</row>
<row>
<entry>timestamp</entry>
- <entry>timestamp with time zone</entry>
+ <entry>timestamp [ with time zone ]</entry>
<entry>date/time</entry>
</row>
<row>
@@ -581,7 +581,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
<entry>1 microsec / 14 digits</entry>
</row>
<row>
- <entry><type>timestamp with time zone</type></entry>
+ <entry><type>timestamp [ with time zone ]</type></entry>
<entry>date and time with time zone</entry>
<entry>8 bytes</entry>
<entry>1903 AD</entry>
@@ -605,7 +605,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
<entry>1 day</entry>
</row>
<row>
- <entry><type>time</type></entry>
+ <entry><type>time [ without time zone ]</type></entry>
<entry>times of day only</entry>
<entry>4 bytes</entry>
<entry>00:00:00.00</entry>
@@ -843,7 +843,13 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
</sect3>
<sect3>
- <title>time</title>
+ <title>time [ without time zone ]</title>
+
+ <para>
+ Per SQL99, this type can be referenced as <type>time</type> and
+ as <type>time without time zone</type>.
+ </para>
+
<para>
The following are valid <type>time</type> inputs.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 70ffc9cdd9440accb88d16c5f559ac998fa9f8b0..1e393c623bc9ec226658a9e4071f319101ee5193 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1527,7 +1527,6 @@ Not defined by this name. Implements the intersection operator '#'
</sect1>
<sect1>
-
<title id="aggregate-funcs">Aggregate Functions</title>
<note>
@@ -1542,13 +1541,14 @@ Not defined by this name. Implements the intersection operator '#'
<firstterm>Aggregate functions</firstterm> allow the generation of simple
statistics about the values of particular columns over the selected set
of rows.
- See also the chapter on aggregates in
- <citetitle>The PostgreSQL Tutorial</citetitle>
<!--
- <xref linkend="sql" endterm="aggregates-tutorial">
--->
- and
+ See also <xref linkend="sql" endterm="aggregates-tutorial"> and
<xref linkend="syntax" endterm="aggregates-syntax">.
+-->
+ See also <xref linkend="syntax" endterm="aggregates-syntax">;
+ refer to
+ the <citetitle>PostgreSQL Tutorial</citetitle> for additional
+ introductory information.
</para>
<para>
@@ -1612,7 +1612,6 @@ Not defined by this name. Implements the intersection operator '#'
</table>
</para>
</sect1>
-
</chapter>
<!-- Keep this comment at the end of the file
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 0416c94bad573caafd050a3dc0ad98cd4f3023c0..51f5a041917da50e088e39be1514b729e3e9bdd9 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -49,7 +49,9 @@ have different roles but may be implemented by the same executable.
<Para>
A frontend sends a startup packet to the postmaster. This includes the names
of the user and the database the user wants to connect to. The postmaster then
-uses this, and the information in the pg_hba.conf(5) file to determine what
+uses this, and the information in the <filename>pg_hba.conf</filename>
+file
+to determine what
further authentication information it requires the frontend to send (if any)
and responds to the frontend accordingly.
</para>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 11e98f12d6c7f751800b27f3e2c6c519f14cc6a4..3e684c1df2ef6c3150a8b0bb426a08dfcc2e1c40 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,10 +1,65 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.55 2000/06/14 13:12:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.56 2000/07/14 15:26:21 thomas Exp $
-->
<chapter id="release">
<title>Release Notes</title>
+ <sect1>
+ <title>Release 7.1</title>
+ <!--
+ <docinfo>
+ <authorgroup>
+ <author>
+ <firstname>Bruce</firstname>
+ <surname>Momjian</surname>
+ </author>
+ </authorgroup>
+ <date>2000-07-13</date>
+ </docinfo>
+ -->
+
+ <para>
+ Release date 2000-xx-xx.
+
+ <para>
+ Major changes in this release:
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ Nested block comments
+ </term>
+ <listitem>
+ <para>
+ SQL99 defines C-style block comments, and allows them to be nested.
+ </para>
+ </listitem>
+ </varlistentry>
+ </para>
+
+ <sect2>
+ <title>Migration to v7.1</title>
+
+ <para>
+ A dump/restore is required for those running any previous version.
+ </para>
+ </sect2>
+
+ <sect2>
+ <title>Changes</title>
+
+ <para>
+ <programlisting>
+Implement WITHOUT TIME ZONE date/time type qualifier per SQL99 (Thomas)
+Implement nested block comments per SQL99 (Thomas)
+Implement SET SESSION CHARACTERISTICS per SQL99 (Thomas)
+Set session-wide transaction mode READ COMMITTED or SERIALIZABLE (Thomas)
+ </programlisting>
+ </para>
+ </sect2>
+ </sect1>
+
<sect1>
<title>Release 7.0.2</title>
<!--
@@ -1872,7 +1927,8 @@ Better identify tcl and tk libs and includes(Bruce)
</para>
<para>
We now have passwords definable independent of any Unix file. There are
- new SQL USER commands. See the pg_hba.conf manual page for more
+ new SQL USER commands.
+ See the <citetitle>Administrator's Guide</citetitle> for more
information. There is a new table, pg_shadow, which is used to store
user information and user passwords, and it by default only SELECT-able
by the postgres super-user. pg_user is now a view of pg_shadow, and is
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 6c9ccaf45e51223bb570aa30dd9170bbb6a62a8b..7f85c67baa13c9f74a480771937672a8c0378be6 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.22 2000/06/20 18:04:18 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.23 2000/07/14 15:26:21 thomas Exp $
-->
<chapter id="syntax">
@@ -135,18 +135,18 @@ EXECUTE EXISTS EXTRACT
FETCH FLOAT FOR FROM FULL
GRANT
HAVING
-IN INNER INSERT INTERVAL INTO IS
+IN INNER INSERT INTERVAL INTO INOUT IS
JOIN
LEADING LEFT LIKE LOCAL
NAMES NATIONAL NATURAL NCHAR NO NOT NULL
-ON OR OUTER
+ON OR OUT OUTER
PARTIAL PRIMARY PRIVILEGES PROCEDURE PUBLIC
REFERENCES REVOKE RIGHT ROLLBACK
-SELECT SET SUBSTRING
+SELECT SESSION SET SUBSTRING
TO TRAILING TRIM
UNION UNIQUE UPDATE USING
VALUES VARCHAR VARYING VIEW
-WHERE WITH WORK
+WHERE WITH WITHOUT WORK
</programlisting>
</para>
@@ -280,7 +280,7 @@ VALID VERSION
<programlisting>
ABSOLUTE ACTION
-CONSTRAINTS
+CHARACTERISTICS CONSTRAINTS
DAY DEFERRABLE DEFERRED
HOUR
IMMEDIATE INITIALLY INSENSITIVE ISOLATION
@@ -289,9 +289,9 @@ LANGUAGE LEVEL
MATCH MINUTE MONTH
NEXT
OF ONLY OPTION
-PENDANT PRIOR PRIVILEGES
+PATH PENDANT PRIOR PRIVILEGES
READ RELATIVE RESTRICT
-SCROLL SECOND
+SCHEMA SCROLL SECOND
TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TRIGGER
YEAR
ZONE
@@ -349,18 +349,21 @@ UNCOMMITTED UNNAMED
<programlisting>
-- This is a standard SQL comment
</programlisting>
+ </para>
-We also support C-style block comments, e.g.:
+ <para>
+ We also support C-style block comments, e.g.:
<programlisting>
-/* multi
- line
- comment
+/* multi-line comment
+ * with nesting: /* nested block comment */
*/
</programlisting>
-A comment beginning with "/*" extends to the first occurrence of "*/".
-
+ where the comment begins with "<literal>/*</literal>" and extends
+ to the first occurrence of "<literal>*/</literal>". These block
+ comments nest, as specified in SQL99, so that one can comment out
+ larger blocks of code which may contain existing block comments.
</para>
</sect1>