diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 48870b4bca..dd78db5149 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.245 2002/12/15 16:17:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.246 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2294,7 +2294,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 	 * status bits.  This is not really necessary, but will save time for
 	 * future transactions examining these tuples.
 	 *
-	 * XXX WARNING that this code fails to clear HEAP_MOVED_OFF tuples from
+	 * XXX NOTICE that this code fails to clear HEAP_MOVED_OFF tuples from
 	 * pages that were move source pages but not move dest pages.  One
 	 * also wonders whether it wouldn't be better to skip this step and
 	 * let the tuple status updates happen someplace that's not holding an
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 726ae556c4..eaa24c23fb 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.22 2002/08/27 03:56:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.23 2003/01/07 22:23:17 tgl Exp $
  *
  * NOTES
  *
@@ -28,10 +28,8 @@
 #include "storage/shmem.h"
 
 /*#define SHMQUEUE_DEBUG*/
+
 #ifdef SHMQUEUE_DEBUG
-
-#define SHMQUEUE_DEBUG_ELOG WARNING
-
 static void dumpQ(SHM_QUEUE *q, char *s);
 #endif
 
@@ -231,7 +229,7 @@ dumpQ(SHM_QUEUE *q, char *s)
 	}
 	snprintf(elem, sizeof(elem), "--->%lx", MAKE_OFFSET(q));
 	strcat(buf, elem);
-	elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf);
+	elog(DEBUG1, "%s: %s", s, buf);
 
 	snprintf(buf, sizeof(buf), "q nexts: %lx", MAKE_OFFSET(q));
 	count = 0;
@@ -251,7 +249,7 @@ dumpQ(SHM_QUEUE *q, char *s)
 	}
 	snprintf(elem, sizeof(elem), "--->%lx", MAKE_OFFSET(q));
 	strcat(buf, elem);
-	elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf);
+	elog(DEBUG1, "%s: %s", s, buf);
 }
 
 #endif   /* SHMQUEUE_DEBUG */
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 94abd521b6..868db0907e 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.106 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -747,8 +747,8 @@ send_message_to_frontend(int type, const char *msg)
 	AssertArg(type <= ERROR);
 
 	pq_beginmessage(&buf);
-	pq_sendbyte(&buf, type != ERROR ? 'N' : 'E');		/* N is INFO, NOTICE, or
-														 * WARNING */
+	/* 'N' (Notice) is for nonfatal conditions, 'E' is for errors */
+	pq_sendbyte(&buf, type < ERROR ? 'N' : 'E');
 	pq_sendstring(&buf, msg);
 	pq_endmessage(&buf);
 
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index fcd898877a..ca9b07c8fa 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.52 2002/11/08 19:12:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.53 2003/01/07 22:23:17 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -153,7 +153,7 @@ psql_error(const char *fmt,...)
 
 
 /*
- * for backend INFO, WARNING, ERROR
+ * for backend Notice mesages (INFO, WARNING, etc)
  */
 void
 NoticeProcessor(void *arg, const char *message)
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index cd48ee38a1..858c4339c4 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.123 2002/11/10 00:14:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.124 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -813,7 +813,7 @@ PQsendQuery(PGconn *conn, const char *query)
  * handleSendFailure: try to clean up after failure to send command.
  *
  * Primarily, what we want to accomplish here is to process an async
- * WARNING message that the backend might have sent just before it died.
+ * NOTICE message that the backend might have sent just before it died.
  *
  * NOTE: this routine should only be called in PGASYNC_IDLE state.
  */
@@ -831,7 +831,7 @@ handleSendFailure(PGconn *conn)
 
 	/*
 	 * Parse any available input messages.	Since we are in PGASYNC_IDLE
-	 * state, only WARNING and NOTIFY messages will be eaten.
+	 * state, only NOTICE and NOTIFY messages will be eaten.
 	 */
 	parseInput(conn);
 }
@@ -905,7 +905,7 @@ parseInput(PGconn *conn)
 			return;
 
 		/*
-		 * NOTIFY and WARNING messages can happen in any state besides
+		 * NOTIFY and NOTICE messages can happen in any state besides
 		 * COPY OUT; always process them right away.
 		 *
 		 * Most other messages should only be processed while in BUSY state.
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index f94f46dd59..2ae1c2630b 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.85 2002/10/24 23:35:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.86 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -690,7 +690,7 @@ pqSendSome(PGconn *conn)
 					/*
 					 * We used to close the socket here, but that's a bad
 					 * idea since there might be unread data waiting
-					 * (typically, a WARNING message from the backend
+					 * (typically, a NOTICE message from the backend
 					 * telling us it's committing hara-kiri...).  Leave
 					 * the socket open until pqReadData finds no more data
 					 * can be read.