Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/guc.c,v
retrieving revision 1.127
diff -c -c -r1.127 guc.c
*** src/backend/utils/misc/guc.c	28 May 2003 18:19:09 -0000	1.127
--- src/backend/utils/misc/guc.c	2 Jun 2003 16:03:20 -0000
***************
*** 689,694 ****
--- 689,695 ----
  		60, 1, 600, NULL, NULL
  	},
  
+ 	/* Not for general use */
  	{
  		{"pre_auth_delay", PGC_SIGHUP}, &PreAuthDelay,
  		0, 0, 60, NULL, NULL
***************
*** 871,876 ****
--- 872,878 ----
  		"$user,public", assign_search_path, NULL
  	},
  
+ 	/* Can't be set in postgresql.conf */
  	{
  		{"server_encoding", PGC_INTERNAL, GUC_REPORT},
  		&server_encoding_string,
***************
*** 888,893 ****
--- 890,896 ----
  		"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,
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.78
diff -c -c -r1.78 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	14 May 2003 03:26:02 -0000	1.78
--- src/backend/utils/misc/postgresql.conf.sample	2 Jun 2003 16:03:20 -0000
***************
*** 182,201 ****
  
  
  #
- #	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
  #
  #dynamic_library_path = '$libdir'
--- 182,187 ----