From b83f711dec3ddacfa3ded9341c5247825799ddfa Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 11 Jun 2003 05:04:51 +0000
Subject: [PATCH] Remove lock* GUC variables from postgresql.conf.

Document why certain GUC variables aren't in postgresql.conf.
---
 src/backend/utils/misc/guc.c                  |  5 ++++-
 src/backend/utils/misc/postgresql.conf.sample | 14 --------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 4d700b4af6..94e7e5b65d 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
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.127 2003/05/28 18:19:09 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.128 2003/06/11 05:04:51 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -689,6 +689,7 @@ static struct config_int
 		60, 1, 600, NULL, NULL
 	},
 
+	/* Not for general use */
 	{
 		{"pre_auth_delay", PGC_SIGHUP}, &PreAuthDelay,
 		0, 0, 60, NULL, NULL
@@ -871,6 +872,7 @@ static struct config_string
 		"$user,public", assign_search_path, NULL
 	},
 
+	/* Can't be set in postgresql.conf */
 	{
 		{"server_encoding", PGC_INTERNAL, GUC_REPORT},
 		&server_encoding_string,
@@ -888,6 +890,7 @@ static struct config_string
 		"notice", assign_log_min_messages, NULL
 	},
 
+	/* Not for general use --- used by SET SESSION AUTHORIZATION */
 	{
 		{"session_authorization", PGC_USERSET, GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL},
 		&session_authorization_string,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 21a956685b..9c0bb8caea 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -181,20 +181,6 @@
 #stats_block_level = false
 
 
-#
-#	Lock Tracing
-#
-#trace_notify = false
-
-# requires LOCK_DEBUG
-#trace_locks = false
-#trace_userlocks = false
-#trace_lwlocks = false
-#debug_deadlocks = false
-#trace_lock_oidmin = 16384
-#trace_lock_table = 0
-
-
 #
 #	Misc
 #