Document some more options.

Apologies to Bruce for not yet cleaning it up in sections.  Coming
soon.

2 files changed, 52 insertions, 22 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 6788ce0..1067d0f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -424,6 +424,7 @@ options 	IPTUNNEL		#IP in IPX encapsulation (not available)
 options 	NCP			#NetWare Core protocol
 
 options 	NETATALK		#Appletalk communications protocols
+options 	NETATALKDEBUG		#Appletalk debugging
 
 # These are currently broken but are shipped due to interest.
 #options 	NS			#Xerox NS protocols
@@ -2713,11 +2714,14 @@ options 	CPU_UPGRADE_HW_CACHE
 
 options 	DEBUG
 options 	DEBUG_LINUX
+
 # PECOFF module (Win32 Execution Format)
 options		PECOFF_SUPPORT
 options		PECOFF_DEBUG
+
 # Disable the 4 MByte PSE CPU feature.
 #options 	DISABLE_PSE
+
 options 	ENABLE_ALART
 options 	I4B_SMP_WORKAROUND
 options 	I586_PMC_GUPROF=0x70000
@@ -2732,27 +2736,38 @@ options 	KEY
 # Kernel filelock debugging.
 options 	LOCKF_DEBUG
 
-options 	MSGMNB=2049
-options 	MSGMNI=41
-options 	MSGSEG=2049
-options 	MSGSSZ=16
-options 	MSGTQL=41
-options 	NBUF=512
-options 	NETATALKDEBUG
-options 	NMBCLUSTERS=1024
+# System V compatible message queues
+# Please note that the values provided here are used to test kernel
+# building.  The defaults in the sources provide almost the same numbers.
+# MSGSSZ must be a power of 2 between 8 and 1024.
+options 	MSGMNB=2049	# Max number of chars in queue
+options 	MSGMNI=41	# Max number of message queue identifiers
+options 	MSGSEG=2049	# Max number of message segments
+options 	MSGSSZ=16	# Size of a message segment
+options 	MSGTQL=41	# Max number of messages in system
+
+options 	NBUF=512	# Number of buffer headers
+
+options 	NMBCLUSTERS=1024	# Number of mbuf clusters
+
 options 	PANIC_REBOOT_WAIT_TIME=16
+
 options 	PSM_DEBUG=1
+
 options 	SCSI_NCR_DEBUG
 options 	SCSI_NCR_MAX_SYNC=10000
 options 	SCSI_NCR_MAX_WIDE=1
 options 	SCSI_NCR_MYADDR=7
-options 	SC_DEBUG_LEVEL
-options 	SC_RENDER_DEBUG
+
+options 	SC_DEBUG_LEVEL=5	# Syscons debug level
+options 	SC_RENDER_DEBUG	# syscons rendering debugging
+
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
 options 	SIMPLELOCK_DEBUG
 options 	SLIP_IFF_OPTS
 options 	TIMER_FREQ="((14318182+6)/12)"
-options 	VFS_BIO_DEBUG
+options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
+
 options 	VM_KMEM_SIZE
 options 	VM_KMEM_SIZE_MAX
 options 	VM_KMEM_SIZE_SCALE
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 6788ce0..1067d0f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -424,6 +424,7 @@ options 	IPTUNNEL		#IP in IPX encapsulation (not available)
 options 	NCP			#NetWare Core protocol
 
 options 	NETATALK		#Appletalk communications protocols
+options 	NETATALKDEBUG		#Appletalk debugging
 
 # These are currently broken but are shipped due to interest.
 #options 	NS			#Xerox NS protocols
@@ -2713,11 +2714,14 @@ options 	CPU_UPGRADE_HW_CACHE
 
 options 	DEBUG
 options 	DEBUG_LINUX
+
 # PECOFF module (Win32 Execution Format)
 options		PECOFF_SUPPORT
 options		PECOFF_DEBUG
+
 # Disable the 4 MByte PSE CPU feature.
 #options 	DISABLE_PSE
+
 options 	ENABLE_ALART
 options 	I4B_SMP_WORKAROUND
 options 	I586_PMC_GUPROF=0x70000
@@ -2732,27 +2736,38 @@ options 	KEY
 # Kernel filelock debugging.
 options 	LOCKF_DEBUG
 
-options 	MSGMNB=2049
-options 	MSGMNI=41
-options 	MSGSEG=2049
-options 	MSGSSZ=16
-options 	MSGTQL=41
-options 	NBUF=512
-options 	NETATALKDEBUG
-options 	NMBCLUSTERS=1024
+# System V compatible message queues
+# Please note that the values provided here are used to test kernel
+# building.  The defaults in the sources provide almost the same numbers.
+# MSGSSZ must be a power of 2 between 8 and 1024.
+options 	MSGMNB=2049	# Max number of chars in queue
+options 	MSGMNI=41	# Max number of message queue identifiers
+options 	MSGSEG=2049	# Max number of message segments
+options 	MSGSSZ=16	# Size of a message segment
+options 	MSGTQL=41	# Max number of messages in system
+
+options 	NBUF=512	# Number of buffer headers
+
+options 	NMBCLUSTERS=1024	# Number of mbuf clusters
+
 options 	PANIC_REBOOT_WAIT_TIME=16
+
 options 	PSM_DEBUG=1
+
 options 	SCSI_NCR_DEBUG
 options 	SCSI_NCR_MAX_SYNC=10000
 options 	SCSI_NCR_MAX_WIDE=1
 options 	SCSI_NCR_MYADDR=7
-options 	SC_DEBUG_LEVEL
-options 	SC_RENDER_DEBUG
+
+options 	SC_DEBUG_LEVEL=5	# Syscons debug level
+options 	SC_RENDER_DEBUG	# syscons rendering debugging
+
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
 options 	SIMPLELOCK_DEBUG
 options 	SLIP_IFF_OPTS
 options 	TIMER_FREQ="((14318182+6)/12)"
-options 	VFS_BIO_DEBUG
+options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
+
 options 	VM_KMEM_SIZE
 options 	VM_KMEM_SIZE_MAX
 options 	VM_KMEM_SIZE_SCALE