Document the following options:

	FB_DEBUG,
	FB_INSTALL_CDEV,
	FE_8BIT_SUPPORT,
	IBCS2,
	KEY,
	LOUTB,
	SPX_HACK

2 files changed, 26 insertions, 12 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9f09685..3bfaeaf 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1161,6 +1161,9 @@ options 	VGA_WIDTH90		# support 90 column modes
 # To include support for VESA video modes
 options 	VESA
 
+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
 
@@ -1699,6 +1702,7 @@ hint.el.0.irq="9"
 device		ep
 device		ex
 device		fe	1
+options 	FE_8BIT_SUPPORT		# LAC-98 support
 hint.fe.0.at="isa"
 hint.fe.0.port="0x300"
 device		fea
@@ -1907,6 +1911,7 @@ hint.pca.0.port="0x040"
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick (including IO DATA PCJOY PC Card joystick)
 # labpc: National Instrument's Lab-PC and Lab-PC+
+# The LOUTB option specifies a slower outb() for debugging purposes. 
 # rc: RISCom/8 multiport card
 # rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
@@ -2045,6 +2050,7 @@ hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
 hint.dgm.0.maddr="0xd0000"
 device		labpc	1
+options 	LOUTB
 hint.labpc.0.at="isa"
 hint.labpc.0.port="0x260"
 hint.labpc.0.irq="5"
@@ -2534,6 +2540,11 @@ options		COMPAT_SVR4	# build emulator statically
 options		DEBUG_SVR4	# enable verbose debugging
 device		streams		# STREAMS network driver (required for svr4).
 
+# Enable iBCS2 runtime support for SCO and ISC binaries
+options 	IBCS2
+# Emulate spx device for client side of SVR3 local X interface
+options 	SPX_HACK
+
 # USB support
 # UHCI controller
 device		uhci
@@ -2669,19 +2680,16 @@ options 	DEBUG
 options 	DEBUG_LINUX
 #options 	DISABLE_PSE
 options 	ENABLE_ALART
-options 	FB_DEBUG
-options 	FB_INSTALL_CDEV
-options 	FE_8BIT_SUPPORT
 options 	I4B_SMP_WORKAROUND
 options 	I586_PMC_GUPROF=0x70000
-options 	IBCS2
 options 	KBDIO_DEBUG=2
 options 	KBD_MAXRETRY=4
 options 	KBD_MAXWAIT=6
 options 	KBD_RESETDELAY=201
+
+# Enable the PF_KEY Key Management API.
 options 	KEY
 options 	LOCKF_DEBUG
-options 	LOUTB
 options 	MSGMNB=2049
 options 	MSGMNI=41
 options 	MSGSEG=2049
@@ -2701,7 +2709,6 @@ options 	SC_RENDER_DEBUG
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
 options 	SIMPLELOCK_DEBUG
 options 	SLIP_IFF_OPTS
-options 	SPX_HACK
 options 	TIMER_FREQ="((14318182+6)/12)"
 options 	VFS_BIO_DEBUG
 options 	VM_KMEM_SIZE
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 9f09685..3bfaeaf 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1161,6 +1161,9 @@ options 	VGA_WIDTH90		# support 90 column modes
 # To include support for VESA video modes
 options 	VESA
 
+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
 
@@ -1699,6 +1702,7 @@ hint.el.0.irq="9"
 device		ep
 device		ex
 device		fe	1
+options 	FE_8BIT_SUPPORT		# LAC-98 support
 hint.fe.0.at="isa"
 hint.fe.0.port="0x300"
 device		fea
@@ -1907,6 +1911,7 @@ hint.pca.0.port="0x040"
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick (including IO DATA PCJOY PC Card joystick)
 # labpc: National Instrument's Lab-PC and Lab-PC+
+# The LOUTB option specifies a slower outb() for debugging purposes. 
 # rc: RISCom/8 multiport card
 # rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
@@ -2045,6 +2050,7 @@ hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
 hint.dgm.0.maddr="0xd0000"
 device		labpc	1
+options 	LOUTB
 hint.labpc.0.at="isa"
 hint.labpc.0.port="0x260"
 hint.labpc.0.irq="5"
@@ -2534,6 +2540,11 @@ options		COMPAT_SVR4	# build emulator statically
 options		DEBUG_SVR4	# enable verbose debugging
 device		streams		# STREAMS network driver (required for svr4).
 
+# Enable iBCS2 runtime support for SCO and ISC binaries
+options 	IBCS2
+# Emulate spx device for client side of SVR3 local X interface
+options 	SPX_HACK
+
 # USB support
 # UHCI controller
 device		uhci
@@ -2669,19 +2680,16 @@ options 	DEBUG
 options 	DEBUG_LINUX
 #options 	DISABLE_PSE
 options 	ENABLE_ALART
-options 	FB_DEBUG
-options 	FB_INSTALL_CDEV
-options 	FE_8BIT_SUPPORT
 options 	I4B_SMP_WORKAROUND
 options 	I586_PMC_GUPROF=0x70000
-options 	IBCS2
 options 	KBDIO_DEBUG=2
 options 	KBD_MAXRETRY=4
 options 	KBD_MAXWAIT=6
 options 	KBD_RESETDELAY=201
+
+# Enable the PF_KEY Key Management API.
 options 	KEY
 options 	LOCKF_DEBUG
-options 	LOUTB
 options 	MSGMNB=2049
 options 	MSGMNI=41
 options 	MSGSEG=2049
@@ -2701,7 +2709,6 @@ options 	SC_RENDER_DEBUG
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
 options 	SIMPLELOCK_DEBUG
 options 	SLIP_IFF_OPTS
-options 	SPX_HACK
 options 	TIMER_FREQ="((14318182+6)/12)"
 options 	VFS_BIO_DEBUG
 options 	VM_KMEM_SIZE