diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 1900b513bea..8dda7ec5d63 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
@@ -159,7 +159,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.30 2000/05/02 20:01:51 th
time
- time
+ time [ without time zone ]
time of day
@@ -169,7 +169,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.30 2000/05/02 20:01:51 th
timestamp
- timestamp with time zone
+ timestamp [ with time zone ]
date/time
@@ -581,7 +581,7 @@ CREATE TABLE tablename (1 microsec / 14 digits
- timestamp with time zone
+ timestamp [ with time zone ]
date and time with time zone
8 bytes
1903 AD
@@ -605,7 +605,7 @@ CREATE TABLE tablename (1 day
- time
+ time [ without time zone ]
times of day only
4 bytes
00:00:00.00
@@ -843,7 +843,13 @@ CREATE TABLE tablename (
- time
+ time [ without time zone ]
+
+
+ Per SQL99, this type can be referenced as time and
+ as time without time zone.
+
+
The following are valid time inputs.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 70ffc9cdd94..1e393c623bc 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 '#'
-
Aggregate Functions
@@ -1542,13 +1541,14 @@ Not defined by this name. Implements the intersection operator '#'
Aggregate functions 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
- The PostgreSQL Tutorial
- and
+ See also and
.
+-->
+ See also ;
+ refer to
+ the PostgreSQL Tutorial for additional
+ introductory information.
@@ -1612,7 +1612,6 @@ Not defined by this name. Implements the intersection operator '#'
-
Release Notes
+
+ Release 7.1
+
+
+
+ Release date 2000-xx-xx.
+
+
+ Major changes in this release:
+
+
+
+
+ Nested block comments
+
+
+
+ SQL99 defines C-style block comments, and allows them to be nested.
+
+
+
+
+
+
+ Migration to v7.1
+
+
+ A dump/restore is required for those running any previous version.
+
+
+
+
+ Changes
+
+
+
+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)
+
+
+
+
+
Release 7.0.2
@@ -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
@@ -280,7 +280,7 @@ VALID VERSION
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
-- This is a standard SQL comment
+
-We also support C-style block comments, e.g.:
+
+ We also support C-style block comments, e.g.:
-/* multi
- line
- comment
+/* multi-line comment
+ * with nesting: /* nested block comment */
*/
-A comment beginning with "/*" extends to the first occurrence of "*/".
-
+ where the comment begins with "/*" and extends
+ to the first occurrence of "*/". These block
+ comments nest, as specified in SQL99, so that one can comment out
+ larger blocks of code which may contain existing block comments.