Various comment and minor style fixes. No actual content changes.

Inspired by:	bde

7 files changed, 52 insertions, 61 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index acc7f70..d965004 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -12,10 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../i386/conf/NOTES file. 
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
 # If you are in doubt as to the purpose or necessity of a line, check first 
-# in NOTES. Please note that this is the i386 NOTES, but it still contains
-# valuable info for alpha too.
+# in NOTES.
 #
 # For hardware specific information check HARDWARE.TXT
 #
@@ -44,7 +43,8 @@ options 	DEC_ST550		# Personal Workstation 433, 500, 600
 options 	DEC_ST6600		# XP1000, DP264, DS20, DS10, family
 options 	DEC_1000A		# AlphaServer 1000, 1000A, 800
 options 	DEC_KN8AE		# AlphaServer 8200/8400 (Turbolaser)
-options 	DEC_KN300		# AlphaServer 4100 (Rawhide), 1200 (Tincup)
+options 	DEC_KN300		# AlphaServer 4100 (Rawhide),
+					# AlphaServer 1200 (Tincup)
 
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
@@ -112,21 +112,19 @@ device		amr		# AMI MegaRAID
 device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# At keyboard controller
-device		atkbd		# at keyboard
-device		psm		# psm mouse
+device		atkbdc	1	# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-device		vga		# VGA screen
-device		tga		# TGA screen
+device		vga		# VGA video card driver
+device		tga		# TGA video card driver
 
-# splash screen/screen saver
-device		splash
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 device		sc	1
 
-# real time clock
-device		mcclock
+device		mcclock		# MC146818 real time clock device
 
 # Serial (COM) ports (required)
 device		sio		# 8250, 16[45]50 based serial ports
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 31f23d5f..b7ba780 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -12,8 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the NOTES configuration file. If you are
-# in doubt as to the purpose or necessity of a line, check first in NOTES.
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
 #
 # $FreeBSD$
 
@@ -124,14 +125,13 @@ device		mlx		# Mylex DAC960 family
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# At keyboard controller
-device		atkbd		# at keyboard
-device		psm		# psm mouse
+device		atkbdc	1	# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-device		vga		# VGA screen
+device		vga		# VGA video card driver
 
-# splash screen/screen saver
-device		splash
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 device		sc	1
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0b8bb5b..21a84e1 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1014,8 +1014,7 @@ options 	VGA_WIDTH90		# support 90 column modes
 options 	FB_DEBUG		# Frame buffer debugging
 options 	FB_INSTALL_CDEV		# install a CDEV entry in /dev
 
-# Splash screen at start up!  Screen savers require this too.
-device		splash
+device		splash			# Splash screen and screen saver support
 
 # Various screen savers.
 device		apm_saver		# Requires APM
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 31f23d5f..b7ba780 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -12,8 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the NOTES configuration file. If you are
-# in doubt as to the purpose or necessity of a line, check first in NOTES.
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
 #
 # $FreeBSD$
 
@@ -124,14 +125,13 @@ device		mlx		# Mylex DAC960 family
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# At keyboard controller
-device		atkbd		# at keyboard
-device		psm		# psm mouse
+device		atkbdc	1	# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-device		vga		# VGA screen
+device		vga		# VGA video card driver
 
-# splash screen/screen saver
-device		splash
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 device		sc	1
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index a9d8841..4773c53 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -12,10 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../i386/conf/NOTES file.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES. Please note that this is the i386 NOTES, but it still contains
-# valuable info for ia64 too.
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
 #
 # For hardware specific information check HARDWARE.TXT
 #
@@ -68,7 +67,7 @@ options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required
 device		isa
 device		pci
 
-# IA64 uses acpica
+# IA64 uses ACPI
 device 		acpica
 
 # Floppy drives
@@ -83,7 +82,6 @@ device		atapist		# ATAPI tape drives
 
 # SCSI Controllers
 device		ahc		# AHA2940 and onboard AIC7xxx devices
-#device		esp		# 53C94 & friends, not CAM-ified
 device		isp		# Qlogic family
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
@@ -102,14 +100,13 @@ device		amr		# AMI MegaRAID
 device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1
-device		atkbd
-device		psm
+device		atkbdc	1	# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-#device		vga
+device		vga		# VGA video card driver
 
-# splash screen/screen saver
-device		splash
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 #device		sc	1
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 38c562e..6206517 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -12,8 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the NOTES configuration file. If you are
-# in doubt as to the purpose or necessity of a line, check first in NOTES.
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
+# If you are in doubt as to the purpose or necessity of a line, check first 
+# in NOTES.
 #
 # $FreeBSD$
 
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 45e092f..e4e26f6 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -12,10 +12,9 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../i386/conf/NOTES file. 
+# device lines is also present in the ../../conf/NOTES and NOTES files. 
 # If you are in doubt as to the purpose or necessity of a line, check first 
-# in NOTES. Please note that this is the i386 NOTES, but it still contains
-# valuable info for sparc64 too.
+# in NOTES.
 #
 # For hardware specific information check HARDWARE.TXT
 #
@@ -88,7 +87,6 @@ device		atapicd			# ATAPI CDROM drives
 
 # SCSI Controllers
 device		ahc		# AHA2940 and onboard AIC7xxx devices
-#device		esp		# 53C94 & friends, not CAM-ified
 device		isp		# Qlogic family
 device		ispfw		# Firmware module for Qlogic host adapters
 #device		ncr		# NCR/Symbios Logic
@@ -108,31 +106,29 @@ device		pass		# Passthrough device (direct SCSI access)
 #device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-#device		atkbdc	1	# At keyboard controller
-#device		atkbd		# at keyboard
-#device		psm		# psm mouse
+#device		atkbdc	1	# AT keyboard controller
+#device		atkbd		# AT keyboard
+#device		psm		# PS/2 mouse
 
-#device		vga		# VGA screen
+#device		vga		# VGA video card driver
 
-# splash screen/screen saver
-#device		splash
+#device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 #device		sc	1
 
-# the most basic console driver is the OpenBoot firmware
-device		ofw_console
+device		ofw_console	# OpenBoot firmware console device
 
 # Builtin hardware
-device		genclock	# generic clock interface
-device		eeprom		# eeprom (really an ebus driver for the mk48txx)
+device		genclock	# Generic clock interface
+device		eeprom		# eeprom (really an ebus driver for the MK48Txx)
 device		"mk48txx"	# Mostek MK48T02, MK48T08, MK48T59 clock
 
 # Serial (COM) ports
 #device		sio		# 8250, 16[45]50 based serial ports
 #device		se		# Siemens SAB82532 based serial ports
 
-## Parallel port
+# Parallel port
 #device		ppc
 #device		ppbus		# Parallel port bus (required)
 #device		lpt		# Printer
@@ -142,7 +138,7 @@ device		"mk48txx"	# Mostek MK48T02, MK48T08, MK48T59 clock
  
 # PCI Ethernet NICs.
 #device		de		# DEC/Intel DC21x4x (``Tulip'')
-#device		le		# Lance
+#device		lnc		# NE2100, NE32-VL Lance Ethernet cards
 #device		txp		# 3Com 3cR990 (``Typhoon'')
 #device		vx		# 3Com 3c590, 3c595 (``Vortex'')