diff --git a/HISTORY b/HISTORY
index e3155d25a8f..5b50b9bcbc1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -161,7 +161,7 @@ Allow subselects on the left side of comparison operators (Tom)
 New parallel regression test (Jan)
 Change backend-side COPY to write files with permissions 644 not 666 (Tom)
 Force permissions on PGDATA directory to be secure, even if it exists (Tom)
-Added psql LastOid variable to return last inserted oid (Peter E)
+Added psql LASTOID variable to return last inserted oid (Peter E)
 Allow concurrent vacuum and remove pg_vlock vacuum lock file (Tom)
 Add permissions check so only Postgres superuser or table owner can
 vacuum (Peter E)
@@ -182,7 +182,7 @@ Allow flag to control COPY input/output of NULLs (Peter E)
 Make postgres user have a password by default (Peter E)
 Add CREATE/ALTER/DROP GROUP (Peter E)
 All administration scripts now support --long options (Peter E, Karel)
-Vacuumdb script now supports --alldb option (Peter E)
+Vacuumdb script now supports --all option (Peter E)
 ecpg new portable FETCH syntax
 Add ecpg EXEC SQL IFDEF, EXEC SQL IFNDEF, EXEC SQL ELSE, EXEC SQL ELIF
         and EXEC SQL ENDIF directives
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 051db61efde..6ff7b718108 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.17 2000/03/23 23:16:47 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.18 2000/03/24 01:20:09 momjian Exp $
 Postgres documentation
 -->
 
@@ -87,8 +87,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
       <listitem>
        <para>
 	If EXCLUSIVE or SHARE are not specified, EXCLUSIVE is assumed.
-	If  ROW or ACCESS is not specified, the entire table is locked
-	for the duration of the transaction.
+	Locks exist for the duration of the transaction.
        </para>
       </listitem>
      </varlistentry>
@@ -117,14 +116,12 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
        <note>
 	<para>
 	 This lock mode is acquired automatically over tables being queried.
-	 It is released after the statement completes.
-	 It does not remain for the duration of the transaction.
 	</para>
        </note>
 
        <para>
 	This is the least restrictive lock mode.  It conflicts only with
-	ACCESS EXCLUSIVE mode. It is used to protect a table being
+	ACCESS EXCLUSIVE mode. It is used to protect a table from being
 	modified by concurrent <command>ALTER TABLE</command>, 
 	<command>DROP TABLE</command> and <command>VACUUM</command> 
 	commands.
@@ -138,8 +135,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
        <note>
        <para>
 	 Automatically acquired by <command>SELECT...FOR UPDATE</command>.
-	 While it is a shared lock, there is the intention to later upgrade
-	 this to a ROW EXCLUSIVE lock.
+	 While it is a shared lock, may be upgrade later to a ROW EXCLUSIVE lock.
 	</para>
        </note>
 
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 094b9befe94..7c1978982b4 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -196,7 +196,7 @@ Allow subselects on the left side of comparison operators (Tom)
 New parallel regression test (Jan)
 Change backend-side COPY to write files with permissions 644 not 666 (Tom)
 Force permissions on PGDATA directory to be secure, even if it exists (Tom)
-Added psql LastOid variable to return last inserted oid (Peter E)
+Added psql LASTOID variable to return last inserted oid (Peter E)
 Allow concurrent vacuum and remove pg_vlock vacuum lock file (Tom)
 Add permissions check so only Postgres superuser or table owner can
 vacuum (Peter E)
@@ -217,7 +217,7 @@ Allow flag to control COPY input/output of NULLs (Peter E)
 Make postgres user have a password by default (Peter E)
 Add CREATE/ALTER/DROP GROUP (Peter E)
 All administration scripts now support --long options (Peter E, Karel)
-Vacuumdb script now supports --alldb option (Peter E)
+Vacuumdb script now supports --all option (Peter E)
 ecpg new portable FETCH syntax
 Add ecpg EXEC SQL IFDEF, EXEC SQL IFNDEF, EXEC SQL ELSE, EXEC SQL ELIF 
 	and EXEC SQL ENDIF directives