diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 677fd4d7bf5b5dab17daeeab5e000c08caa86519..0c2740890da5ef27468c60976194f02cc9c766d3 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.168 2008/03/09 04:56:28 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.169 2008/03/10 03:22:29 tgl Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -2582,7 +2582,7 @@ local0.*    /var/log/postgresql
         <literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>, and
         <literal>PANIC</>.  Each level includes all the levels that
         follow it.  The later the level, the fewer messages are sent
-        to the log.  The default is <literal>NOTICE</>.  Note that
+        to the log.  The default is <literal>WARNING</>.  Note that
         <literal>LOG</> has a different rank here than in
         <varname>client_min_messages</>.
         Only superusers can change this setting.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 1acf2bc06227b17186e21227eda8d71a82a4dcff..2616c9795357755bcf7cb378f3bbc81c92fca25b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.434 2008/03/09 04:56:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.435 2008/03/10 03:22:29 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -209,7 +209,7 @@ bool		SQL_inheritance = true;
 bool		Password_encryption = true;
 
 int			log_min_error_statement = ERROR;
-int			log_min_messages = NOTICE;
+int			log_min_messages = WARNING;
 int			client_min_messages = NOTICE;
 int			log_min_duration_statement = -1;
 int			log_temp_files = -1;
@@ -1935,7 +1935,7 @@ static struct config_string ConfigureNamesString[] =
 						 "includes all the levels that follow it.")
 		},
 		&log_min_messages_str,
-		"notice", assign_log_min_messages, NULL
+		"warning", assign_log_min_messages, NULL
 	},
 
 	{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index d3604c2d5c04851fbe432e093059c69ff2620cc1..e5ae0e851885ff6c5f83ee947751fe9ebae08777 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -278,7 +278,7 @@
 					#   warning
 					#   error
 
-#log_min_messages = notice		# values in order of decreasing detail:
+#log_min_messages = warning		# values in order of decreasing detail:
 					#   debug5
 					#   debug4
 					#   debug3