+ Fix misplacement of `txp'

+ Document our -CURRENT debugging bits

7 files changed, 31 insertions, 31 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 2b20775..98a4834 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -70,10 +70,10 @@ options 	P1003_1B		#Posix P1003_1B real-time extentions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next line is needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -140,8 +140,8 @@ device		ppi		# Parallel port interface device
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		le		# Lance
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		miibus		# MII bus support
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 2b20775..98a4834 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -70,10 +70,10 @@ options 	P1003_1B		#Posix P1003_1B real-time extentions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next line is needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -140,8 +140,8 @@ device		ppi		# Parallel port interface device
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		le		# Lance
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		miibus		# MII bus support
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index bde0483..f727fd6 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -55,10 +55,10 @@ options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -160,8 +160,8 @@ device		ppi		# Parallel port interface device
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index bde0483..f727fd6 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -55,10 +55,10 @@ options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -160,8 +160,8 @@ device		ppi		# Parallel port interface device
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 6b6970c..e407894 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -54,10 +54,10 @@ options		P1003_1B		#Posix P1003_1B real-time extentions
 options 	_KPOSIX_PRIORITY_SCHEDULING
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # Standard busses
 device		isa
@@ -117,8 +117,8 @@ device          ppi             # Parallel port interface device
  
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 2354838..0b878dd 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -60,10 +60,10 @@ options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # Debugging for use in -current
-options 	DDB
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
-options 	WITNESS
+options 	DDB			#Enable the kernel debugger
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -156,8 +156,8 @@ device		olpt
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 00d3d2c..9f072a4 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -36,7 +36,7 @@ options 	MD_ROOT			#MD is a potential root device
 options 	MD_ROOT_SIZE=64
 
 # Debugging for use in -current
-options 	DDB
+options 	DDB			#Enable the kernel debugger
 
 # Pseudo devices - the number indicates how many units to allocate.
 device		md