From 9b41da6ce48e3bed6730faa6347a5461175cff83 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 11 Dec 1996 00:28:15 +0000
Subject: [PATCH] Rename postgres95 to PostgreSQL.  Add comment for SELECT NULL

---
 src/backend/executor/execTuples.c |   3 +-
 src/man/abort.l                   |   4 +-
 src/man/alter_table.l             |   4 +-
 src/man/begin.l                   |   4 +-
 src/man/built-in.3                |   4 +-
 src/man/catalogs.3                |   4 +-
 src/man/cleardbdir.1              |   4 +-
 src/man/close.l                   |   4 +-
 src/man/cluster.l                 |   4 +-
 src/man/commit.l                  |   4 +-
 src/man/copy.l                    |   6 +-
 src/man/create_aggregate.l        |   4 +-
 src/man/create_database.l         |   4 +-
 src/man/create_function.l         |   4 +-
 src/man/create_index.l            |   4 +-
 src/man/create_operator.l         |   4 +-
 src/man/create_rule.l             |   4 +-
 src/man/create_table.l            |   4 +-
 src/man/create_type.l             |   4 +-
 src/man/create_version.l          |   4 +-
 src/man/create_view.l             |   4 +-
 src/man/createdb.1                |   4 +-
 src/man/createuser.1              |   4 +-
 src/man/delete.l                  |   4 +-
 src/man/destroydb.1               |   4 +-
 src/man/destroydb.l               |   4 +-
 src/man/destroyuser.1             |   4 +-
 src/man/drop.l                    |   4 +-
 src/man/drop_aggregate.l          |   4 +-
 src/man/drop_function.l           |   4 +-
 src/man/drop_index.l              |   4 +-
 src/man/drop_operator.l           |   4 +-
 src/man/drop_rule.l               |   4 +-
 src/man/drop_type.l               |   4 +-
 src/man/end.l                     |   4 +-
 src/man/fetch.l                   |   4 +-
 src/man/grant.l                   |   4 +-
 src/man/initdb.1                  | 271 ++++++++++++++++++++++++------
 src/man/insert.l                  |   4 +-
 src/man/ipcclean.1                |   4 +-
 src/man/large_objects.3           |   6 +-
 src/man/libpq.3                   |   4 +-
 src/man/listen.l                  |   4 +-
 src/man/load.l                    |   4 +-
 src/man/monitor.1                 |   4 +-
 src/man/notify.l                  |   4 +-
 src/man/page.5                    |   6 +-
 src/man/pg_dump.1                 |   4 +-
 src/man/postgres.1                |  21 ++-
 src/man/postmaster.1              |   4 +-
 src/man/psql.1                    |  48 ++++--
 src/man/purge.l                   |   2 +-
 src/man/remove_view.l             |   4 +-
 src/man/rename.l                  |   4 +-
 src/man/revoke.l                  |   4 +-
 src/man/rollback.l                |   4 +-
 src/man/select.l                  |   4 +-
 src/man/sql.l                     |   4 +-
 src/man/unix.1                    |   4 +-
 src/man/update.l                  |   4 +-
 src/man/vacuum.l                  |   4 +-
 61 files changed, 387 insertions(+), 188 deletions(-)

diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 9fe9757866..a1fa78ad3b 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.4 1996/12/07 04:37:06 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.5 1996/12/11 00:26:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -939,6 +939,7 @@ ExecTypeFromTL(List *targetList)
 	    TupleDescInitEntry(typeInfo,
 			       resdom->resno,
 			       resdom->resname,
+			       /* fix for SELECT NULL ... */
 			       get_id_typname(restype?restype:UNKNOWNOID),
 			       0,
 			       false);
diff --git a/src/man/abort.l b/src/man/abort.l
index c4aea44e82..2680493a65 100644
--- a/src/man/abort.l
+++ b/src/man/abort.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/abort.l,v 1.1 1996/11/14 10:15:07 scrappy Exp $
-.TH ABORT SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/abort.l,v 1.2 1996/12/11 00:26:52 momjian Exp $
+.TH ABORT SQL 01/23/93 PostgreSQL PostgreSQL
 .\" XXX This .XA has to go after the .TH so that the index page number goes
 .\"	in the right place...
 .SH Abort
