Re-apply Darren's char2-16 removal code.

7 files changed, 15 insertions, 40 deletions

diff --git a/src/man/bki.5 b/src/man/bki.5
index 9fb8e6b2ce2..78c2cc225ee 100644
--- a/src/man/bki.5
+++ b/src/man/bki.5
@@ -1,5 +1,5 @@
 .\" This is -*-nroff-*-
-.\" $Header: /cvsroot/pgsql/src/man/Attic/bki.5,v 1.3 1998/04/07 18:12:50 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/bki.5,v 1.4 1998/04/26 04:09:35 momjian Exp $
 .TH BKI 5 11/04/96 Postgres Postgres
 .SH NAME
 *.bki
@@ -207,7 +207,7 @@ collection as object
 .IR 421,
 print out the class, and then close it.
 .nf
-create pg_opclass (opcname=char16)
+create pg_opclass (opcname=name)
 open pg_opclass
 insert oid=421 (int_ops)
 print
diff --git a/src/man/create_function.l b/src/man/create_function.l
index cff79889bbd..a03626fc348 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.7 1998/04/07 18:12:51 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_function.l,v 1.8 1998/04/26 04:09:37 momjian Exp $
 .TH "CREATE FUNCTION" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH "NAME"
 create function - define a new function
@@ -138,7 +138,6 @@ bool	bool	include/c.h
 box	(BOX *) 	utils/geo-decls.h
 bytea	(bytea *)	include/postgres.h
 char	char	N/A
-char16	Char16 or (char16 *)	include/postgres.h
 cid	CID	include/postgres.h
 int2	int2	include/postgres.h
 int28	(int28 *)	include/postgres.h
diff --git a/src/man/create_index.l b/src/man/create_index.l
index 2247026bce8..0d635908781 100644
--- a/src/man/create_index.l
+++ b/src/man/create_index.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_index.l,v 1.10 1998/04/07 18:12:52 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_index.l,v 1.11 1998/04/26 04:09:39 momjian Exp $
 .TH "CREATE INDEX" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create index - construct a secondary index
@@ -99,26 +99,6 @@ btree   |bpchar_ops |<=
 btree   |bpchar_ops |=       
 btree   |bpchar_ops |>       
 btree   |bpchar_ops |>=      
-btree   |char16_ops |<       
-btree   |char16_ops |<=      
-btree   |char16_ops |=       
-btree   |char16_ops |>       
-btree   |char16_ops |>=      
-btree   |char2_ops  |<       
-btree   |char2_ops  |<=      
-btree   |char2_ops  |=       
-btree   |char2_ops  |>       
-btree   |char2_ops  |>=      
-btree   |char4_ops  |<       
-btree   |char4_ops  |<=      
-btree   |char4_ops  |=       
-btree   |char4_ops  |>       
-btree   |char4_ops  |>=      
-btree   |char8_ops  |<       
-btree   |char8_ops  |<=      
-btree   |char8_ops  |=       
-btree   |char8_ops  |>       
-btree   |char8_ops  |>=      
 btree   |char_ops   |<       
 btree   |char_ops   |<=      
 btree   |char_ops   |=       
@@ -200,10 +180,6 @@ btree   |varchar_ops|=
 btree   |varchar_ops|>       
 btree   |varchar_ops|>=      
 hash    |bpchar_ops |=       
-hash    |char16_ops |=       
-hash    |char2_ops  |=       
-hash    |char4_ops  |=       
-hash    |char8_ops  |=       
 hash    |char_ops   |=       
 hash    |date_ops   |=       
 hash    |float4_ops |=       
@@ -254,7 +230,7 @@ The operator classes
 .IR oidint2_ops ,
 .IR oidint4_ops ,
 and
-.IR oidchar16_ops
+.IR oidname_ops
 represent the use of 
 .IR "functional indices"
 to simulate multi-key indices.
@@ -300,7 +276,7 @@ create index empindex on emp using btree (age int4_ops)
 --Create a btree index on employee name.
 --
 create index empname
-	on emp using btree (name char16_ops)
+	on emp using btree (name name_ops)
 .fi
 .nf
 --
diff --git a/src/man/create_rule.l b/src/man/create_rule.l
index 3c84427f32d..d71dd7d32c5 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.6 1998/04/07 18:12:53 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_rule.l,v 1.7 1998/04/26 04:09:42 momjian Exp $
 .TH "CREATE RULE" SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 create rule - define a new rule
@@ -183,7 +183,7 @@ create rule example_3 is
 --
 --Create a view of the employees working in the toy department.
 --
-create TOYEMP(name = char16, salary = int4)
+create TOYEMP(name = name, salary = int4)
 
 create rule example_4 is
     on select to TOYEMP
diff --git a/src/man/create_table.l b/src/man/create_table.l
index d314241ce50..08463496572 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.16 1998/04/07 18:12:54 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_table.l,v 1.17 1998/04/26 04:09:43 momjian Exp $
 .TH "CREATE TABLE" SQL 09/25/97 PostgreSQL
 .SH NAME
 create table - create a new class
@@ -78,14 +78,14 @@ name as a system catalog class.
 --
 -- Create class emp with attributes name, sal and bdate
 --
-create table emp (name char16, salary float4, bdate abstime)
+create table emp (name name, salary float4, bdate abstime)
 .fi
 .nf
 --
 --Create class permemp with pension information that
 --inherits all fields of emp 
 --
-create table permemp (plan char16) inherits (emp)
+create table permemp (plan name) inherits (emp)
 .fi
 .nf
 --
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index f10ac9f45e5..f62af0616ae 100644
--- a/src/man/libpq.3
+++ b/src/man/libpq.3
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.15 1998/04/07 18:12:56 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.16 1998/04/26 04:09:48 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
@@ -556,7 +556,7 @@ int PQendcopy(PGconn *conn);
 .fi
 As an example:
 .nf
-PQexec(conn, "create table foo (a int4, b char16, d float8)");
+PQexec(conn, "create table foo (a int4, b name, d float8)");
 PQexec(conn, "copy foo from stdin");
 PQputline(conn, "3<TAB>hello world<TAB>4.5\en");
 PQputline(conn,"4<TAB>goodbye world<TAB>7.11\en");
diff --git a/src/man/sql.l b/src/man/sql.l
index 73b64ee4a7c..e3e4cbe8087 100644
--- a/src/man/sql.l
+++ b/src/man/sql.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.10 1998/04/07 18:12:57 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.11 1998/04/26 04:09:51 momjian Exp $
 .TH INTRODUCTION SQL 11/5/95 PostgreSQL PostgreSQL
 .SH "Section 4 - SQL Commands (COMMANDS)"
 .SH "General Information"
@@ -219,7 +219,7 @@ parameter is:
 .fi
 For example, consider the definition of a function, DEPT, as
 .nf
-create function DEPT (char16) 
+create function DEPT (name) 
 	returns dept
 	as 'select * from 
 	    dept where name=$1'