Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v
retrieving revision 1.500
diff -c -c -r1.500 guc.c
*** src/backend/utils/misc/guc.c	6 Apr 2009 21:00:52 -0000	1.500
--- src/backend/utils/misc/guc.c	7 Apr 2009 22:15:25 -0000
***************
*** 1316,1322 ****
  	{
  		/* This is PGC_SIGHUP so all backends have the same value. */
  		{"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
! 			gettext_noop("Sets the time to wait on a lock before checking for deadlock."),
  			NULL,
  			GUC_UNIT_MS
  		},
--- 1316,1322 ----
  	{
  		/* This is PGC_SIGHUP so all backends have the same value. */
  		{"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
! 			gettext_noop("Sets the time to wait on a lock before checking for deadlock, in milliseconds."),
  			NULL,
  			GUC_UNIT_MS
  		},
***************
*** 1406,1412 ****
  
  	{
  		{"maintenance_work_mem", PGC_USERSET, RESOURCES_MEM,
! 			gettext_noop("Sets the maximum memory to be used for maintenance operations."),
  			gettext_noop("This includes operations such as VACUUM and CREATE INDEX."),
  			GUC_UNIT_KB
  		},
--- 1406,1412 ----
  
  	{
  		{"maintenance_work_mem", PGC_USERSET, RESOURCES_MEM,
! 			gettext_noop("Sets the maximum memory to be used for maintenance operations, in kilobytes."),
  			gettext_noop("This includes operations such as VACUUM and CREATE INDEX."),
  			GUC_UNIT_KB
  		},
***************
*** 1569,1575 ****
  
  	{
  		{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY,
! 			gettext_noop("Sets the maximum allowed time to complete client authentication."),
  			NULL,
  			GUC_UNIT_S
  		},
--- 1569,1575 ----
  
  	{
  		{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY,
! 			gettext_noop("Sets the maximum allowed time to complete client authentication, in seconds."),
  			NULL,
  			GUC_UNIT_S
  		},
***************
*** 1599,1605 ****
  
  	{
  		{"checkpoint_timeout", PGC_SIGHUP, WAL_CHECKPOINTS,
! 			gettext_noop("Sets the maximum time between automatic WAL checkpoints."),
  			NULL,
  			GUC_UNIT_S
  		},
--- 1599,1605 ----
  
  	{
  		{"checkpoint_timeout", PGC_SIGHUP, WAL_CHECKPOINTS,
! 			gettext_noop("Sets the maximum time between automatic WAL checkpoints, in seconds."),
  			NULL,
  			GUC_UNIT_S
  		},
***************
*** 1632,1638 ****
  
  	{
  		{"wal_writer_delay", PGC_SIGHUP, WAL_SETTINGS,
! 			gettext_noop("WAL writer sleep time between WAL flushes."),
  			NULL,
  			GUC_UNIT_MS
  		},
--- 1632,1638 ----
  
  	{
  		{"wal_writer_delay", PGC_SIGHUP, WAL_SETTINGS,
! 			gettext_noop("WAL writer sleep time between WAL flushes, in milliseconds."),
  			NULL,
  			GUC_UNIT_MS
  		},
***************
*** 1673,1680 ****
  
  	{
  		{"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN,
! 			gettext_noop("Sets the minimum execution time above which "
! 						 "statements will be logged."),
  			gettext_noop("Zero prints all queries. -1 turns this feature off."),
  			GUC_UNIT_MS
  		},
--- 1673,1680 ----
  
  	{
  		{"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN,
! 			gettext_noop("Sets the minimum execution time (in milliseconds) above "
! 						 "which statements will be logged."),
  			gettext_noop("Zero prints all queries. -1 turns this feature off."),
  			GUC_UNIT_MS
  		},
***************
*** 1684,1690 ****
  
  	{
  		{"log_autovacuum_min_duration", PGC_SIGHUP, LOGGING_WHAT,
! 			gettext_noop("Sets the minimum execution milliseconds above which "
  						 "autovacuum actions will be logged."),
  			gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
  			GUC_UNIT_MS
--- 1684,1690 ----
  
  	{
  		{"log_autovacuum_min_duration", PGC_SIGHUP, LOGGING_WHAT,
! 			gettext_noop("Sets the minimum execution in milliseconds above which "
  						 "autovacuum actions will be logged."),
  			gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
  			GUC_UNIT_MS
***************
*** 1695,1701 ****
  
  	{
  		{"bgwriter_delay", PGC_SIGHUP, RESOURCES,
! 			gettext_noop("Background writer sleep time between rounds."),
  			NULL,
  			GUC_UNIT_MS
  		},
--- 1695,1701 ----
  
  	{
  		{"bgwriter_delay", PGC_SIGHUP, RESOURCES,
! 			gettext_noop("Background writer sleep time between rounds, in milliseconds."),
  			NULL,
  			GUC_UNIT_MS
  		},
***************
*** 1827,1833 ****
  
  	{
  		{"autovacuum_naptime", PGC_SIGHUP, AUTOVACUUM,
! 			gettext_noop("Time to sleep between autovacuum runs."),
  			NULL,
  			GUC_UNIT_S
  		},
--- 1827,1833 ----
  
  	{
  		{"autovacuum_naptime", PGC_SIGHUP, AUTOVACUUM,
! 			gettext_noop("Time to sleep between autovacuum runs, in seconds."),
  			NULL,
  			GUC_UNIT_S
  		},
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.258
diff -c -c -r1.258 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	6 Apr 2009 21:00:52 -0000	1.258
--- src/backend/utils/misc/postgresql.conf.sample	7 Apr 2009 22:15:25 -0000
***************
*** 136,142 ****
  
  # - Asynchronous Behavior -
  
! #effective_io_concurrency = 1		# 1-1000, or 0 to disable prefetching
  
  
  #------------------------------------------------------------------------------
--- 136,142 ----
  
  # - Asynchronous Behavior -
  
! #effective_io_concurrency = 1		# 1-1000. 0 disables prefetching
  
  
  #------------------------------------------------------------------------------
***************
*** 167,173 ****
  #checkpoint_segments = 3		# in logfile segments, min 1, 16MB each
  #checkpoint_timeout = 5min		# range 30s-1h
  #checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
! #checkpoint_warning = 30s		# 0 is off
  
  # - Archiving -
  
--- 167,173 ----
  #checkpoint_segments = 3		# in logfile segments, min 1, 16MB each
  #checkpoint_timeout = 5min		# range 30s-1h
  #checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
! #checkpoint_warning = 30s		# 0 disables
  
  # - Archiving -
  
***************
*** 175,181 ****
  				# (change requires restart)
  #archive_command = ''		# command to use to archive a logfile segment
  #archive_timeout = 0		# force a logfile segment switch after this
! 				# number of seconds; 0 is off
  
  
  #------------------------------------------------------------------------------
--- 175,181 ----
  				# (change requires restart)
  #archive_command = ''		# command to use to archive a logfile segment
  #archive_timeout = 0		# force a logfile segment switch after this
! 				# number of seconds; 0 disables
  
  
  #------------------------------------------------------------------------------
***************
*** 253,262 ****
  					# off, meaning append to existing files
  					# in all cases.
  #log_rotation_age = 1d			# Automatic rotation of logfiles will
! 					# happen after that time.  0 to disable.
  #log_rotation_size = 10MB		# Automatic rotation of logfiles will 
  					# happen after that much log output.
! 					# 0 to disable.
  
  # These are relevant when logging to syslog:
  #syslog_facility = 'LOCAL0'
--- 253,262 ----
  					# off, meaning append to existing files
  					# in all cases.
  #log_rotation_age = 1d			# Automatic rotation of logfiles will
! 					# happen after that time.  0 disables.
  #log_rotation_size = 10MB		# Automatic rotation of logfiles will 
  					# happen after that much log output.
! 					# 0 disables.
  
  # These are relevant when logging to syslog:
  #syslog_facility = 'LOCAL0'