diff --git a/src/man/alter_table.l b/src/man/alter_table.l
index 1a4cb82aa2..5b055649f3 100644
--- a/src/man/alter_table.l
+++ b/src/man/alter_table.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/alter_table.l,v 1.1 1996/11/14 10:15:09 scrappy Exp $
-.TH "ALTER TABLE" SQL 11/5/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/alter_table.l,v 1.2 1996/12/11 00:26:55 momjian Exp $
+.TH "ALTER TABLE" SQL 11/5/95 PostgreSQL PostgreSQL
 .SH NAME
 alter table \(em add attributes to a class
 .SH SYNOPSIS
diff --git a/src/man/begin.l b/src/man/begin.l
index 6f11a4bae7..e63e09b1c9 100644
--- a/src/man/begin.l
+++ b/src/man/begin.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/begin.l,v 1.1 1996/11/14 10:15:11 scrappy Exp $
-.TH BEGIN SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/begin.l,v 1.2 1996/12/11 00:26:59 momjian Exp $
+.TH BEGIN SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 begin \(em begins a transaction
 .SH SYNOPSIS
diff --git a/src/man/built-in.3 b/src/man/built-in.3
index af50320071..3a667260b8 100644
--- a/src/man/built-in.3
+++ b/src/man/built-in.3
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/built-in.3,v 1.2 1996/11/15 17:55:26 momjian Exp $
-.TH BUILT-INS INTRO 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/built-in.3,v 1.3 1996/12/11 00:27:02 momjian Exp $
+.TH BUILT-INS INTRO 11/05/95 PostgreSQL PostgreSQL
 .SH "DESCRIPTION"
 This section describes the data types, functions and operators
 available to users in Postgres as it is distributed.
diff --git a/src/man/catalogs.3 b/src/man/catalogs.3
index 0a1b93dac0..b306c2b66d 100644
--- a/src/man/catalogs.3
+++ b/src/man/catalogs.3
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/catalogs.3,v 1.1 1996/11/14 10:15:20 scrappy Exp $
-.TH "SYSTEM CATALOGS" INTRO 03/13/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/catalogs.3,v 1.2 1996/12/11 00:27:04 momjian Exp $
+.TH "SYSTEM CATALOGS" INTRO 03/13/94 PostgreSQL PostgreSQL
 .SH "Section 7 \(em System Catalogs"
 .de LS
 .PP
diff --git a/src/man/cleardbdir.1 b/src/man/cleardbdir.1
index 6df6ffe8be..09c78544b4 100644
--- a/src/man/cleardbdir.1
+++ b/src/man/cleardbdir.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/cleardbdir.1,v 1.1 1996/11/14 10:15:24 scrappy Exp $
-.TH CLEARDBDIR UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/cleardbdir.1,v 1.2 1996/12/11 00:27:05 momjian Exp $
+.TH CLEARDBDIR UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 cleardbdir \(em completely destroys all database files
 .SH SYNOPSIS
diff --git a/src/man/close.l b/src/man/close.l
index 4220d3120a..9818ce984d 100644
--- a/src/man/close.l
+++ b/src/man/close.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/close.l,v 1.1 1996/11/14 10:15:27 scrappy Exp $
-.TH CLOSE SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/close.l,v 1.2 1996/12/11 00:27:06 momjian Exp $
+.TH CLOSE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 close \(em close a cursor
 .SH SYNOPSIS
diff --git a/src/man/cluster.l b/src/man/cluster.l
index 38707d2141..86d50d832c 100644
--- a/src/man/cluster.l
+++ b/src/man/cluster.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/cluster.l,v 1.1 1996/11/14 10:15:32 scrappy Exp $
-.TH CLUSTER SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/cluster.l,v 1.2 1996/12/11 00:27:07 momjian Exp $
+.TH CLUSTER SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 cluster \(em give storage clustering advice to Postgres
 .SH SYNOPSIS
diff --git a/src/man/commit.l b/src/man/commit.l
index 5078816a85..2a5b3ebbe8 100644
--- a/src/man/commit.l
+++ b/src/man/commit.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/commit.l,v 1.1 1996/11/14 10:15:36 scrappy Exp $
-.TH COMMIT SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/commit.l,v 1.2 1996/12/11 00:27:08 momjian Exp $
+.TH COMMIT SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 commit \(em commit the current transaction 
 .SH SYNOPSIS
diff --git a/src/man/copy.l b/src/man/copy.l
index 9a0499ddc6..cdc7a96561 100644
--- a/src/man/copy.l
+++ b/src/man/copy.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/copy.l,v 1.1 1996/11/14 10:15:39 scrappy Exp $
-.TH COPY SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/copy.l,v 1.2 1996/12/11 00:27:09 momjian Exp $
+.TH COPY SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 copy \(em copy data to or from a class from or to a Unix file.
 .SH SYNOPSIS
@@ -101,7 +101,7 @@ attributes are output as \\N.
 A literal backslash character is output as two consecutive backslashes.
 A literal tab character is represented as a backslash and a tab.
 A literal newline character is represented as a backslash and a newline.
-When loading ASCII data not generated by Postgres95, you will need to
+When loading ASCII data not generated by PostgreSQL, you will need to
 convert backslash characters (\\) to double-backslashes (\\\\) so
 they are loaded properly.
 .SS "BINARY COPY FORMAT"
diff --git a/src/man/create_aggregate.l b/src/man/create_aggregate.l
index a1b4e4db25..c3b5bb70a8 100644
--- a/src/man/create_aggregate.l
+++ b/src/man/create_aggregate.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.3 1996/12/04 14:23:16 momjian Exp $
-.TH "CREATE AGGREGATE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.4 1996/12/11 00:27:11 momjian Exp $
+.TH "CREATE AGGREGATE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create aggregate \(em define a new aggregate
 .SH SYNOPSIS
diff --git a/src/man/create_database.l b/src/man/create_database.l
index f7e5be29b7..50d936a1aa 100644
--- a/src/man/create_database.l
+++ b/src/man/create_database.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_database.l,v 1.1 1996/11/14 10:15:45 scrappy Exp $
-.TH "CREATE DATABASE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_database.l,v 1.2 1996/12/11 00:27:12 momjian Exp $
+.TH "CREATE DATABASE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create database \(em create a new database
 .SH SYNOPSIS
diff --git a/src/man/create_function.l b/src/man/create_function.l
index 69101eef4f..2f33ee4d98 100644
--- a/src/man/create_function.l
+++ b/src/man/create_function.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_function.l,v 1.1 1996/11/14 10:15:48 scrappy Exp $
-.TH "CREATE FUNCTION" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_function.l,v 1.2 1996/12/11 00:27:13 momjian Exp $
+.TH "CREATE FUNCTION" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 create function \(em define a new function
 .SH "SYNOPSIS"
diff --git a/src/man/create_index.l b/src/man/create_index.l
index a322865db5..586ec95867 100644
--- a/src/man/create_index.l
+++ b/src/man/create_index.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_index.l,v 1.2 1996/11/16 05:45:56 momjian Exp $
-.TH "CREATE INDEX" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_index.l,v 1.3 1996/12/11 00:27:14 momjian Exp $
+.TH "CREATE INDEX" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create index \(em construct a secondary index
 .SH SYNOPSIS
diff --git a/src/man/create_operator.l b/src/man/create_operator.l
index 37f0ff585f..02e9cf9aaf 100644
--- a/src/man/create_operator.l
+++ b/src/man/create_operator.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.2 1996/11/30 04:56:18 momjian Exp $
-.TH "CREATE OPERATOR" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_operator.l,v 1.3 1996/12/11 00:27:17 momjian Exp $
+.TH "CREATE OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create operator \(em define a new user operator
 .SH SYNOPSIS
diff --git a/src/man/create_rule.l b/src/man/create_rule.l
index 98c1ba02a2..b9a7a453be 100644
--- a/src/man/create_rule.l
+++ b/src/man/create_rule.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_rule.l,v 1.1 1996/11/14 10:16:03 scrappy Exp $
-.TH "CREATE RULE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_rule.l,v 1.2 1996/12/11 00:27:18 momjian Exp $
+.TH "CREATE RULE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create rule \(em define a new rule
 .SH SYNOPSIS
diff --git a/src/man/create_table.l b/src/man/create_table.l
index 4469f05dfe..73838af62d 100644
--- a/src/man/create_table.l
+++ b/src/man/create_table.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_table.l,v 1.1 1996/11/14 10:16:08 scrappy Exp $
-.TH "CREATE TABLE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_table.l,v 1.2 1996/12/11 00:27:19 momjian Exp $
+.TH "CREATE TABLE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create table \(em create a new class
 .SH SYNOPSIS
diff --git a/src/man/create_type.l b/src/man/create_type.l
index 014e5241e6..de5c6777d4 100644
--- a/src/man/create_type.l
+++ b/src/man/create_type.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_type.l,v 1.1 1996/11/14 10:16:12 scrappy Exp $
-.TH "CREATE TYPE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_type.l,v 1.2 1996/12/11 00:27:20 momjian Exp $
+.TH "CREATE TYPE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create type \(em define a new base data type 
 .SH SYNOPSIS
diff --git a/src/man/create_version.l b/src/man/create_version.l
index 7aa53058df..79362445ba 100644
--- a/src/man/create_version.l
+++ b/src/man/create_version.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_version.l,v 1.1 1996/11/14 10:16:15 scrappy Exp $
-.TH "CREATE VERSION" SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_version.l,v 1.2 1996/12/11 00:27:21 momjian Exp $
+.TH "CREATE VERSION" SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 create version \(em construct a version class 
 .SH SYNOPSIS
diff --git a/src/man/create_view.l b/src/man/create_view.l
index 1b0bed76e1..8462fd5921 100644
--- a/src/man/create_view.l
+++ b/src/man/create_view.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_view.l,v 1.1 1996/11/14 10:16:17 scrappy Exp $
-.TH "CREATE VIEW" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_view.l,v 1.2 1996/12/11 00:27:22 momjian Exp $
+.TH "CREATE VIEW" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create view \(em construct a virtual class
 .SH SYNOPSIS
diff --git a/src/man/createdb.1 b/src/man/createdb.1
index e3ea1b86d2..99c6dcb929 100644
--- a/src/man/createdb.1
+++ b/src/man/createdb.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/createdb.1,v 1.1 1996/11/14 10:16:20 scrappy Exp $
-.TH CREATEDB UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/createdb.1,v 1.2 1996/12/11 00:27:23 momjian Exp $
+.TH CREATEDB UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 createdb \(em create a database
 .SH SYNOPSIS
diff --git a/src/man/createuser.1 b/src/man/createuser.1
index 8cc5cb1f46..114518a3e4 100644
--- a/src/man/createuser.1
+++ b/src/man/createuser.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/createuser.1,v 1.1 1996/11/14 10:16:23 scrappy Exp $
-.TH CREATEUSER UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/createuser.1,v 1.2 1996/12/11 00:27:25 momjian Exp $
+.TH CREATEUSER UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 createuser \(em create a Postgres user
 .SH SYNOPSIS
diff --git a/src/man/delete.l b/src/man/delete.l
index fa3b254d4b..61340a7845 100644
--- a/src/man/delete.l
+++ b/src/man/delete.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/delete.l,v 1.1 1996/11/14 10:16:29 scrappy Exp $
-.TH DELETE SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/delete.l,v 1.2 1996/12/11 00:27:26 momjian Exp $
+.TH DELETE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 delete \(em delete instances from a class
 .SH SYNOPSIS
diff --git a/src/man/destroydb.1 b/src/man/destroydb.1
index ea49424545..66dc5a3075 100644
--- a/src/man/destroydb.1
+++ b/src/man/destroydb.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/destroydb.1,v 1.1 1996/11/14 10:16:32 scrappy Exp $
-.TH DESTROYDB UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/destroydb.1,v 1.2 1996/12/11 00:27:27 momjian Exp $
+.TH DESTROYDB UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 destroydb \(em destroy an existing database
 .SH SYNOPSIS
diff --git a/src/man/destroydb.l b/src/man/destroydb.l
index 283f604f57..249ec250da 100644
--- a/src/man/destroydb.l
+++ b/src/man/destroydb.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/destroydb.l,v 1.1 1996/11/14 10:16:35 scrappy Exp $
-.TH DESTROYDB SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/destroydb.l,v 1.2 1996/12/11 00:27:33 momjian Exp $
+.TH DESTROYDB SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 drop database \(em destroy an existing database
 .SH SYNOPSIS
diff --git a/src/man/destroyuser.1 b/src/man/destroyuser.1
index 6234776fd4..c181a03226 100644
--- a/src/man/destroyuser.1
+++ b/src/man/destroyuser.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/destroyuser.1,v 1.1 1996/11/14 10:16:39 scrappy Exp $
-.TH DESTROYUSER UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/destroyuser.1,v 1.2 1996/12/11 00:27:36 momjian Exp $
+.TH DESTROYUSER UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 destroyuser \(em destroy a Postgres user and associated databases
 .SH SYNOPSIS
diff --git a/src/man/drop.l b/src/man/drop.l
index ccf42efdf4..84ed6edf0f 100644
--- a/src/man/drop.l
+++ b/src/man/drop.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop.l,v 1.1 1996/11/14 10:16:43 scrappy Exp $
-.TH "DROP TABLE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop.l,v 1.2 1996/12/11 00:27:37 momjian Exp $
+.TH "DROP TABLE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop table \(em destroy existing classes
 .SH SYNOPSIS
diff --git a/src/man/drop_aggregate.l b/src/man/drop_aggregate.l
index e7c2775960..7837dcb328 100644
--- a/src/man/drop_aggregate.l
+++ b/src/man/drop_aggregate.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_aggregate.l,v 1.1 1996/11/14 10:16:47 scrappy Exp $
-.TH "DROP AGGREGATE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_aggregate.l,v 1.2 1996/12/11 00:27:38 momjian Exp $
+.TH "DROP AGGREGATE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop aggregate \(em remove the definition of an aggregate
 .SH SYNOPSIS
diff --git a/src/man/drop_function.l b/src/man/drop_function.l
index f7a80358f2..2f596d716e 100644
--- a/src/man/drop_function.l
+++ b/src/man/drop_function.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_function.l,v 1.1 1996/11/14 10:16:53 scrappy Exp $
-.TH "DROP FUNCTION" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_function.l,v 1.2 1996/12/11 00:27:39 momjian Exp $
+.TH "DROP FUNCTION" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop function \(em remove a user-defined C function 
 .SH SYNOPSIS
diff --git a/src/man/drop_index.l b/src/man/drop_index.l
index 5ad8aa16d9..8f08604726 100644
--- a/src/man/drop_index.l
+++ b/src/man/drop_index.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_index.l,v 1.1 1996/11/14 10:17:01 scrappy Exp $
-.TH "DROP INDEX" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_index.l,v 1.2 1996/12/11 00:27:40 momjian Exp $
+.TH "DROP INDEX" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop index \(em removes an index from Postgres
 .SH SYNOPSIS
diff --git a/src/man/drop_operator.l b/src/man/drop_operator.l
index 544a1e3fc9..b6814bf81f 100644
--- a/src/man/drop_operator.l
+++ b/src/man/drop_operator.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_operator.l,v 1.1 1996/11/14 10:17:04 scrappy Exp $
-.TH "DROP OPERATOR" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_operator.l,v 1.2 1996/12/11 00:27:41 momjian Exp $
+.TH "DROP OPERATOR" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop operator \(em remove an operator from the system
 .SH SYNOPSIS
diff --git a/src/man/drop_rule.l b/src/man/drop_rule.l
index b57f7b9c8f..f4f357fa96 100644
--- a/src/man/drop_rule.l
+++ b/src/man/drop_rule.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_rule.l,v 1.1 1996/11/14 10:17:07 scrappy Exp $
-.TH "DROP RULE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_rule.l,v 1.2 1996/12/11 00:27:42 momjian Exp $
+.TH "DROP RULE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop rule \- removes a current rule from Postgres 
 .SH SYNOPSIS
diff --git a/src/man/drop_type.l b/src/man/drop_type.l
index 5899a2dea4..07b91449a3 100644
--- a/src/man/drop_type.l
+++ b/src/man/drop_type.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_type.l,v 1.1 1996/11/14 10:17:09 scrappy Exp $
-.TH "DROP TYPE" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/drop_type.l,v 1.2 1996/12/11 00:27:43 momjian Exp $
+.TH "DROP TYPE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 drop type \(em remove a user-defined type from the system catalogs
 .SH SYNOPSIS
diff --git a/src/man/end.l b/src/man/end.l
index 01b880e42b..4c16c8910f 100644
--- a/src/man/end.l
+++ b/src/man/end.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/end.l,v 1.1 1996/11/14 10:17:10 scrappy Exp $
-.TH END SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/end.l,v 1.2 1996/12/11 00:27:44 momjian Exp $
+.TH END SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 end \(em commit the current transaction 
 .SH SYNOPSIS
diff --git a/src/man/fetch.l b/src/man/fetch.l
index 02b06068ca..37d489ea0d 100644
--- a/src/man/fetch.l
+++ b/src/man/fetch.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/fetch.l,v 1.1 1996/11/14 10:17:13 scrappy Exp $
-.TH FETCH SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/fetch.l,v 1.2 1996/12/11 00:27:45 momjian Exp $
+.TH FETCH SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 fetch \(em fetch instance(s) from a cursor
 .SH SYNOPSIS
diff --git a/src/man/grant.l b/src/man/grant.l
index a761893f7c..661571cc08 100644
--- a/src/man/grant.l
+++ b/src/man/grant.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/grant.l,v 1.1 1996/11/14 10:17:15 scrappy Exp $
-.TH GRANT SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/grant.l,v 1.2 1996/12/11 00:27:46 momjian Exp $
+.TH GRANT SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 grant \(em grant access control to a user or group
 .SH SYNOPSIS
diff --git a/src/man/initdb.1 b/src/man/initdb.1
index 57e829651c..d52826c550 100644
--- a/src/man/initdb.1
+++ b/src/man/initdb.1
@@ -1,83 +1,248 @@
 .\" This is -*-nroff-*-
-.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/initdb.1,v 1.1 1996/11/14 10:17:17 scrappy Exp $
-.TH INITDB UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/initdb.1,v 1.2 1996/12/11 00:27:47 momjian Exp $
+.TH INITDB UNIX 11/29/96 PostgreSQL PostgreSQL
 .SH NAME
-initdb \(em initalize the database templates and primary directories
+initdb \(em create a new Postgres database system
 .SH SYNOPSIS
 .BR "initdb"
 [\c
-.BR "-d"
+.BR "--pglib="\c
+.IR "directory"\c
 ]
 [\c
-.BR "-n"
+.BR "--pgdata="\c
+.IR "directory"\c
 ]
 [\c
-.BR "-r directory"
+.BR "--username="\c
+.IR "username"\c
 ]
 [\c
-.BR "-t"
+.BR "--template"\c
 ]
 [\c
-.BR "-u username"
+.BR "--noclean"\c
 ]
 [\c
-.BR "-v"
+.BR "--debug"\c
 ]
+
+.BR "initdb"
+[\c
+.BR "-l"
+.IR "directory"\c
+]
+[\c
+.BR "-r"
+.IR "directory"\c
+]
+[\c
+.BR "-u"
+.IR "username"\c
+]
+[\c
+.BR "-t"\c
+]
+[\c
+.BR "-n"\c
+]
+[\c
+.BR "-d"\c
+]
+
+
 .SH DESCRIPTION
 .IR Initdb
-sets up the initial template databases and is normally executed as
-part of the installation process.  The template database is created
-under the directory specified by the the environment variable 
-.SM PGDATA,
-or to a default specified at compile-time.  The template database
-is then 
-.BR vacuum ed.
+Creates a new Postgres database system.  A database system is a
+collection of databases that are all administered by the same Unix user
+and managed by a single postmaster.
 .PP
+Creating a database system consists of creating the directories in which
+the database data will live, generating the shared catalog tables 
+(tables that don't belong to any particular database), and
+creating the
+.IR template1
+database.  What is the 
+.IR template1
+database?  When you create a database, Postgres does it by copying
+everything from the
+.IR template1
+database.  It contains catalog tables filled in for things like the
+builtin types.
+.PP     
+After 
+.IR initdb
+creates the database, it 
+.BR vacuum 's
+it.
+.PP
+There are 3 ways to give parameters to 
+.IR initdb .
+First, you can use initdb command options.  Second, you can set environment
+variables before invoking initdb.  Third, you can have a program called
+.IR postconfig
+in your Unix command search path. 
 .IR Initdb
-is a shell script that invokes the backend server directly.  Hence, it
-must be executed by the Postgres super-user.
+invokes that program and the program writes 
+.IR initdb
+parameters to its standard output stream.
+.PP
+Command options always override parameters specified any other way.
+The values returned by
+.IR postconfig 
+override any environment variables, but your
+.IR postconfig 
+program may base its output on the environment variables if you want
+their values to be used.
+.PP
+The value that 
+.IR postconfig 
+outputs must have the format
+.PP
+    var1=value1 var2=value2 ...  
+.PP
+It can output nothing if it doesn't want to supply any parameters.
+The "varN" values are equal to the corresponding environment variable
+names.  For example, outputting "PGDATA=/tmp/postgres_test" has the
+same effect as invoking
+.IR initdb 
+with an environment variable called "PGDATA" whose value is
+"/tmp/postgres_test".
+.PP
+There are 3 parameters you must supply to initdb to tell it how to 
+create the database system:
+.PP
+1) Where are the files that make up Postgres?  Apart from files that
+have to go in particular directories because of their function, the
+files that make up the Postgres software were installed in a directory
+called the "pglib" directory.  An example of a file that will be found
+there that 
+.IR initdb
+needs is global1.bki.source, which contains all the information that goes
+into the shared catalog tables.  Use the 
+.BR --pglib
+(\c
+.BR -l )
+option or the 
+.BR PGLIB
+environment variable.
+.PP
+2) Where in your Unix filesystem do you want the database data to go?
+The top level directory is called the "pgdata" directory.  Use the
+.BR --pgdata 
+(\c
+.BR -d )
+option or the 
+.BR PGDATA
+environment variable.
+.PP
+3) Who will be the Postgres superuser for this database system?  The
+Postgres superuser is a Unix user that owns all files that store the database
+system and also owns the postmaster and backend processes that access them.
+Use the
+.BR --username
+(\c
+.BR -u )
+option or the 
+.BR PGUSER
+environment variable.  Or just let it default to you (the Unix user who
+runs
+.IR initdb ).
+Note that only the Unix superuser can create a database system with a
+different user as Postgres superuser.
+
+
+
 .PP
 .IR Initdb
 understands the following command-line options:
-.TP
-.BR "-d"
-Print debugging output from the backend server.  This option generates
-a tremendous amount of information.  This option also turns off the
-final vacuuming step.
-.TP
-.BR "-n"
-Run in \*(lqnoclean\*(rq mode.  By default, 
-.IR initdb
-cleans up (recursively unlinks) the data directory if any error
-occurs, which also removes any core files left by the backend server.
-This option inhibits any tidying-up.
-.TP
-.BR "-r directory"
-Use the specified data directory.
-.TP
+
+.BR "--pglib="\c
+.IR "directory"
+.BR "-l"
+.IR "directory"
+
+Use the Postgres files in the specified directory, as explained above.
+
+.BR "--pgdata="\c
+.IR "directory"
+.BR "-r"
+.IR "directory"
+
+Put the database system in this directory, as explained above.
+
+.BR "--username="\c
+.IR "username"
+.BR "-u"
+.IR "username"
+
+Build the database system with the specified Unix user as the Postgres
+superuser for it, as explained above.
+
+.BR "--template"
 .BR "-t"
-Update template database only.
-.TP
-.BR "-u username"
-Run as the specified username.
-.TP
-.BR "-v"
-Produce verbose output, printing messages stating where the
-directories are being created, etc.
+
+Replace the
+.IR template1
+database in an existing database system, and don't touch anything else.
+This is useful when you need to upgrade your 
+.IR template1
+database using 
+.IR initdb
+from a newer release of Postgres, or when your 
+.IR template1
+database has become corrupted by some system problem.  Normally the
+contents of
+.IR template1
+remain constant throughout the life of the database system.  You can't
+destroy anything by running
+.IR initdb
+with the 
+.BR --template
+option.
+
+.BR "--noclean"
+.BR "-n"
+
+Run in \*(lqnoclean\*(rq mode.  By default, 
+when 
+.IR initdb
+determines that error prevent it from completely creating the database
+system, it removes any files it may have created before determining
+that it can't finish the job.  That includes any core files left by
+the programs it invokes.  This option inhibits any tidying-up and is
+thus useful for debugging.
+
+.BR "--debug"
+.BR "-d"
+
+Print debugging output from the bootstrap backend.  
+The bootstrap backend is the program 
+.IR initdb
+uses to create the catalog tables.  This option generates a tremendous
+amount of output.  It also turns off the final vacuuming step.
+
+
 .SH FILES
 .TP
-\&$PGDATA/base
-The location of global (shared) classes.
+postconfig
+(Somewhere in the Unix command search path (defined by the PATH environment
+variable)).  This is a program that specifies defaults for some of the
+command options.  See above.
 .TP
-\&$PGDATA/base/template1
-The location of the template database.
+PGLIB/global1.bki.source
+Contents for the shared catalog tables in the new database system.  This
+file is part of the Postgres software.
 .TP
-\&$PGDATA/files/{global1,local1_template1}.bki
-Command files used to generate the global and template databases,
-generated and installed by the initial compilation process.
+PGLIB/local1_template1.bki.source
+Contents for the template1 tables in the new database system.  This
+file is part of the Postgres software.
+
 .SH "SEE ALSO"
-createdb(1),
 vacuum(l),
-bki(files),
-template(files).
+bki(5),
+create_database(l),
+createuser(1),
+psql(1)
+
+
diff --git a/src/man/insert.l b/src/man/insert.l
index b6404c79d6..3334a2a863 100644
--- a/src/man/insert.l
+++ b/src/man/insert.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.1 1996/11/14 10:17:19 scrappy Exp $
-.TH INSERT SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.2 1996/12/11 00:27:49 momjian Exp $
+.TH INSERT SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 insert \(em insert tuples to a relation
 .SH SYNOPSIS
diff --git a/src/man/ipcclean.1 b/src/man/ipcclean.1
index 40ea62354b..2851910d17 100644
--- a/src/man/ipcclean.1
+++ b/src/man/ipcclean.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/ipcclean.1,v 1.1 1996/11/14 10:17:22 scrappy Exp $
-.TH IPCCLEAN UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/ipcclean.1,v 1.2 1996/12/11 00:27:50 momjian Exp $
+.TH IPCCLEAN UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 ipcclean \(em clean up shared memory and semaphores from aborted backends
 .SH SYNOPSIS
diff --git a/src/man/large_objects.3 b/src/man/large_objects.3
index b39c352653..944257a0c3 100644
--- a/src/man/large_objects.3
+++ b/src/man/large_objects.3
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.2 1996/11/15 17:55:29 momjian Exp $
-.TH "LARGE OBJECTS" INTRO 03/18/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.3 1996/12/11 00:27:51 momjian Exp $
+.TH "LARGE OBJECTS" INTRO 03/18/94 PostgreSQL PostgreSQL
 .SH DESCRIPTION
 .PP
 In Postgres, data values are stored in tuples and individual tuples
@@ -259,7 +259,7 @@ library.
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.2 1996/11/15 17:55:29 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/man/Attic/large_objects.3,v 1.3 1996/12/11 00:27:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index f7e28712b6..0eb77dd1cf 100644
--- a/src/man/libpq.3
+++ b/src/man/libpq.3
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.3 1996/11/27 13:49:44 momjian Exp $
-.TH LIBPQ INTRO 03/12/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.4 1996/12/11 00:27:53 momjian Exp $
+.TH LIBPQ INTRO 03/12/94 PostgreSQL PostgreSQL
 .SH DESCRIPTION
 Libpq is the programmer's interface to Postgres.  Libpq is a set of
 library routines that allows queries to pass to the Postgres backend and
diff --git a/src/man/listen.l b/src/man/listen.l
index cd065ff16e..594dbcb618 100644
--- a/src/man/listen.l
+++ b/src/man/listen.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.1 1996/11/14 10:17:28 scrappy Exp $
-.TH "LISTEN" SQL 03/12/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.2 1996/12/11 00:27:54 momjian Exp $
+.TH "LISTEN" SQL 03/12/94 PostgreSQL PostgreSQL
 .SH NAME
 listen \(em listen for notification on a relation
 .SH SYNOPSIS
diff --git a/src/man/load.l b/src/man/load.l
index f813cee08d..f0d5eccbd7 100644
--- a/src/man/load.l
+++ b/src/man/load.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/load.l,v 1.1 1996/11/14 10:17:30 scrappy Exp $
-.TH LOAD SQL 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/load.l,v 1.2 1996/12/11 00:27:55 momjian Exp $
+.TH LOAD SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 load \(em dynamically load an object file
 .SH SYNOPSIS
diff --git a/src/man/monitor.1 b/src/man/monitor.1
index d762113438..7abba7be63 100644
--- a/src/man/monitor.1
+++ b/src/man/monitor.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/monitor.1,v 1.1 1996/11/14 10:17:32 scrappy Exp $
-.TH MONITOR UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/monitor.1,v 1.2 1996/12/11 00:27:56 momjian Exp $
+.TH MONITOR UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 monitor \(em run the interactive terminal monitor
 .SH SYNOPSIS
diff --git a/src/man/notify.l b/src/man/notify.l
index 24470d594f..aa659b9763 100644
--- a/src/man/notify.l
+++ b/src/man/notify.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/notify.l,v 1.1 1996/11/14 10:17:38 scrappy Exp $
-.TH "NOTIFY" SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/notify.l,v 1.2 1996/12/11 00:27:57 momjian Exp $
+.TH "NOTIFY" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 notify \(em signal all frontends and backends listening on a class
 .SH SYNOPSIS
diff --git a/src/man/page.5 b/src/man/page.5
index 5e39a55d72..34cc35e124 100644
--- a/src/man/page.5
+++ b/src/man/page.5
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/page.5,v 1.1 1996/11/14 10:17:40 scrappy Exp $
-.TH PAGE FILES 01/23/93 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/page.5,v 1.2 1996/12/11 00:27:59 momjian Exp $
+.TH PAGE FILES 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 page structure \(em Postgres database file default page format
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ Diagram 1 shows how pages in both normal Postgres classes and Postgres index
 classes (e.g., a B-tree index) are structured.
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/page.5,v 1.1 1996/11/14 10:17:40 scrappy Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/page.5,v 1.2 1996/12/11 00:27:59 momjian Exp $
 .in +0.5i
 .(b M
 .PS
diff --git a/src/man/pg_dump.1 b/src/man/pg_dump.1
index cb90b23423..a623548622 100644
--- a/src/man/pg_dump.1
+++ b/src/man/pg_dump.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_dump.1,v 1.2 1996/11/17 04:56:16 momjian Exp $
-.TH PG_DUMP UNIX 1/20/96 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_dump.1,v 1.3 1996/12/11 00:27:59 momjian Exp $
+.TH PG_DUMP UNIX 1/20/96 PostgreSQL PostgreSQL
 .SH NAME
 pg_dump \(em dumps out a Postgres database into a script file
 .SH SYNOPSIS
diff --git a/src/man/postgres.1 b/src/man/postgres.1
index 6f1a935dd8..e39c614b17 100644
--- a/src/man/postgres.1
+++ b/src/man/postgres.1
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/postgres.1,v 1.2 1996/12/07 04:39:38 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/postgres.1,v 1.3 1996/12/11 00:28:00 momjian Exp $
 .TH POSTGRES95 UNIX 11/05/95 Postgres95 Postgres95
 .SH NAME
 postgres \(em the Postgres backend server
@@ -10,11 +10,15 @@ postgres \(em the Postgres backend server
 .BR "-B"
 n_buffers]
 [\c
+.BR "-D"
+data_directory]
+[\c
 .BR "-E"
 ]
 [\c
 .BR "-F"
 ]
+.br
 [\c
 .BR "-P"
 filedes]
@@ -22,7 +26,6 @@ filedes]
 .BR "-Q"
 ]
 .br
-.in +5n
 [\c
 .BR "-d"
 debug_level]
@@ -53,6 +56,18 @@ The
 .IR postgres
 server understands the following command-line options:
 .TP 5n
+.BR "-D" " data_directory"
+This option specifies the pathname of the directory that contains the
+database system data (the tables, the catalogs, etc.).  If you don't 
+specify this option, Postgres uses the value of the PGDATA environment
+variable.  You must either specify a -D option or set PGDATA.
+ 
+The data directory pathname for a database system is normally determined when
+the database system is created with
+.IR initdb ,
+with a --pgdata option to
+.IR initdb .
+.TP
 .BR "-B" " n_buffers"
 If the backend is running under the 
 .IR postmaster ,
@@ -67,7 +82,7 @@ allocate.  This value defaults to 64.
 Echo all queries.
 .TP
 .BR "-F"
-Disbable automatic fsync() call after each transaction.
+Disable automatic fsync() call after each transaction.
 This option improves performance, but an operating system crash
 while a transaction is in progress will probably cause data loss.
 .TP
diff --git a/src/man/postmaster.1 b/src/man/postmaster.1
index dd96248dee..bad69d7e10 100644
--- a/src/man/postmaster.1
+++ b/src/man/postmaster.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/postmaster.1,v 1.1 1996/11/14 10:17:48 scrappy Exp $
-.TH POSTMASTER UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/postmaster.1,v 1.2 1996/12/11 00:28:02 momjian Exp $
+.TH POSTMASTER UNIX 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 postmaster \(em run the Postgres postmaster
 .SH "SYNOPSIS"
diff --git a/src/man/psql.1 b/src/man/psql.1
index 4d729234df..b48d852d75 100644
--- a/src/man/psql.1
+++ b/src/man/psql.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/psql.1,v 1.3 1996/11/17 04:27:34 momjian Exp $
-.TH PSQL UNIX 1/20/96 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/psql.1,v 1.4 1996/12/11 00:28:03 momjian Exp $
+.TH PSQL UNIX 1/20/96 PostgreSQL PostgreSQL
 .SH NAME
 psql \(em run the interactive query front-end
 .SH SYNOPSIS
@@ -107,7 +107,7 @@ to use in connecting to the
 process.  The default is site-specific.
 .TP
 .BR "-A"
-Turn off fill justification when printing out attributes.
+Turn off fill justification when printing out table elements.
 .TP
 .BR "-c" " query"
 Specifies that
@@ -177,16 +177,16 @@ Run ins single-line mode where each query is terminated by a newline,
 instead of a semicolon.
 .TP
 .BR "-t"
-Turn off printing of attributes names.
+Turn off printing of column names.
 This is useful with the
 .BR -c
 option in shell scripts.
 .TP
 .BR "-x"
-Turns on extended field mode. When enabled each tuple will have its field
-names printed on the left with the field values printed on the right.
-This is useful for tuples which are otherwise too long to fit into
-one screen line. HTML tuple output supports this mode also.
+Turns on extended row format mode. When enabled each row will have its column
+names printed on the left with the column values printed on the right.
+This is useful for rows which are otherwise too long to fit into
+one screen line. HTML row output supports this mode also.
 .PP
 You may set environment variables to avoid typing some of the above
 options.  See the
@@ -231,12 +231,29 @@ and
 .IR notify (l).
 .PP
 .SH "PSQL COMMANDS"
+Anything you enter in psql that begins with an unquoted backslash is a psql
+command.  Anything else is SQL and simply goes into the current query buffer
+(and once you have at least one complete query, it gets automatically 
+submitted to the backend).  Psql commands are also called slash commands.
+.PP
+The format of a psql command is the backslash, followed immediately by
+a command verb, then any arguments.  The arguments are separated from the
+command verb and each other by any number of white space characters.
+.PP
+With single character command verbs, you don't actually need to separate the
+command verb from the argument with white space, for historical reasons.
+You should anyway.
 .IP "\ea"
-Toggle field alignment when printing out attributes.
+Toggle field alignment when printing out table elements.
 .IP "\eC \fIcaption\fR"
 Set the HTML3.0 table caption.
-.IP "\ec \fIdbname\fR"
+.IP "\econnect \fIdbname\fR"
 Establish a connection to a new database. The previous connection is closed.
+.IP "\ecopy \fItable\fR {FROM | TO} \fIfilename\fR"
+Perform a frontend copy.  This is an operation that runs a SQL COPY command,
+but instead of the backend reading or writing a specified file, and 
+consequently requiring special user privilege, psql reads or writes the 
+file and routes the data to or from the backend.
 .IP "\ed [\fItable\fR]"
 List tables in the database, or if
 .IR table
@@ -295,14 +312,14 @@ Reset(clear) the query buffer.
 Print or save the command line history to \fIfilename\fR.  (Only available if psql is
 configured to use readline)
 .IP "\et"
-Toggle display of output attribute name headings and row count (defaults to on).
+Toggle display of output column name headings and row count (defaults to on).
 .IP "\eT"
 Set html3.0 <table ...> options.
 .IP "\ex"
-Toggles extended field mode. When enabled each tuple will have its field
-names printed on the left with the field values printed on the right.
-This is useful for tuples which are otherwise too long to fit into
-one screen line. HTML tuple output mode supports this flag too.
+Toggles extended row format mode. When enabled each row will have its column
+names printed on the left with the column values printed on the right.
+This is useful for rows which are otherwise too long to fit into
+one screen line. HTML row output mode supports this flag too.
 .IP "\e! [\fIcommand\fR]"
 Escape to shell or execute
 .IR command.
@@ -350,3 +367,4 @@ introduction(libpq),
 monitor(1)
 postgres(1),
 postmaster(1).
+
diff --git a/src/man/purge.l b/src/man/purge.l
index 9e1f68a99f..29d8dc6246 100644
--- a/src/man/purge.l
+++ b/src/man/purge.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.TH PURGE SQL 11/05/95 Postgres95 Postgres95
+.TH PURGE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 purge \(em discard historical data
 .SH SYNOPSIS
diff --git a/src/man/remove_view.l b/src/man/remove_view.l
index db10554cea..fdcd0ca395 100644
--- a/src/man/remove_view.l
+++ b/src/man/remove_view.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/remove_view.l,v 1.1 1996/11/14 10:17:55 scrappy Exp $
-.TH "DROP VIEW" SQL 04/25/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/remove_view.l,v 1.2 1996/12/11 00:28:05 momjian Exp $
+.TH "DROP VIEW" SQL 04/25/94 PostgreSQL PostgreSQL
 .SH NAME
 drop view \(em removes a view from Postgres
 .SH SYNOPSIS
diff --git a/src/man/rename.l b/src/man/rename.l
index 8539549bad..75de7ffeb6 100644
--- a/src/man/rename.l
+++ b/src/man/rename.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/rename.l,v 1.1 1996/11/14 10:17:56 scrappy Exp $
-.TH RENAME SQL 02/08/94 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/rename.l,v 1.2 1996/12/11 00:28:06 momjian Exp $
+.TH RENAME SQL 02/08/94 PostgreSQL PostgreSQL
 .SH NAME
 rename \(em rename a class or an attribute in a class
 .SH SYNOPSIS
diff --git a/src/man/revoke.l b/src/man/revoke.l
index 66ec2c8301..fdf0a5ffda 100644
--- a/src/man/revoke.l
+++ b/src/man/revoke.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/revoke.l,v 1.1 1996/11/14 10:17:58 scrappy Exp $
-.TH REVOKE SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/revoke.l,v 1.2 1996/12/11 00:28:07 momjian Exp $
+.TH REVOKE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 revoke \(em revoke access privileges
 .SH SYNOPSIS
diff --git a/src/man/rollback.l b/src/man/rollback.l
index f9b7ae366d..813394a902 100644
--- a/src/man/rollback.l
+++ b/src/man/rollback.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/rollback.l,v 1.1 1996/11/14 10:18:00 scrappy Exp $
-.TH ROLLBACK SQL 01/20/96 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/rollback.l,v 1.2 1996/12/11 00:28:08 momjian Exp $
+.TH ROLLBACK SQL 01/20/96 PostgreSQL PostgreSQL
 .\" XXX This .XA has to go after the .TH so that the index page number goes
 .\"	in the right place...
 .SH NAME
diff --git a/src/man/select.l b/src/man/select.l
index 83974242dd..c4ac5b8eec 100644
--- a/src/man/select.l
+++ b/src/man/select.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.1 1996/11/14 10:18:02 scrappy Exp $
-.TH SELECT SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/select.l,v 1.2 1996/12/11 00:28:09 momjian Exp $
+.TH SELECT SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 select \(em retrieve instances from a class
 .SH SYNOPSIS
diff --git a/src/man/sql.l b/src/man/sql.l
index 98d2135840..2ec478267a 100644
--- a/src/man/sql.l
+++ b/src/man/sql.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.2 1996/11/27 13:49:46 momjian Exp $
-.TH INTRODUCTION SQL 11/5/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.3 1996/12/11 00:28:11 momjian Exp $
+.TH INTRODUCTION SQL 11/5/95 PostgreSQL PostgreSQL
 .SH "Section 4 \(em SQL Commands (COMMANDS)"
 .SH "General Information"
 .SH DESCRIPTION
diff --git a/src/man/unix.1 b/src/man/unix.1
index 2ecc565545..df27900cf4 100644
--- a/src/man/unix.1
+++ b/src/man/unix.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/unix.1,v 1.1 1996/11/14 10:18:07 scrappy Exp $
-.TH INTRODUCTION UNIX 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/unix.1,v 1.2 1996/12/11 00:28:12 momjian Exp $
+.TH INTRODUCTION UNIX 11/05/95 PostgreSQL PostgreSQL
 .SP INFORMATION UNIX 11/05/95
 .BH "SECTION 2 \(em Unix COMMANDS (Unix)"
 .SH "OVERVIEW"
diff --git a/src/man/update.l b/src/man/update.l
index 4094b6c6b7..fb026c828e 100644
--- a/src/man/update.l
+++ b/src/man/update.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/update.l,v 1.1 1996/11/14 10:18:11 scrappy Exp $
-.TH UPDATE SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/update.l,v 1.2 1996/12/11 00:28:13 momjian Exp $
+.TH UPDATE SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 update \(em replace values of attributes in a class
 .SH SYNOPSIS
diff --git a/src/man/vacuum.l b/src/man/vacuum.l
index 297124cd61..b36f95c305 100644
--- a/src/man/vacuum.l
+++ b/src/man/vacuum.l
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/vacuum.l,v 1.1 1996/11/14 10:18:14 scrappy Exp $
-.TH VACUUM SQL 11/05/95 Postgres95 Postgres95
+.\" $Header: /cvsroot/pgsql/src/man/Attic/vacuum.l,v 1.2 1996/12/11 00:28:15 momjian Exp $
+.TH VACUUM SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 vacuum \(em vacuum a database
 .SH SYNOPSIS