diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index c0752089e74eeae2757db37639e88be4c082abb2..73d0edf8b3fa79facc640cf39ee74a029a487031 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.9 1998/06/23 15:35:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.10 1998/06/23 17:52:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -92,7 +92,6 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitLocks();
-	InitMultiLevelLockm();
 	if (InitMultiLevelLockm() == INVALID_TABLEID)
 		elog(FATAL, "Couldn't create the lock table");
 
@@ -146,7 +145,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key)
 	 * ----------------
 	 */
 	InitLocks();
-	if (InitMultiLevelLockm() == INVALID_TABLEID)
+	if (!MultiTableId && InitMultiLevelLockm() == INVALID_TABLEID)
 		elog(FATAL, "Couldn't attach to the lock table");
 
 	AttachSharedInvalidationState(key);
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index db9917f86aad542604f91cbf5760535558d67aaa..19eafc06ce6780b3fb54aab5e8f326cf89bb8817 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.12 1998/06/15 19:29:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.13 1998/06/23 17:52:28 momjian Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -89,13 +89,6 @@ InitMultiLevelLockm()
 {
 	int			tableId;
 
-	/* -----------------------
-	 * If we're already initialized just return the table id.
-	 * -----------------------
-	 */
-	if (MultiTableId)
-		return MultiTableId;
-
 	tableId = LockTabInit("LockTable", MultiConflicts, MultiPrios, 5);
 	MultiTableId = tableId;
 	if (!(MultiTableId))
diff --git a/src/man/alter_table.l b/src/man/alter_table.l
index 81929ff5b3054f341ea5e0d046c5f78dd4179c77..e77502bfe5ccfe3881c9367441bde07b03833c0b 100644
--- a/src/man/alter_table.l
+++ b/src/man/alter_table.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/alter_table.l,v 1.5 1998/03/31 04:44:19 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/alter_table.l,v 1.6 1998/06/23 17:52:29 momjian Exp $
 .TH "ALTER TABLE" SQL 09/25/97 PostgreSQL
 .SH NAME
 alter table - add attributes to a class, or rename an attribute or class
@@ -30,7 +30,7 @@ after this command is executed.
 .PP
 The new attributes and their types are specified
 in the same style and with the the same restrictions as in
-.IR "create table" (l).
+.IR "create_table" (l).
 .PP
 In order to add an attribute to each class in an entire inheritance
 hierarchy, use the
@@ -99,6 +99,6 @@ alter table emp rename column sports to hobbies
 alter table person * rename column last_name to family_name
 .fi
 .SH "SEE ALSO"
-create table (l),
+create_table (l),
 update (l).
 
diff --git a/src/man/copy.l b/src/man/copy.l
index 4b3ab17b64efc195459697867c24a13bbdef9e30..2cb0617956f243661fee3c848f38cb6fa61e6ebf 100644
--- a/src/man/copy.l
+++ b/src/man/copy.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/copy.l,v 1.4 1998/01/11 22:17:11 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/copy.l,v 1.5 1998/06/23 17:52:30 momjian Exp $
 .TH COPY SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 copy - copy data to or from a class from or to a Unix file.
@@ -139,7 +139,7 @@ Note that variable length attributes are preceded by the attribute's
 length; arrays are simply contiguous streams of the array element
 type.
 .SH "SEE ALSO"
-insert(l), create table(l), vacuum(l), libpq.
+insert(l), create_table(l), vacuum(l), libpq.
 .SH BUGS
 Files used as arguments to the
 .BR copy
diff --git a/src/man/create_aggregate.l b/src/man/create_aggregate.l
index dafaff9ebdb8cae6ed554597172808d5f3c940bb..2c8537e886791190e5efa47fcfceb877ee515260 100644
--- a/src/man/create_aggregate.l
+++ b/src/man/create_aggregate.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.5 1998/01/11 22:17:11 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.6 1998/06/23 17:52:31 momjian Exp $
 .TH "CREATE AGGREGATE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create aggregate - define a new aggregate
@@ -90,5 +90,5 @@ create aggregate avg (sfunc1 = int4add, basetype = int4,
      finalfunc = int4div, initcond1 = "0", initcond2 = "0")
 .fi
 .SH "SEE ALSO"
-create function(l),
-remove aggregate(l).
+create_function(l),
+drop_aggregate(l).
diff --git a/src/man/create_database.l b/src/man/create_database.l
index ba85ee4accf44055c0b4a466052ec21cd3153ec3..a3451ae0e11a15da2426127f642daad4391e81f0 100644
--- a/src/man/create_database.l
+++ b/src/man/create_database.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_database.l,v 1.5 1998/01/11 22:17:13 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_database.l,v 1.6 1998/06/23 17:52:31 momjian Exp $
 .TH "CREATE DATABASE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create database - create a new database
@@ -19,7 +19,7 @@ location must be pre-configured by
 
 .SH "SEE ALSO"
 createdb(1),
-drop database(l),
+drop_database(l),
 destroydb(1),
 initarea(1),
 initdb(1).
diff --git a/src/man/create_function.l b/src/man/create_function.l
index a03626fc348beb3c50920882ae233a0191830ec9..8436d8f1c62b157ea17eeadd9a4f8a0c1fa7ef58 100644
--- a/src/man/create_function.l
+++ b/src/man/create_function.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_function.l,v 1.8 1998/04/26 04:09:37 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_function.l,v 1.9 1998/06/23 17:52:31 momjian Exp $
 .TH "CREATE FUNCTION" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 create function - define a new function
@@ -34,7 +34,7 @@ or
 (The
 .IR "plname"
 is the language name of a created procedural language. See
-create language(l) for details.)
+create_language(l) for details.)
 (The
 .IR "arg is"
 clause may be left out if the function has no arguments, or
@@ -389,7 +389,7 @@ select function hobbies (EMP) returns set of HOBBIES
 	language 'sql'
 .SH "SEE ALSO"
 .PP
-information(1), load(l), drop function(l), create language(l).
+information(1), load(l), drop_function(l), create_language(l).
 .SH "NOTES"
 .SH "Name Space Conflicts"
 More than one function may be defined with the same name, as long as
diff --git a/src/man/create_language.l b/src/man/create_language.l
index 130d21522e3e867e5988383918f65216008df735..f8f0380b6da672c3c8cf1167f0fe70a773d1a50e 100644
--- a/src/man/create_language.l
+++ b/src/man/create_language.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_language.l,v 1.2 1998/01/11 22:17:14 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_language.l,v 1.3 1998/06/23 17:52:31 momjian Exp $
 .TH "CREATE LANGUAGE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 create language - define a new language for functions
@@ -19,7 +19,7 @@ privilege to register a new language.
 The lanname is the name of the new procedural language. It is converted
 to lower case before the new entry in the pg_language system catalog
 is inserted. Note that this case translation is also done on
-create function(l) and drop language(l). Thus, the language name
+create_function(l) and drop_language(l). Thus, the language name
 is case insensitive. A procedural language cannot override one of the
 builtin languages of Postgres.
 .PP
@@ -60,7 +60,7 @@ It's up to the call handler to fetch the pg_proc entry
 and to analyze the argument and return types of the called procedure.
 the
 .IR "as"
-clause from the create function(l) of the procedure will be found in
+clause from the create_function(l) of the procedure will be found in
 the prosrc attribute of the pg_proc entry. This may be the source text
 in the procedural language itself (like for PL/Tcl), a pathname to a
 file or anything else that tells the call handler what to do in detail.
@@ -109,7 +109,7 @@ plsample_call_handler(
 
 .fi
 Only a few thousand lines of code have to be added instead of the dots
-to complete the PL call handler. See create function(l) how to compile
+to complete the PL call handler. See create_function(l) how to compile
 it into a loadable module. The following commands then register the
 sample procedural language.
 .nf
@@ -125,7 +125,7 @@ create procedural language 'plsample'
 .fi
 .SH "SEE ALSO"
 .PP
-create function(l), drop language(l).
+create_function(l), drop_language(l).
 .SH "RESTRICTIONS"
 Since the call handler for a procedural language must be
 registered with Postgres in the 'C' language, it inherits
diff --git a/src/man/create_operator.l b/src/man/create_operator.l
index 3e1d3b20c8550c66d7d2dbe2da4962d6d34f342c..2a5609d5b1998e1fe0aec35d5805cfefa1787802 100644
--- a/src/man/create_operator.l
+++ b/src/man/create_operator.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.4 1998/01/11 22:17:15 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.5 1998/06/23 17:52:32 momjian Exp $
 .TH "CREATE OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create operator - define a new user operator
@@ -66,7 +66,7 @@ The name of the operator,
 can be composed of symbols only.  Also, the
 .IR func_name
 procedure must have been previously defined using
-.IR "create function" (l)
+.IR "create_function" (l)
 and must have one or two arguments.
 .PP
 .\" that multiple instances of the 
@@ -242,8 +242,8 @@ create operator === (
 .\"	arg is (box, box)
 .fi
 .SH "SEE ALSO"
-create function(l),
-drop operator(l).
+create_function(l),
+drop_operator(l).
 .SH BUGS
 Operator names cannot be composed of alphabetic characters in 
 Postgres.
diff --git a/src/man/create_rule.l b/src/man/create_rule.l
index d71dd7d32c5117dbb9ebc277b385b1df9efa1bb8..a8612d429c9fab5cb39fadfe64f37943ed8c27c6 100644
--- a/src/man/create_rule.l
+++ b/src/man/create_rule.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_rule.l,v 1.7 1998/04/26 04:09:42 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_rule.l,v 1.8 1998/06/23 17:52:32 momjian Exp $
 .TH "CREATE RULE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create rule - define a new rule
@@ -199,8 +199,8 @@ create rule example_5 is
 	do update newset salary = 5000
 .fi
 .SH "SEE ALSO"
-drop rule(l),
-create view(l).
+drop_rule(l),
+create_view(l).
 .SH BUGS
 .PP
 .BR "instead"
diff --git a/src/man/create_sequence.l b/src/man/create_sequence.l
index a535001468077a13970ef38a55604e51361a3c90..af30a0e1ebef761d03edb8c7ff79c34cff70f781 100644
--- a/src/man/create_sequence.l
+++ b/src/man/create_sequence.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_sequence.l,v 1.3 1998/01/11 22:17:17 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_sequence.l,v 1.4 1998/06/23 17:52:32 momjian Exp $
 .TH "CREATE SEQUENCE" SQL 04/01/97 PostgreSQL PostgreSQL
 .SH NAME
 create sequence - create a new sequence number generator
@@ -109,4 +109,4 @@ select nextval ('seq');
 insert into table _table_ values (nextval ('seq'),...);
 .fi
 .SH "SEE ALSO"
-drop sequence(l).
+drop_sequence(l).
diff --git a/src/man/create_table.l b/src/man/create_table.l
index 41bf9d5a971f597224326e631604d23a98a2129f..104e58231ae725b191e397f7ad016fc0b0872788 100644
--- a/src/man/create_table.l
+++ b/src/man/create_table.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_table.l,v 1.18 1998/04/27 03:41:33 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_table.l,v 1.19 1998/06/23 17:52:32 momjian Exp $
 .TH "CREATE TABLE" SQL 09/25/97 PostgreSQL
 .SH NAME
 create table - create a new class
@@ -146,4 +146,4 @@ create table component
 The \fBforeign key\fP and \fBreferences\fP keywords are parsed but not yet
 implemented in PostgreSQL 6.3.1.
 .SH "SEE ALSO"
-drop table(l).
+drop_table(l).
diff --git a/src/man/create_trigger.l b/src/man/create_trigger.l
index e95a64627fb76c51ef3da8c9303da2797858dd66..9a3a15803b360c61abac6eefcf6b88e8845d89cc 100644
--- a/src/man/create_trigger.l
+++ b/src/man/create_trigger.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_trigger.l,v 1.3 1998/01/11 22:17:20 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_trigger.l,v 1.4 1998/06/23 17:52:33 momjian Exp $
 .TH "CREATE TRIGGER" SQL 09/25/97 PostgreSQL
 .SH NAME
 create trigger - create a new trigger
@@ -47,4 +47,4 @@ Refer to the SPI and trigger programming guides for more information.
 .SH EXAMPLES
 Examples are included in the contrib area of the source distribution.
 .SH "SEE ALSO"
-drop trigger(l).
+drop_trigger(l).
diff --git a/src/man/create_type.l b/src/man/create_type.l
index 41c21cf6e6acac575b73f1157d89ddf5850fa362..49272216caa8809aea0f0a032f6ad5e43569d3b3 100644
--- a/src/man/create_type.l
+++ b/src/man/create_type.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_type.l,v 1.4 1998/01/11 22:17:21 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_type.l,v 1.5 1998/06/23 17:52:33 momjian Exp $
 .TH "CREATE TYPE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create type - define a new base data type 
@@ -28,7 +28,7 @@ defined for this database.
 .PP
 .BR "Create type"
 requires the registration of two functions (using
-.IR "create function" (l))
+.IR "create_function" (l))
 before defining the type.  The representation of a new base type is
 determined by 
 .IR input_function ,
@@ -155,7 +155,7 @@ and can only be 15 characters long.  This is because Postgres silently
 creates an array type for each base type with a name consisting of the 
 base type's name prepended with an underscore.
 .SH "SEE ALSO"
-create function(l),
-create operator(l),
-drop type(l),
+create_function(l),
+create_operator(l),
+drop_type(l),
 large_objects(3).
diff --git a/src/man/create_version.l b/src/man/create_version.l
index 1d367785a308fdbe39c8e01bd3ae0f057a7c9778..43f885863d767205c6b3200d4472c0acfb45ec1f 100644
--- a/src/man/create_version.l
+++ b/src/man/create_version.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_version.l,v 1.3 1998/01/11 22:17:21 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_version.l,v 1.4 1998/06/23 17:52:34 momjian Exp $
 .TH "CREATE VERSION" SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 create version - construct a version class 
@@ -62,7 +62,7 @@ in [ONG90].
 create version foobar from barfoo [ "Jan 17 1990" ]
 .fi
 .SH "SEE ALSO"
-create view(l), merge(l). 
+create_view(l), merge(l). 
 .SH "BUGS"
 Snapshots (i.e., the optional 
 .IR abstime 
diff --git a/src/man/create_view.l b/src/man/create_view.l
index 996a46995fa558eafc6d8bcb0344b6c5094287d5..00ca8ac3c2b17a02544ea665ee5435ce5e222547 100644
--- a/src/man/create_view.l
+++ b/src/man/create_view.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_view.l,v 1.3 1998/01/11 22:17:22 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_view.l,v 1.4 1998/06/23 17:52:34 momjian Exp $
 .TH "CREATE VIEW" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create view - construct a virtual class
@@ -41,5 +41,5 @@ create rule example1 as
 	where emp.oid = current.oid
 .fi
 .SH "SEE ALSO"
-create table(l), 
-create rule(l),
+create_table(l), 
+create_rule(l),
diff --git a/src/man/drop.l b/src/man/drop.l
index 321a22672d91df51280513511ae84b4e8bd0b883..786a63e1fe79f5ea09914aaf4c6324c68a5bb098 100644
--- a/src/man/drop.l
+++ b/src/man/drop.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop.l,v 1.5 1998/01/11 22:17:26 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop.l,v 1.6 1998/06/23 17:52:34 momjian Exp $
 .TH "DROP ATTRIBUTE" SQL 09/26/97 PostgreSQL
 .SH NAME
 drop - destroy existing attributes
@@ -15,14 +15,14 @@ removes an attribute from the database.
 Refer to a specific man page (e.g. "man drop_table") for details.
 .SH "SEE ALSO"
 delete(l),
-drop aggregate(l),
-drop database(l),
-drop function(l),
-drop index(l),
-drop operator(l),
-drop rule(l),
-drop sequence(l),
-drop table(l),
-drop trigger(l),
-drop type(l),
-drop view(l).
+drop_aggregate(l),
+drop_database(l),
+drop_function(l),
+drop_index(l),
+drop_operator(l),
+drop_rule(l),
+drop_sequence(l),
+drop_table(l),
+drop_trigger(l),
+drop_type(l),
+drop_view(l).
diff --git a/src/man/drop_aggregate.l b/src/man/drop_aggregate.l
index 79e43df105fa15b525f4ebd5154f2f901afdb06b..0bdc80bcc3eddf8ae8c97a71dbf5daa27e633ca1 100644
--- a/src/man/drop_aggregate.l
+++ b/src/man/drop_aggregate.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_aggregate.l,v 1.4 1998/01/11 22:17:27 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_aggregate.l,v 1.5 1998/06/23 17:52:35 momjian Exp $
 .TH "DROP AGGREGATE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop aggregate - remove the definition of an aggregate
@@ -21,4 +21,4 @@ aggregate.
 drop aggregate avg int4
 .fi
 .SH "SEE ALSO"
-create aggregate(l).
+create_aggregate(l).
diff --git a/src/man/drop_database.l b/src/man/drop_database.l
index 7dca6cc922259fdd781fcecc3822c6794bad48ff..6301a5ff416f948a3a49c99fd9ccb3cddeaacd1d 100644
--- a/src/man/drop_database.l
+++ b/src/man/drop_database.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_database.l,v 1.2 1998/01/11 22:17:27 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_database.l,v 1.3 1998/06/23 17:52:35 momjian Exp $
 .TH "DROP DATABASE" SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 drop database - destroy an existing database
@@ -16,7 +16,7 @@ database administrator (see
 .IR createdb (l)
 for details).
 .SH "SEE ALSO"
-create database(l),
+create_database(l),
 destroydb(1).
 .SH BUGS
 This query should 
diff --git a/src/man/drop_function.l b/src/man/drop_function.l
index fa5f851267206ea53eb9b298658a512ef533ae84..14a7a2766b2cca8c5b152ecbc5acaa76c26deb91 100644
--- a/src/man/drop_function.l
+++ b/src/man/drop_function.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_function.l,v 1.3 1998/01/11 22:17:28 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_function.l,v 1.4 1998/06/23 17:52:35 momjian Exp $
 .TH "DROP FUNCTION" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop function - remove a user-defined C function 
@@ -22,7 +22,7 @@ function with the given name and argument types will be removed.
 drop function sqrt(int4)
 .fi
 .SH "SEE ALSO"
-create function(l).
+create_function(l).
 .SH BUGS
 No checks are made to ensure that types, operators or access methods
 that rely on the function have been removed first.
diff --git a/src/man/drop_index.l b/src/man/drop_index.l
index f3f398a38fb9a8dd87da63436f29966344dadb80..fb09dda7796997cf84c4a6a4f8758456a7d2eac4 100644
--- a/src/man/drop_index.l
+++ b/src/man/drop_index.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_index.l,v 1.3 1998/01/11 22:17:29 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_index.l,v 1.4 1998/06/23 17:52:35 momjian Exp $
 .TH "DROP INDEX" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop index - removes an index from Postgres
@@ -19,4 +19,4 @@ execute this command you must be the owner of the index.
 drop index emp_index
 .fi
 .SH "SEE ALSO"
-create index(l).
+create_index(l).
diff --git a/src/man/drop_language.l b/src/man/drop_language.l
index 515f23bb04836c10bad11ffa6e97cf360b7cd0c1..84404213f8dd791573a67ab6a369220107b77c00 100644
--- a/src/man/drop_language.l
+++ b/src/man/drop_language.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_language.l,v 1.2 1998/01/11 22:17:29 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_language.l,v 1.3 1998/06/23 17:52:35 momjian Exp $
 .TH "DROP LANGUAGE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop language - remove a user-defined procedural language
@@ -21,7 +21,7 @@ name
 drop procedural language 'plsample';
 .fi
 .SH "SEE ALSO"
-create language(l).
+create_language(l).
 .SH BUGS
 No checks are made if functions or trigger procedures registered
 in this language still exist. To reenable them without having to
diff --git a/src/man/drop_operator.l b/src/man/drop_operator.l
index 35c6d0f11c7f045776aa2dc842d71641aa55f777..4db93ac0e272d4643773ecf52b718e92ad3b01bb 100644
--- a/src/man/drop_operator.l
+++ b/src/man/drop_operator.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_operator.l,v 1.3 1998/01/11 22:17:30 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_operator.l,v 1.4 1998/06/23 17:52:36 momjian Exp $
 .TH "DROP OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop operator - remove an operator from the system
@@ -41,4 +41,4 @@ drop operator ! (none, bool)
 drop operator ! (int4, none)
 .fi
 .SH "SEE ALSO"
-create operator(l).
+create_operator(l).
diff --git a/src/man/drop_rule.l b/src/man/drop_rule.l
index f4f357fa960012c0797c55358c565c787899ee94..7813f5912d689963996bada3ae60644a236807c6 100644
--- a/src/man/drop_rule.l
+++ b/src/man/drop_rule.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_rule.l,v 1.2 1996/12/11 00:27:42 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_rule.l,v 1.3 1998/06/23 17:52:36 momjian Exp $
 .TH "DROP RULE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop rule \- removes a current rule from Postgres 
@@ -20,8 +20,8 @@ its definition from the system catalogs.
 drop rule example_1
 .fi
 .SH "SEE ALSO"
-create rule(l),
-drop view(l).
+create_rule(l),
+drop_view(l).
 .SH BUGS
 Once a rule is dropped, access to historical information the rule has
 written may disappear.
diff --git a/src/man/drop_table.l b/src/man/drop_table.l
index 17233d043cb3facde5b48de37f1e826ac7892bef..23ad4ce1dc7a4cac8f312a0a59041b1ff63825cd 100644
--- a/src/man/drop_table.l
+++ b/src/man/drop_table.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_table.l,v 1.2 1998/01/11 22:17:31 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_table.l,v 1.3 1998/06/23 17:52:36 momjian Exp $
 .TH "DROP TABLE" SQL 09/26/97 PostgreSQL
 .SH NAME
 drop table - destroy existing classes
@@ -38,13 +38,13 @@ drop table emp, parts
 .fi
 .SH "SEE ALSO"
 delete(l),
-drop aggregate(l),
-drop database(l),
-drop function(l),
-drop index(l),
-drop operator(l),
-drop rule(l),
-drop sequence(l),
-drop trigger(l),
-drop type(l),
-drop view(l).
+drop_aggregate(l),
+drop_database(l),
+drop_function(l),
+drop_index(l),
+drop_operator(l),
+drop_rule(l),
+drop_sequence(l),
+drop_trigger(l),
+drop_type(l),
+drop_view(l).
diff --git a/src/man/drop_trigger.l b/src/man/drop_trigger.l
index c3d138b80d9abbe24acda0d6a446da9a007d9e50..4d895a434bbe17565f14d13daddca3b43d259d55 100644
--- a/src/man/drop_trigger.l
+++ b/src/man/drop_trigger.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_trigger.l,v 1.3 1998/01/11 22:17:32 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_trigger.l,v 1.4 1998/06/23 17:52:36 momjian Exp $
 .TH "DROP TRIGGER" SQL 09/26/97 PostgreSQL
 .SH NAME
 drop trigger - destroy existing trigger
@@ -20,4 +20,4 @@ trigger.
 drop trigger empverify on emp
 .fi
 .SH "SEE ALSO"
-create trigger(l).
+create_trigger(l).
diff --git a/src/man/drop_type.l b/src/man/drop_type.l
index 0d7a3fe1297a8051b4f753252e75c22fe3e4fd55..cfcbb096c2e4eb1d6902a6c285bf6efa791c2010 100644
--- a/src/man/drop_type.l
+++ b/src/man/drop_type.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_type.l,v 1.5 1998/01/11 22:17:33 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_type.l,v 1.6 1998/06/23 17:52:37 momjian Exp $
 .TH "DROP TYPE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop type - remove a user-defined type from the system catalogs
@@ -24,7 +24,7 @@ drop type box
 .fi
 .SH "SEE ALSO"
 pgintro(1),
-create type(l),
-drop operator(l).
+create_type(l),
+drop_operator(l).
 .SH "BUGS"
 If a built-in type is removed, the behavior of the backend is unpredictable.
diff --git a/src/man/drop_view.l b/src/man/drop_view.l
index 001ebf25a32614e57a5e888267c7e90ce916245d..25584efc55f15b8090b0a4b9eebbf2c3cfc93c9b 100644
--- a/src/man/drop_view.l
+++ b/src/man/drop_view.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_view.l,v 1.2 1998/01/11 22:17:34 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_view.l,v 1.3 1998/06/23 17:52:37 momjian Exp $
 .TH "DROP VIEW" SQL 04/25/94 PostgreSQL PostgreSQL
 .SH NAME
 drop view - removes a view from Postgres
@@ -19,5 +19,5 @@ execute this command you must be the owner of the view.
 drop view myview
 .fi
 .SH "SEE ALSO"
-create view(l),
-drop rule(l),
+create_view(l),
+drop_rule(l),
diff --git a/src/man/insert.l b/src/man/insert.l
index 39d35816c099b11a9b4793f88630a21dd074a539..8d9d1b74716e0c315e7b39daa650b0ffc57b91a0 100644
--- a/src/man/insert.l
+++ b/src/man/insert.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.9 1998/01/11 22:17:39 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.10 1998/06/23 17:52:37 momjian Exp $
 .TH INSERT SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 insert - insert tuples to a relation
@@ -110,7 +110,7 @@ insert into tictactoe (game, board)
     values (3,'{{,,},{,,},{,,}}')
 .fi
 .SH "SEE ALSO"
-create table(l),
-create type(l),
+create_table(l),
+create_type(l),
 update(l),
 select(l)
diff --git a/src/man/listen.l b/src/man/listen.l
index 011c58a55f4aa6f84ee4a26d0428c5d010b24760..676cf709b80de91e7bf944ca8e3297ac292fcf8d 100644
--- a/src/man/listen.l
+++ b/src/man/listen.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.4 1998/06/23 15:43:18 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.5 1998/06/23 17:52:37 momjian Exp $
 .TH "LISTEN" SQL 03/12/94 PostgreSQL PostgreSQL
 .SH NAME
 listen - listen for notification on a relation
@@ -30,7 +30,7 @@ notification corresponds.  If this code is not included in
 the application, the event notification will be queued and 
 never be processed.
 .SH "SEE ALSO"
-create rule(l),
+create_rule(l),
 notify(l),
 select(l),
 libpq.
diff --git a/src/man/select.l b/src/man/select.l
index 34bc68d97894ce2424ce31a0d4ab68d92b3bfb15..a21c1767c2819e1c7417d9c353d1e64d88981391 100644
--- a/src/man/select.l
+++ b/src/man/select.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.7 1998/06/17 22:59:26 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.8 1998/06/23 17:52:37 momjian Exp $
 .TH SELECT SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 select - retrieve instances from a class
@@ -119,7 +119,7 @@ select 1.1 * emp.salary as salary
 .SH "SEE ALSO"
 insert(l),
 close(l),
-create table(l),
+create_table(l),
 fetch(l),
 update(l).
 .SH BUGS
diff --git a/src/man/update.l b/src/man/update.l
index ac33e3c1076a17485e20ec2e74f61b58906525d3..ad875027f7a053e4cb71ccbca66bf8bbb8da1920 100644
--- a/src/man/update.l
+++ b/src/man/update.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/update.l,v 1.4 1998/01/11 22:18:00 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/update.l,v 1.5 1998/06/23 17:52:38 momjian Exp $
 .TH UPDATE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 update - replace values of attributes in a class
@@ -39,5 +39,5 @@ update emp
    where mgr = 'Smith'
 .fi
 .SH "SEE ALSO"
-create table(l),
+create_table(l),
 select(l).