psql \df cleanup and lock manual page cleanup.

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index a4b5bf600879392592ca947df18958f47e1274b2..12aa081a6faaac25b28046f73ff98ef92c88c9c9 100644 (file)
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.130 1998/01/25 20:23:36 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.131 1998/01/28 20:44:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1771,7 +1771,7 @@ HandleSlashCmds(PsqlSettings *pset,
                                        SELECT  t.typname as return_type, \
                                                        p.proname as function, \
                                                        substr(oid8types(p.proargtypes),1,20) as arguments, \
-                                                       substr(obj_description(p.oid),1,23) \
+                                                       substr(obj_description(p.oid),1,28) \
                                        FROM    pg_proc p, pg_type t \
                                        WHERE   p.prorettype = t.oid and \
                                                        (pronargs = 0 or oid8types(p.proargtypes) != '') and \

diff --git a/src/man/lock.l b/src/man/lock.l
index 0f2060dd5e1b3d6b7da3de02c7d23f4deac60d64..0572923e854520fe1b6459ab6ae3996cb4e85ad1 100644 (file)
--- a/src/man/lock.l
+++ b/src/man/lock.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/lock.l,v 1.2 1998/01/27 15:35:30 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/lock.l,v 1.3 1998/01/28 20:44:42 momjian Exp $
 .TH FETCH SQL 01/23/93 PostgreSQL PostgreSQL
 .SH NAME
 lock - exclusive lock a table
@@ -22,7 +22,9 @@ Another example of deadlock is where one user locks one table, and
 another user locks a second table.  While both keep their existing
 locks, the first user tries to lock the second user's table, and the
 second user tries to lock the first user's table. Both users deadlock
-waiting for the tables to become available.
+waiting for the tables to become available.  The only solution to this
+is for both users to lock tables in the same order, so user's lock
+aquisitions and requests to not form a deadlock.
 .SH EXAMPLES
 .nf
 --