diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 679831053db9f5c58702470b8674c36d9e8fa6b4..cb78308c9f6b0add9f8cdafeab051b5708f4cfad 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.548 2007/11/15 22:25:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.549 2007/12/13 11:55:44 petere Exp $
  *
  * NOTES
  *
@@ -1712,7 +1712,7 @@ processCancelRequest(Port *port, void *pkt)
 			else
 				/* Right PID, wrong key: no way, Jose */
 				ereport(LOG,
-						(errmsg("bad key in cancel request for process %d",
+						(errmsg("wrong key in cancel request for process %d",
 								backendPID)));
 			return;
 		}
@@ -1720,7 +1720,7 @@ processCancelRequest(Port *port, void *pkt)
 
 	/* No matching backend */
 	ereport(LOG,
-			(errmsg("bad pid in cancel request for process %d",
+			(errmsg("PID %d in cancel request did not match any process",
 					backendPID)));
 }
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 6d70fea77d9038543ba465924b160a7c1b484f88..2a10c346bcb5ab17df96ab05f6570c73dc3f6817 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.141 2007/11/15 21:14:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.142 2007/12/13 11:55:44 petere Exp $
  *
  * NOTES:
  *
@@ -1003,7 +1003,7 @@ FileClose(File file)
 			{
 				if (filestats.st_size >= log_temp_files)
 					ereport(LOG,
-							(errmsg("temp file: path \"%s\" size %lu",
+							(errmsg("temporary file: path \"%s\", size %lu",
 									vfdP->fileName,
 									(unsigned long) filestats.st_size)));
 			}