With asbestos suit on, make the options indenting a little more consistant

so that it doesn't screw up the alignment when commenting out an entry.
Also dequote two entries that do not need it.

3 files changed, 867 insertions, 867 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 01ab89e..c2ad1f2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.609 1999/06/24 03:54:54 jlemon Exp $
+#	$Id: LINT,v 1.610 1999/06/27 19:35:23 mjacob Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -53,13 +53,13 @@ maxusers	10
 # max, and explicitly set the maximum with a shell command for processes
 # that regularly exceed the limit like INND.
 #
-options		MAXDSIZ="(256*1024*1024)"
-options		DFLDSIZ="(256*1024*1024)"
+options 	MAXDSIZ="(256*1024*1024)"
+options 	DFLDSIZ="(256*1024*1024)"
 
 # Options for the VM subsystem
-#options	PQ_NOOPT		# No coloring
-options		PQ_LARGECACHE		# color for 512k/16k cache
-#options	PQ_HUGECACHE		# color for 1024k/16k cache
+#options 	PQ_NOOPT		# No coloring
+options 	PQ_LARGECACHE		# color for 512k/16k cache
+#options 	PQ_HUGECACHE		# color for 1024k/16k cache
 
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
@@ -89,14 +89,14 @@ options         INCLUDE_CONFIG_FILE     # Include this file in kernel
 #
 
 # Mandatory:
-options		SMP			# Symmetric MultiProcessor Kernel
-options		APIC_IO			# Symmetric (APIC) I/O
+options 	SMP			# Symmetric MultiProcessor Kernel
+options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
-options		NCPU=5			# number of CPUs
-options		NBUS=5			# number of busses
-options		NAPIC=2			# number of IO APICs
-options		NINTR=25		# number of INTs
+options 	NCPU=5			# number of CPUs
+options 	NBUS=5			# number of busses
+options 	NAPIC=2			# number of IO APICs
+options 	NINTR=25		# number of INTs
 
 #
 # Rogue SMP hardware:
@@ -195,21 +195,21 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 # NOTE 3: This option may cause failures for software that requires
 # locked cycles in order to operate correctly.
 #
-options		CPU_BLUELIGHTNING_FPU_OP_CACHE
-options		CPU_BLUELIGHTNING_3X
-options		CPU_BTB_EN
-options		CPU_DIRECT_MAPPED_CACHE
-options		CPU_DISABLE_5X86_LSSER
-options		CPU_FASTER_5X86_FPU
-options		CPU_I486_ON_386
-options		CPU_IORT
-options		CPU_LOOP_EN
-options		CPU_RSTK_EN
-options		CPU_SUSP_HLT
-options		CPU_WT_ALLOC
-options		CYRIX_CACHE_WORKS
-options		CYRIX_CACHE_REALLY_WORKS
-#options	NO_F00F_HACK
+options 	CPU_BLUELIGHTNING_FPU_OP_CACHE
+options 	CPU_BLUELIGHTNING_3X
+options 	CPU_BTB_EN
+options 	CPU_DIRECT_MAPPED_CACHE
+options 	CPU_DISABLE_5X86_LSSER
+options 	CPU_FASTER_5X86_FPU
+options 	CPU_I486_ON_386
+options 	CPU_IORT
+options 	CPU_LOOP_EN
+options 	CPU_RSTK_EN
+options 	CPU_SUSP_HLT
+options 	CPU_WT_ALLOC
+options 	CYRIX_CACHE_WORKS
+options 	CYRIX_CACHE_REALLY_WORKS
+#options 	NO_F00F_HACK
 
 #
 # A math emulator is mandatory if you wish to run on hardware which
@@ -217,9 +217,9 @@ options		CYRIX_CACHE_REALLY_WORKS
 # bogus (but freely-distributable) math emulator, or a much more
 # fully-featured but GPL-licensed emulator taken from Linux.
 #
-options		MATH_EMULATE		#Support for x87 emulation
+options 	MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emulation via
+options 	GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 
@@ -231,29 +231,29 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 # FreeBSD.  You probably do NOT want to remove this as much current code
 # still relies on the 4.3 emulation.
 #
-options		COMPAT_43
+options 	COMPAT_43
 
 #
 # Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
-options		USER_LDT		#allow user-level control of i386 ldt
+options 	USER_LDT		#allow user-level control of i386 ldt
 
 #
 # These three options provide support for System V Interface
 # Definition-style interprocess communication, in the form of shared
 # memory, semaphores, and message queues, respectively.
 #
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
+options 	SYSVSHM
+options 	SYSVSEM
+options 	SYSVMSG
 
 #
 # This option includes a MD5 routine in the kernel, this is used for
 # various authentication and privacy uses.
 #
-options		MD5
+options 	MD5
 
 
 #####################################################################
@@ -262,14 +262,14 @@ options		MD5
 #
 # Enable the kernel debugger.
 #
-options		DDB
+options 	DDB
 
 #
 # Don't drop into DDB for a panic. Intended for unattended operation
 # where you may want to drop to DDB from the console, but still want
 # the machine to recover from a panic
 #
-options		DDB_UNATTENDED
+options 	DDB_UNATTENDED
 
 #
 # If using GDB remote mode to debug the kernel, there's a non-standard
@@ -278,12 +278,12 @@ options		DDB_UNATTENDED
 # standard and you're on your own if you enable it.  See also the
 # "remotechat" variables in the FreeBSD specific version of gdb.
 #
-options		GDB_REMOTE_CHAT
+options 	GDB_REMOTE_CHAT
 
 # 
 # KTRACE enables the system-call tracing facility ktrace(2).
 #
-options		KTRACE			#kernel tracing
+options 	KTRACE			#kernel tracing
 
 #
 # The INVARIANTS option is used in a number of source files to enable
@@ -292,7 +292,7 @@ options		KTRACE			#kernel tracing
 # for these conditions, which can only occur as a result of
 # programming errors.
 #
-options		INVARIANTS
+options 	INVARIANTS
 
 #
 # The INVARIANT_SUPPORT option makes us compile in support for
@@ -302,20 +302,20 @@ options		INVARIANTS
 # source files (by changing the source file or specifying it on the
 # command line) if you have 'INVARIANT_SUPPORT' enabled.
 #
-options		INVARIANT_SUPPORT
+options 	INVARIANT_SUPPORT
 
 #
 # The DIAGNOSTIC option is used to enable extra debugging information
 # from some parts of the kernel.  As this makes everything more noisy,
 # it is disabled by default.
 #
-options		DIAGNOSTIC
+options 	DIAGNOSTIC
 
 #
 # PERFMON causes the driver for Pentium/Pentium Pro performance counters
 # to be compiled.  See perfmon(4) for more information.
 #
-options		PERFMON
+options 	PERFMON
 
 
 #
@@ -329,15 +329,15 @@ options COMPILING_LINT
 
 # XXX - this doesn't belong here.
 # Allow ordinary users to take the console - this is useful for X.
-options		UCONSOLE
+options 	UCONSOLE
 
 # XXX - this doesn't belong here either
-options		USERCONFIG		#boot -c editor
-options		INTRO_USERCONFIG	#imply -c and show intro screen
-options		VISUAL_USERCONFIG	#visual boot -c editor
+options 	USERCONFIG		#boot -c editor
+options 	INTRO_USERCONFIG	#imply -c and show intro screen
+options 	VISUAL_USERCONFIG	#visual boot -c editor
 
 # XXX - neither does this
-options		ROOTDEVNAME=\"da0s2e\"
+options 	ROOTDEVNAME=\"da0s2e\"
 
 #####################################################################
 # NETWORKING OPTIONS
@@ -348,27 +348,27 @@ options		ROOTDEVNAME=\"da0s2e\"
 #  Source code for the NS (Xerox Network Service) is provided for amusement
 #  value.
 #
-options		INET			#Internet communications protocols
+options 	INET			#Internet communications protocols
 
-options		IPX			#IPX/SPX communications protocols
-options		IPXIP			#IPX in IP encapsulation (not available)
-options		IPTUNNEL		#IP in IPX encapsulation (not available)
+options 	IPX			#IPX/SPX communications protocols
+options 	IPXIP			#IPX in IP encapsulation (not available)
+options 	IPTUNNEL		#IP in IPX encapsulation (not available)
 
-options		NETATALK		#Appletalk communications protocols
+options 	NETATALK		#Appletalk communications protocols
 
 # These are currently broken but are shipped due to interest.
-#options		NS			#Xerox NS protocols
+#options 	NS			#Xerox NS protocols
 
 # These are currently broken and are no longer shipped due to lack
 # of interest.
-#options		CCITT			#X.25 network layer
-#options		ISO
-#options		TPIP			#ISO TP class 4 over IP
-#options		TPCONS			#ISO TP class 0 over X.25
-#options		LLC			#X.25 link layer for Ethernets
-#options		HDLC			#X.25 link layer for serial lines
-#options		EON			#ISO CLNP over IP
-#options		NSIP			#XNS over IP
+#options 	CCITT			#X.25 network layer
+#options 	ISO
+#options 	TPIP			#ISO TP class 4 over IP
+#options 	TPCONS			#ISO TP class 0 over X.25
+#options 	LLC			#X.25 link layer for Ethernets
+#options 	HDLC			#X.25 link layer for serial lines
+#options 	EON			#ISO CLNP over IP
+#options 	NSIP			#XNS over IP
 
 #
 # Network interfaces:
@@ -454,20 +454,20 @@ options PPP_FILTER			#enable bpf filtering (needs bpfilter)
 #
 # TCPDEBUG is undocumented.
 #
-options		TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
-options		MROUTING		# Multicast routing
+options 	TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
+options 	MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
 options         IPFIREWALL_FORWARD      #enable transparent proxy support
-options		IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
-options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
-options		IPDIVERT		#divert sockets
-options		IPFILTER		#kernel ipfilter support
-options		IPFILTER_LOG		#ipfilter logging
-#options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
-options		IPSTEALTH		#support for stealth forwarding
-options		TCPDEBUG
+options 	IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
+options 	IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
+options 	IPDIVERT		#divert sockets
+options 	IPFILTER		#kernel ipfilter support
+options 	IPFILTER_LOG		#ipfilter logging
+#options 	IPFILTER_LKM		#kernel support for ip_fil.o LKM
+options 	IPSTEALTH		#support for stealth forwarding
+options 	TCPDEBUG
 
 # ICMP_BANDLIM enables icmp error response bandwidth limiting.   You
 # typically want this option as it will help protect the machine from
@@ -479,8 +479,8 @@ options         ICMP_BANDLIM
 # IPFIREWALL as well. See the dummynet(4) manpage for more info.
 # BRIDGE enables bridging between ethernet cards -- see bridge(4).
 # You can use IPFIREWALL and dummynet together with bridging.
-options	DUMMYNET
-options	BRIDGE
+options DUMMYNET
+options BRIDGE
 
 #
 # ATM (HARP version) options
@@ -504,11 +504,11 @@ options	BRIDGE
 # The `hfa' driver provides support for the FORE Systems, Inc.
 # PCA-200E ATM PCI Adapter.
 #
-options		ATM_CORE		#core ATM protocol family
-options		ATM_IP			#IP over ATM support
-options		ATM_SIGPVC		#SIGPVC signalling manager
-options		ATM_SPANS		#SPANS signalling manager
-options		ATM_UNI			#UNI signalling manager
+options 	ATM_CORE		#core ATM protocol family
+options 	ATM_IP			#IP over ATM support
+options 	ATM_SIGPVC		#SIGPVC signalling manager
+options 	ATM_SPANS		#SPANS signalling manager
+options 	ATM_UNI			#UNI signalling manager
 device		hea0			#Efficient ENI-155p ATM PCI
 device		hfa0			#FORE PCA-200E ATM PCI
 
@@ -530,30 +530,30 @@ device		hfa0			#FORE PCA-200E ATM PCI
 #
 
 # One of these is mandatory:
-options		FFS			#Fast filesystem
-options		MFS			#Memory File System
-options		NFS			#Network File System
+options 	FFS			#Fast filesystem
+options 	MFS			#Memory File System
+options 	NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		CD9660			#ISO 9660 filesystem
-options		FDESC			#File descriptor filesystem
-options		KERNFS			#Kernel filesystem
-options		MSDOSFS			#MS DOS File System
-options		NTFS			#NT File System
-options		NULLFS			#NULL filesystem
-options		PORTAL			#Portal filesystem
-options		PROCFS			#Process filesystem
-options		UMAPFS			#UID map filesystem
-options		UNION			#Union filesystem
+options 	CD9660			#ISO 9660 filesystem
+options 	FDESC			#File descriptor filesystem
+options 	KERNFS			#Kernel filesystem
+options 	MSDOSFS			#MS DOS File System
+options 	NTFS			#NT File System
+options 	NULLFS			#NULL filesystem
+options 	PORTAL			#Portal filesystem
+options 	PROCFS			#Process filesystem
+options 	UMAPFS			#UID map filesystem
+options 	UNION			#Union filesystem
 # The xFS_ROOT options REQUIRE the associated ``options xFS''
-options		CD9660_ROOT		#CD-ROM usable as root device
-options		FFS_ROOT		#FFS usable as root device
-options		MFS_ROOT		#MFS usable as root device
-options		NFS_ROOT		#NFS usable as root device
+options 	CD9660_ROOT		#CD-ROM usable as root device
+options 	FFS_ROOT		#FFS usable as root device
+options 	MFS_ROOT		#MFS usable as root device
+options 	NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).
 # Also, 'options MFS' is currently incompatible with DEVFS.
-options		DEVFS			#devices filesystem
+options 	DEVFS			#devices filesystem
 
 # Soft updates is technique for improving file system speed and
 # making abrupt shutdown less risky.  It is not enabled by default due
@@ -563,32 +563,32 @@ options		DEVFS			#devices filesystem
 # do to enable this.  ../../../contrib/sys/softupdates/README gives
 # more details on how they actually work.
 #
-#options		SOFTUPDATES
+#options 	SOFTUPDATES
 
 # Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
-options		MFS_ROOT_SIZE=10
+options 	MFS_ROOT_SIZE=10
 # Allows MFS filesystems to be exported via nfs
-options		EXPORTMFS
+options 	EXPORTMFS
 
 # Allow this many swap-devices.
-options		NSWAPDEV=20
+options 	NSWAPDEV=20
 
 # Disk quotas are supported when this option is enabled.
-options		QUOTA			#enable disk quotas
+options 	QUOTA			#enable disk quotas
 
 # Add more checking code to various filesystems
-#options		NULLFS_DIAGNOSTIC
-#options		KERNFS_DIAGNOSTIC
-#options		UMAPFS_DIAGNOSTIC
-#options		UNION_DIAGNOSTIC
+#options 	NULLFS_DIAGNOSTIC
+#options 	KERNFS_DIAGNOSTIC
+#options 	UMAPFS_DIAGNOSTIC
+#options 	UNION_DIAGNOSTIC
 
 # In particular multi-session CD-Rs might require a huge amount of
 # time in order to "settle".  If we are about mounting them as the
 # root f/s, we gotta wait a little.
 #
 # The number is supposed to be in seconds.
-options		CD9660_ROOTDELAY=20
+options 	CD9660_ROOTDELAY=20
 
 # If you are running a machine just as a fileserver for PC and MAC
 # users, using SAMBA or Netatalk, you may consider setting this option
@@ -603,27 +603,27 @@ options		CD9660_ROOTDELAY=20
 # you all the support calls as the filesystem it's used on will act as
 # they expect: "It's my dir so it must be my file".
 #
-options		SUIDDIR
+options 	SUIDDIR
 
 
 # Add some error checking code to the null_bypass routine
 # in the NULL filesystem
-#options		SAFETY
+#options 	SAFETY
 
 
 # NFS options:
-options		NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
-options		NFS_MAXATTRTIMO=60
-options		NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
-options		NFS_MAXDIRATTRTIMO=60
-options		NFS_GATHERDELAY=10	# Default write gather delay (msec)
-options		NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
-options		NFS_WDELAYHASHSIZ=16	# and with this
-options		NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
-options		NFS_DEBUG		# Enable NFS Debugging
+options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
+options 	NFS_MAXATTRTIMO=60
+options 	NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
+options 	NFS_MAXDIRATTRTIMO=60
+options 	NFS_GATHERDELAY=10	# Default write gather delay (msec)
+options 	NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
+options 	NFS_WDELAYHASHSIZ=16	# and with this
+options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
+options 	NFS_DEBUG		# Enable NFS Debugging
 
 # Coda stuff:
-options		CODA			#CODA filesystem.
+options 	CODA			#CODA filesystem.
 pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 
 #
@@ -632,7 +632,7 @@ pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 # changes and not be exercised very much, so mounting read/write could
 # be dangerous (and even mounting read only could result in panics.)
 #
-options		EXT2FS
+options 	EXT2FS
 
 
 
@@ -644,9 +644,9 @@ options		EXT2FS
 # _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
 # _KPOSIX_VERSION:             Version kernel is built for
 
-options		P1003_1B
-options		_KPOSIX_PRIORITY_SCHEDULING
-options		_KPOSIX_VERSION=199309L
+options 	P1003_1B
+options 	_KPOSIX_PRIORITY_SCHEDULING
+options 	_KPOSIX_VERSION=199309L
 
 
 #####################################################################
@@ -728,16 +728,16 @@ device sctarg0 at scbus? # SCSI target
 # SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
 #             queue after a bus reset, and the number of milliseconds to
 #             freeze the device queue after a bus device reset.
-options		CAMDEBUG
-options		CAM_DEBUG_BUS=-1
-options		CAM_DEBUG_TARGET=-1
-options		CAM_DEBUG_LUN=-1
-options		CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
-options		CAM_MAX_HIGHPOWER=4
-options		SCSI_NO_SENSE_STRINGS
-options		SCSI_NO_OP_STRINGS
-options		SCSI_REPORT_GEOMETRY
-options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options 	CAMDEBUG
+options 	CAM_DEBUG_BUS=-1
+options 	CAM_DEBUG_TARGET=-1
+options 	CAM_DEBUG_LUN=-1
+options 	CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
+options 	CAM_MAX_HIGHPOWER=4
+options 	SCSI_NO_SENSE_STRINGS
+options 	SCSI_NO_OP_STRINGS
+options 	SCSI_REPORT_GEOMETRY
+options 	SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 
 # Options for the CAM CDROM driver:
 # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
@@ -750,16 +750,16 @@ options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 # kern.cam.cd.changer.min_busy_seconds
 # kern.cam.cd.changer.max_busy_seconds
 #
-options		CHANGER_MIN_BUSY_SECONDS=2
-options		CHANGER_MAX_BUSY_SECONDS=10
+options 	CHANGER_MIN_BUSY_SECONDS=2
+options 	CHANGER_MAX_BUSY_SECONDS=10
 
 # Options for the CAM sequential access driver:
 # SA_SPACE_TIMEOUT: Timeout for space operations, in minutes
 # SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes
 # SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes
-options		SA_SPACE_TIMEOUT="(60)"
-options		SA_REWIND_TIMEOUT="(2*60)"
-options		SA_ERASE_TIMEOUT="(4*60)"
+options 	SA_SPACE_TIMEOUT="(60)"
+options 	SA_REWIND_TIMEOUT="(2*60)"
+options 	SA_ERASE_TIMEOUT="(4*60)"
 
 
 #####################################################################
@@ -795,7 +795,7 @@ options 	VINUMDEBUG	#enable Vinum debugging hooks
 #pseudo-device	tb
 
 # Size of the kernel message buffer.  Should be N * pagesize.
-options		MSGBUF_SIZE=40960
+options 	MSGBUF_SIZE=40960
 
 
 #####################################################################
@@ -841,18 +841,18 @@ controller	isa0
 #
 # PAS_JOYSTICK_ENABLE enables the gameport on the ProAudio Spectrum
 
-options		AUTO_EOI_1
-#options	AUTO_EOI_2
-options		MAXMEM="(128*1024)"
+options 	AUTO_EOI_1
+#options 	AUTO_EOI_2
+options 	MAXMEM="(128*1024)"
 options 	TUNE_1542
-#options	BROKEN_KEYBOARD_RESET
-#options	PAS_JOYSTICK_ENABLE
+#options 	BROKEN_KEYBOARD_RESET
+#options 	PAS_JOYSTICK_ENABLE
 
 # Enable support for the kernel PLL to use an external PPS signal,
 # under supervision of [x]ntpd(8)
 # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
 
-options		PPS_SYNC
+options 	PPS_SYNC
 
 # If you see the "calcru: negative time of %ld usec for pid %d (%s)\n"
 # message you probably have some broken sw/hw which disables interrupts
@@ -861,7 +861,7 @@ options		PPS_SYNC
 # is no upper limit but more than a couple of hundred are not productive.
 # A better strategy may be to sysctl -w kern.timecounter.method=1
 
-options		NTIMECOUNTER=20
+options 	NTIMECOUNTER=20
 
 # Enable PnP support in the kernel.  This allows you to automatically
 # attach to PnP cards for drivers that support it and allows you to
@@ -875,12 +875,12 @@ controller	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 
 # Options for atkbd:
-options		ATKBD_DFLT_KEYMAP	# specify the built-in keymap
+options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	ATKBD_DFLT_KEYMAP="jp.106"
 
 # These options are valid for other keyboard drivers as well.
-options		KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard
@@ -891,9 +891,9 @@ options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 device		psm0	at atkbdc? irq 12
 
 # Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
+options 	PSM_HOOKAPM		#hook the APM resume event, useful
 					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
 device		vga0	at isa? port ? conflicts
@@ -902,60 +902,60 @@ device		vga0	at isa? port ? conflicts
 # Try the following option if the mouse pointer is not drawn correctly 
 # or font does not seem to be loaded properly.  May cause flicker on 
 # some systems.
-options		VGA_ALT_SEQACCESS
+options 	VGA_ALT_SEQACCESS
 
 # If you can dispense with some vga driver features, you may want to
 # use the following options to save some memory.
-options		VGA_NO_FONT_LOADING	# don't save/load font
-options		VGA_NO_MODE_CHANGE	# don't change video modes
+options 	VGA_NO_FONT_LOADING	# don't save/load font
+options 	VGA_NO_MODE_CHANGE	# don't change video modes
 
 # Older video cards may require this option for proper operation.
-options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
+options 	VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
 # The following option probably won't work with the LCD displays.
 options		VGA_WIDTH90		# support 90 column modes
 
 # To include support for VESA video modes
-options		VESA
+options 	VESA
 
 # Splash screen at start up!  Screen savers require this too.
 pseudo-device	splash
 
 # The pcvt console driver (vt220 compatible).
 device		vt0	at isa?
-options		XSERVER			# support for running an X server.
-options		FAT_CURSOR		# start with block cursor
+options 	XSERVER			# support for running an X server.
+options 	FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
-options		PCVT_SCANSET=2 		# IBM keyboards are non-std
+options 	PCVT_SCANSET=2 		# IBM keyboards are non-std
 # Other PCVT options are documented in pcvt(4).
-options		PCVT_24LINESDEF
-options		PCVT_CTRL_ALT_DEL
-options		PCVT_EMU_MOUSE
-options		PCVT_FREEBSD=211
-options		PCVT_META_ESC
-options		PCVT_NSCREENS=9
-options		PCVT_PRETTYSCRNS
-options		PCVT_SCREENSAVER
-options		PCVT_USEKBDSEC
-options		PCVT_VT220KEYB
+options 	PCVT_24LINESDEF
+options 	PCVT_CTRL_ALT_DEL
+options 	PCVT_EMU_MOUSE
+options 	PCVT_FREEBSD=211
+options 	PCVT_META_ESC
+options 	PCVT_NSCREENS=9
+options 	PCVT_PRETTYSCRNS
+options 	PCVT_SCREENSAVER
+options 	PCVT_USEKBDSEC
+options 	PCVT_VT220KEYB
 
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
-options		MAXCONS=16		# number of virtual consoles
-options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
-options		SC_DFLT_FONT		# compile font in
-makeoptions	SC_DFLT_FONT="cp850"
-options		SC_DISABLE_DDBKEY	# disable `debug' key
-options		SC_DISABLE_REBOOT	# disable reboot key sequence
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
-options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
-options		SC_PIXEL_MODE		# add support for the raster text mode
+options 	MAXCONS=16		# number of virtual consoles
+options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options 	SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT=cp850
+options 	SC_DISABLE_DDBKEY	# disable `debug' key
+options 	SC_DISABLE_REBOOT	# disable reboot key sequence
+options 	SC_HISTORY_SIZE=200	# number of history buffer lines
+options 	SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options 	SC_PIXEL_MODE		# add support for the raster text mode
 
 # You can selectively disable features in syscons.
-options		SC_NO_CUTPASTE
-options		SC_NO_FONT_LOADING
-options		SC_NO_HISTORY
-options		SC_NO_SYSMOUSE
+options 	SC_NO_CUTPASTE
+options 	SC_NO_FONT_LOADING
+options 	SC_NO_HISTORY
+options 	SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -1102,7 +1102,7 @@ disk		wd3	at wdc1 drive 1
 # the IDE specs, but may still work for you (it will work for most
 # people).
 #
-options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
+options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller
 device          wcd0
@@ -1122,13 +1122,13 @@ controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
 # FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
 # gotta turn it actually on by setting the variable fd_debug with DDB,
 # however.
-options		FDC_DEBUG
+options 	FDC_DEBUG
 # FDC_YE enables support for the floppies used on the Libretto.  This is a
 # pcmcia floppy.  You will also need to add
 #card "Y-E DATA" "External FDD"
 #        config 0x4 "fdc0" 10
 # to your pccard.conf file.
-options		FDC_YE		#XXX newbus broken
+options 	FDC_YE		#XXX newbus broken
 #
 # Activate this line instead of the fdc0 line above if you happen to
 # have an Insight floppy tape.  Probing them proved to be dangerous
@@ -1168,14 +1168,14 @@ device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
 #
 
 # Options for serial drivers that support consoles (only for sio now):
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
 					#DDB, if available.
-options		CONSPEED=9600		#default speed for serial console (default 9600)
+options 	CONSPEED=9600		#default speed for serial console (default 9600)
 
 # Options for sio:
-options		COM_ESP			#code for Hayes ESP
-options		COM_MULTIPORT		#code for some cards with shared IRQs
-options		EXTRA_SIO=2		#number of extra sio ports to allocate
+options 	COM_ESP			#code for Hayes ESP
+options 	COM_MULTIPORT		#code for some cards with shared IRQs
+options 	EXTRA_SIO=2		#number of extra sio ports to allocate
 
 # Other flags for sio that aren't documented in the man page.
 #	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
@@ -1225,8 +1225,8 @@ device lnc0 at isa? port 0x280 irq 10 drq 0
 device rdp0 at isa? port 0x378 irq 7 flags 2
 device sr0 at isa? port 0x300 irq 5 iomem 0xd0000
 device wi0 at isa? port? irq?
-options		WLCACHE		# enables the signal-strength cache
-options		WLDEBUG		# enables verbose debugging output
+options 	WLCACHE		# enables the signal-strength cache
+options 	WLDEBUG		# enables verbose debugging output
 device wl0 at isa? port 0x300 irq ?
 device xe0 at isa? port? irq ?
 # We can (bogusly) include both the dedicated PCCARD drivers and the generic
@@ -1254,7 +1254,7 @@ device oltr0 at isa?
 pseudo-device	atm
 device en0
 device en1
-options		NATM			#native ATM
+options 	NATM			#native ATM
 
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
@@ -1468,9 +1468,9 @@ device		gp0	at isa? port 0x2c0
 device		gsc0	at isa? port IO_GSC1 drq 3
 device		joy0	at isa? port IO_GAME
 device		cy0	at isa? irq 10 iomem 0xd4000 iosiz 0x2000
-options		CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
+options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 device		dgb0	at isa? port 0x220 iomem 0xfc000 iosiz ?
-options		NDGBPORTS=16		# Defaults to 16*NDGB
+options 	NDGBPORTS=16		# Defaults to 16*NDGB
 device		dgm0	at isa? port 0x104 iomem 0xd0000 iosiz ?
 device		labpc0	at isa? port 0x260 irq 5
 device          rc0     at isa? port 0x220 irq 12
@@ -1516,7 +1516,7 @@ options AHC_ALLOW_MEMIO
 # for most machines, but in particular the HP NetServer LC series comes
 # with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
 # thus you need to bump this figure to 12 for them.
-options	EISA_SLOTS=12
+options EISA_SLOTS=12
 
 #
 # PCI devices & PCI options:
@@ -1691,14 +1691,14 @@ controller	isp0
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
 #	(these really just to save code space)
 #	(use of all three will cause the driver to not compile)
-options	SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
+options SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
 options SCSI_ISP_NO_NVRAM_MASK=0x1	# disable NVRAM for isp0
 options SCSI_ISP_PREFER_MEM_MAP=0	# prefer I/O mapping
 options SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 					# we want in full duplex mode.
-#options	ISP_DISABLE_1020_SUPPORT
-#options	ISP_DISABLE_1080_SUPPORT
-#options	ISP_DISABLE_2100_SUPPORT
+#options ISP_DISABLE_1020_SUPPORT
+#options ISP_DISABLE_1080_SUPPORT
+#options ISP_DISABLE_2100_SUPPORT
 
 device		al0
 device		ax0
@@ -1733,7 +1733,7 @@ device		bktr0
 #
 # PCI options
 #
-#options	PCI_QUIET	#quiets PCI code on chipset settings
+#options 	PCI_QUIET	#quiets PCI code on chipset settings
 
 #
 # PCCARD/PCMCIA
@@ -1745,7 +1745,7 @@ device		pcic0 at card?
 device		pcic1 at card?
 
 # You may need to reset all pccards after resuming
-options		PCIC_RESUME_RESET	# reset after resume
+options 	PCIC_RESUME_RESET	# reset after resume
 
 #
 # Laptop/Notebook options:
@@ -1757,7 +1757,7 @@ options		PCIC_RESUME_RESET	# reset after resume
 # For older notebooks that signal a powerfail condition (external
 # power supply dropped, or battery state low) by issuing an NMI:
 
-options		POWERFAIL_NMI	# make it beep instead of panicing
+options 	POWERFAIL_NMI	# make it beep instead of panicing
 
 #
 # SMB bus
@@ -1924,7 +1924,7 @@ pseudo-device   "i4btel"        2
 # network driver for IP over raw HDLC ISDN
 pseudo-device   "i4bipr"	4
 # enable VJ header compression detection for ipr i/f
-options		IPR_VJ
+options 	IPR_VJ
 #
 # network driver for sync PPP over ISDN
 pseudo-device	"i4bisppp"	4
@@ -1950,14 +1950,14 @@ pseudo-device	"i4bisppp"	4
 # ppc	ISA-bus parallel port interfaces.  
 #
 
-options		DEBUG_1284	# IEEE1284 signaling protocol debug
-options		PERIPH_1284	# Makes your computer act as a IEEE1284
+options 	DEBUG_1284	# IEEE1284 signaling protocol debug
+options 	PERIPH_1284	# Makes your computer act as a IEEE1284
 				# compliant peripheral
-options		DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
-options		VP0_DEBUG	# ZIP/ZIP+ debug
-options		LPT_DEBUG	# Printer driver debug
-options		PPC_DEBUG	# Parallel chipset level debug
-options		PLIP_DEBUG	# Parallel network IP interface debug
+options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
+options 	VP0_DEBUG	# ZIP/ZIP+ debug
+options 	LPT_DEBUG	# Printer driver debug
+options 	PPC_DEBUG	# Parallel chipset level debug
+options 	PLIP_DEBUG	# Parallel network IP interface debug
 
 controller	ppbus0
 controller	vpo0	at ppbus?
@@ -1971,17 +1971,17 @@ device		ppc0	at isa? port? irq 7
 
 # Kernel BOOTP support 
 
-options		BOOTP		# Use BOOTP to obtain IP address/hostname
-options		BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
-options		BOOTP_NFSV3	# Use NFS v3 to NFS mount root
-options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
-options		BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
+options 	BOOTP		# Use BOOTP to obtain IP address/hostname
+options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
+options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
+options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
+options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
 #
 # Add tie-ins for a hardware watchdog.  This only enable the hooks;
 # the user must still supply the actual driver.
 #
-options		HW_WDOG
+options 	HW_WDOG
 
 #
 # Set the number of PV entries per process.  Increasing this can
@@ -2004,14 +2004,14 @@ options         PMAP_SHPGPERPROC=201
 # (see also sysctls "vm.defer_swapspace_pageouts" and
 # "vm.disable_swapspace_pageouts")
 #
-#options	NO_SWAPPING
+#options 	NO_SWAPPING
 
 # Set the number of sf_bufs to allocate. sf_bufs are virtual buffers
 # for sendfile(2) that are used to map file VM pages, and normally
 # default to a quantity that is roughly 16*MAXUSERS+512. You would
 # typically want about 4 of these for each simultaneous file send.
 #
-options		NSFBUFS=1024
+options 	NSFBUFS=1024
 
 #
 # Enable extra debugging code for locks.  This stores the filename and
@@ -2021,65 +2021,65 @@ options		NSFBUFS=1024
 # that it is likely to break e.g. fstat(1) unless you recompile your
 # userland with -DDEBUG_LOCKS as well.
 #
-options		DEBUG_LOCKS
+options 	DEBUG_LOCKS
 
 # More undocumented options for linting.
 
-options		CLK_CALIBRATION_LOOP
-options		CLK_USE_I8254_CALIBRATION
-options		CLK_USE_TSC_CALIBRATION
-options		TIMER_FREQ="((14318182+6)/12)"
-options		CLUSTERDEBUG
-options		COMPAT_LINUX
-options		CPU_UPGRADE_HW_CACHE
-options		DEBUG
-options		DEBUG_VFS_LOCKS
-#options	DISABLE_PSE
-options		I586_PMC_GUPROF=0x70000
-options		IBCS2
-options		KEY
-options		KEY_DEBUG
-options		LOCKF_DEBUG
-options		LOUTB
-options		KBD_MAXRETRY=4
-options		KBD_MAXWAIT=6
-options		KBD_RESETDELAY=201
-options		KBDIO_DEBUG=2
-options		MSGMNB=2049
-options		MSGMNI=41
-options		MSGSEG=2049
-options		MSGSSZ=16
-options		MSGTQL=41
-options		NBUF=512
-options		NETATALKDEBUG
-options		NMBCLUSTERS=1024
-options		NPX_DEBUG
-options		PANIC_REBOOT_WAIT_TIME=16
-options		PSM_DEBUG=1
-options		SCSI_NCR_DEBUG
-options		SCSI_NCR_DFLT_TAGS=4
-options		SCSI_NCR_MAX_SYNC=10000
-options		SCSI_NCR_MAX_WIDE=1
-options		SCSI_NCR_MYADDR=7
-options		SEMMAP=31
-options		SEMMNI=11
-options		SEMMNS=61
-options		SEMMNU=31
-options		SEMMSL=61
-options		SEMOPM=101
-options		SEMUME=11
-options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
-options		SHMALL=1025
-options		SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
-options		SHMMAXPGS=1025
-options		SHMMIN=2
-options		SHMMNI=33
-options		SHMSEG=9
-options		SI_DEBUG
-options		SIMPLELOCK_DEBUG
-options		SPX_HACK
-options		VFS_BIO_DEBUG
-options		ENABLE_ALART
+options 	CLK_CALIBRATION_LOOP
+options 	CLK_USE_I8254_CALIBRATION
+options 	CLK_USE_TSC_CALIBRATION
+options 	TIMER_FREQ="((14318182+6)/12)"
+options 	CLUSTERDEBUG
+options 	COMPAT_LINUX
+options 	CPU_UPGRADE_HW_CACHE
+options 	DEBUG
+options 	DEBUG_VFS_LOCKS
+#options 	DISABLE_PSE
+options 	I586_PMC_GUPROF=0x70000
+options 	IBCS2
+options 	KEY
+options 	KEY_DEBUG
+options 	LOCKF_DEBUG
+options 	LOUTB
+options 	KBD_MAXRETRY=4
+options 	KBD_MAXWAIT=6
+options 	KBD_RESETDELAY=201
+options 	KBDIO_DEBUG=2
+options 	MSGMNB=2049
+options 	MSGMNI=41
+options 	MSGSEG=2049
+options 	MSGSSZ=16
+options 	MSGTQL=41
+options 	NBUF=512
+options 	NETATALKDEBUG
+options 	NMBCLUSTERS=1024
+options 	NPX_DEBUG
+options 	PANIC_REBOOT_WAIT_TIME=16
+options 	PSM_DEBUG=1
+options 	SCSI_NCR_DEBUG
+options 	SCSI_NCR_DFLT_TAGS=4
+options 	SCSI_NCR_MAX_SYNC=10000
+options 	SCSI_NCR_MAX_WIDE=1
+options 	SCSI_NCR_MYADDR=7
+options 	SEMMAP=31
+options 	SEMMNI=11
+options 	SEMMNS=61
+options 	SEMMNU=31
+options 	SEMMSL=61
+options 	SEMOPM=101
+options 	SEMUME=11
+options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options 	SHMALL=1025
+options 	SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
+options 	SHMMAXPGS=1025
+options 	SHMMIN=2
+options 	SHMMNI=33
+options 	SHMSEG=9
+options 	SI_DEBUG
+options 	SIMPLELOCK_DEBUG
+options 	SPX_HACK
+options 	VFS_BIO_DEBUG
+options 	ENABLE_ALART
 
 # The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
 # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
@@ -2131,7 +2131,7 @@ options DPT_RESTRICTED_FREELIST
 options DPT_FREELIST_IS_STACK
 #!CAM# options DPT_HANDLE_TIMEOUTS
 options DPT_TIMEOUT_FACTOR=4
-options	DPT_INTR_DELAY=200      # Some motherboards need that
+options DPT_INTR_DELAY=200      # Some motherboards need that
 options DPT_LOST_IRQ
 options DPT_RESET_HBA
 
@@ -2163,25 +2163,25 @@ device		ums0
 
 # debugging options for the USB subsystem
 #
-options		UHCI_DEBUG
-options		OHCI_DEBUG
-options		USB_DEBUG
+options 	UHCI_DEBUG
+options 	OHCI_DEBUG
+options 	USB_DEBUG
 
-options		UGEN_DEBUG
-options		UHID_DEBUG
-options		UHUB_DEBUG
-options		UKBD_DEBUG
-options		ULPT_DEBUG
-options		UMASS_DEBUG
-options		UMS_DEBUG
+options 	UGEN_DEBUG
+options 	UHID_DEBUG
+options 	UHUB_DEBUG
+options 	UKBD_DEBUG
+options 	ULPT_DEBUG
+options 	UMASS_DEBUG
+options 	UMS_DEBUG
 
 # options for ukbd:
-options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP=it.iso
 
 #
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.
-options		INIT_PATH="/sbin/init:/stand/sysinstall"
+options 	INIT_PATH="/sbin/init:/stand/sysinstall"
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 01ab89e..c2ad1f2 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.609 1999/06/24 03:54:54 jlemon Exp $
+#	$Id: LINT,v 1.610 1999/06/27 19:35:23 mjacob Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -53,13 +53,13 @@ maxusers	10
 # max, and explicitly set the maximum with a shell command for processes
 # that regularly exceed the limit like INND.
 #
-options		MAXDSIZ="(256*1024*1024)"
-options		DFLDSIZ="(256*1024*1024)"
+options 	MAXDSIZ="(256*1024*1024)"
+options 	DFLDSIZ="(256*1024*1024)"
 
 # Options for the VM subsystem
-#options	PQ_NOOPT		# No coloring
-options		PQ_LARGECACHE		# color for 512k/16k cache
-#options	PQ_HUGECACHE		# color for 1024k/16k cache
+#options 	PQ_NOOPT		# No coloring
+options 	PQ_LARGECACHE		# color for 512k/16k cache
+#options 	PQ_HUGECACHE		# color for 1024k/16k cache
 
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
@@ -89,14 +89,14 @@ options         INCLUDE_CONFIG_FILE     # Include this file in kernel
 #
 
 # Mandatory:
-options		SMP			# Symmetric MultiProcessor Kernel
-options		APIC_IO			# Symmetric (APIC) I/O
+options 	SMP			# Symmetric MultiProcessor Kernel
+options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
-options		NCPU=5			# number of CPUs
-options		NBUS=5			# number of busses
-options		NAPIC=2			# number of IO APICs
-options		NINTR=25		# number of INTs
+options 	NCPU=5			# number of CPUs
+options 	NBUS=5			# number of busses
+options 	NAPIC=2			# number of IO APICs
+options 	NINTR=25		# number of INTs
 
 #
 # Rogue SMP hardware:
@@ -195,21 +195,21 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 # NOTE 3: This option may cause failures for software that requires
 # locked cycles in order to operate correctly.
 #
-options		CPU_BLUELIGHTNING_FPU_OP_CACHE
-options		CPU_BLUELIGHTNING_3X
-options		CPU_BTB_EN
-options		CPU_DIRECT_MAPPED_CACHE
-options		CPU_DISABLE_5X86_LSSER
-options		CPU_FASTER_5X86_FPU
-options		CPU_I486_ON_386
-options		CPU_IORT
-options		CPU_LOOP_EN
-options		CPU_RSTK_EN
-options		CPU_SUSP_HLT
-options		CPU_WT_ALLOC
-options		CYRIX_CACHE_WORKS
-options		CYRIX_CACHE_REALLY_WORKS
-#options	NO_F00F_HACK
+options 	CPU_BLUELIGHTNING_FPU_OP_CACHE
+options 	CPU_BLUELIGHTNING_3X
+options 	CPU_BTB_EN
+options 	CPU_DIRECT_MAPPED_CACHE
+options 	CPU_DISABLE_5X86_LSSER
+options 	CPU_FASTER_5X86_FPU
+options 	CPU_I486_ON_386
+options 	CPU_IORT
+options 	CPU_LOOP_EN
+options 	CPU_RSTK_EN
+options 	CPU_SUSP_HLT
+options 	CPU_WT_ALLOC
+options 	CYRIX_CACHE_WORKS
+options 	CYRIX_CACHE_REALLY_WORKS
+#options 	NO_F00F_HACK
 
 #
 # A math emulator is mandatory if you wish to run on hardware which
@@ -217,9 +217,9 @@ options		CYRIX_CACHE_REALLY_WORKS
 # bogus (but freely-distributable) math emulator, or a much more
 # fully-featured but GPL-licensed emulator taken from Linux.
 #
-options		MATH_EMULATE		#Support for x87 emulation
+options 	MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emulation via
+options 	GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 
@@ -231,29 +231,29 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 # FreeBSD.  You probably do NOT want to remove this as much current code
 # still relies on the 4.3 emulation.
 #
-options		COMPAT_43
+options 	COMPAT_43
 
 #
 # Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
-options		USER_LDT		#allow user-level control of i386 ldt
+options 	USER_LDT		#allow user-level control of i386 ldt
 
 #
 # These three options provide support for System V Interface
 # Definition-style interprocess communication, in the form of shared
 # memory, semaphores, and message queues, respectively.
 #
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
+options 	SYSVSHM
+options 	SYSVSEM
+options 	SYSVMSG
 
 #
 # This option includes a MD5 routine in the kernel, this is used for
 # various authentication and privacy uses.
 #
-options		MD5
+options 	MD5
 
 
 #####################################################################
@@ -262,14 +262,14 @@ options		MD5
 #
 # Enable the kernel debugger.
 #
-options		DDB
+options 	DDB
 
 #
 # Don't drop into DDB for a panic. Intended for unattended operation
 # where you may want to drop to DDB from the console, but still want
 # the machine to recover from a panic
 #
-options		DDB_UNATTENDED
+options 	DDB_UNATTENDED
 
 #
 # If using GDB remote mode to debug the kernel, there's a non-standard
@@ -278,12 +278,12 @@ options		DDB_UNATTENDED
 # standard and you're on your own if you enable it.  See also the
 # "remotechat" variables in the FreeBSD specific version of gdb.
 #
-options		GDB_REMOTE_CHAT
+options 	GDB_REMOTE_CHAT
 
 # 
 # KTRACE enables the system-call tracing facility ktrace(2).
 #
-options		KTRACE			#kernel tracing
+options 	KTRACE			#kernel tracing
 
 #
 # The INVARIANTS option is used in a number of source files to enable
@@ -292,7 +292,7 @@ options		KTRACE			#kernel tracing
 # for these conditions, which can only occur as a result of
 # programming errors.
 #
-options		INVARIANTS
+options 	INVARIANTS
 
 #
 # The INVARIANT_SUPPORT option makes us compile in support for
@@ -302,20 +302,20 @@ options		INVARIANTS
 # source files (by changing the source file or specifying it on the
 # command line) if you have 'INVARIANT_SUPPORT' enabled.
 #
-options		INVARIANT_SUPPORT
+options 	INVARIANT_SUPPORT
 
 #
 # The DIAGNOSTIC option is used to enable extra debugging information
 # from some parts of the kernel.  As this makes everything more noisy,
 # it is disabled by default.
 #
-options		DIAGNOSTIC
+options 	DIAGNOSTIC
 
 #
 # PERFMON causes the driver for Pentium/Pentium Pro performance counters
 # to be compiled.  See perfmon(4) for more information.
 #
-options		PERFMON
+options 	PERFMON
 
 
 #
@@ -329,15 +329,15 @@ options COMPILING_LINT
 
 # XXX - this doesn't belong here.
 # Allow ordinary users to take the console - this is useful for X.
-options		UCONSOLE
+options 	UCONSOLE
 
 # XXX - this doesn't belong here either
-options		USERCONFIG		#boot -c editor
-options		INTRO_USERCONFIG	#imply -c and show intro screen
-options		VISUAL_USERCONFIG	#visual boot -c editor
+options 	USERCONFIG		#boot -c editor
+options 	INTRO_USERCONFIG	#imply -c and show intro screen
+options 	VISUAL_USERCONFIG	#visual boot -c editor
 
 # XXX - neither does this
-options		ROOTDEVNAME=\"da0s2e\"
+options 	ROOTDEVNAME=\"da0s2e\"
 
 #####################################################################
 # NETWORKING OPTIONS
@@ -348,27 +348,27 @@ options		ROOTDEVNAME=\"da0s2e\"
 #  Source code for the NS (Xerox Network Service) is provided for amusement
 #  value.
 #
-options		INET			#Internet communications protocols
+options 	INET			#Internet communications protocols
 
-options		IPX			#IPX/SPX communications protocols
-options		IPXIP			#IPX in IP encapsulation (not available)
-options		IPTUNNEL		#IP in IPX encapsulation (not available)
+options 	IPX			#IPX/SPX communications protocols
+options 	IPXIP			#IPX in IP encapsulation (not available)
+options 	IPTUNNEL		#IP in IPX encapsulation (not available)
 
-options		NETATALK		#Appletalk communications protocols
+options 	NETATALK		#Appletalk communications protocols
 
 # These are currently broken but are shipped due to interest.
-#options		NS			#Xerox NS protocols
+#options 	NS			#Xerox NS protocols
 
 # These are currently broken and are no longer shipped due to lack
 # of interest.
-#options		CCITT			#X.25 network layer
-#options		ISO
-#options		TPIP			#ISO TP class 4 over IP
-#options		TPCONS			#ISO TP class 0 over X.25
-#options		LLC			#X.25 link layer for Ethernets
-#options		HDLC			#X.25 link layer for serial lines
-#options		EON			#ISO CLNP over IP
-#options		NSIP			#XNS over IP
+#options 	CCITT			#X.25 network layer
+#options 	ISO
+#options 	TPIP			#ISO TP class 4 over IP
+#options 	TPCONS			#ISO TP class 0 over X.25
+#options 	LLC			#X.25 link layer for Ethernets
+#options 	HDLC			#X.25 link layer for serial lines
+#options 	EON			#ISO CLNP over IP
+#options 	NSIP			#XNS over IP
 
 #
 # Network interfaces:
@@ -454,20 +454,20 @@ options PPP_FILTER			#enable bpf filtering (needs bpfilter)
 #
 # TCPDEBUG is undocumented.
 #
-options		TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
-options		MROUTING		# Multicast routing
+options 	TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
+options 	MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
 options         IPFIREWALL_FORWARD      #enable transparent proxy support
-options		IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
-options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
-options		IPDIVERT		#divert sockets
-options		IPFILTER		#kernel ipfilter support
-options		IPFILTER_LOG		#ipfilter logging
-#options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
-options		IPSTEALTH		#support for stealth forwarding
-options		TCPDEBUG
+options 	IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
+options 	IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
+options 	IPDIVERT		#divert sockets
+options 	IPFILTER		#kernel ipfilter support
+options 	IPFILTER_LOG		#ipfilter logging
+#options 	IPFILTER_LKM		#kernel support for ip_fil.o LKM
+options 	IPSTEALTH		#support for stealth forwarding
+options 	TCPDEBUG
 
 # ICMP_BANDLIM enables icmp error response bandwidth limiting.   You
 # typically want this option as it will help protect the machine from
@@ -479,8 +479,8 @@ options         ICMP_BANDLIM
 # IPFIREWALL as well. See the dummynet(4) manpage for more info.
 # BRIDGE enables bridging between ethernet cards -- see bridge(4).
 # You can use IPFIREWALL and dummynet together with bridging.
-options	DUMMYNET
-options	BRIDGE
+options DUMMYNET
+options BRIDGE
 
 #
 # ATM (HARP version) options
@@ -504,11 +504,11 @@ options	BRIDGE
 # The `hfa' driver provides support for the FORE Systems, Inc.
 # PCA-200E ATM PCI Adapter.
 #
-options		ATM_CORE		#core ATM protocol family
-options		ATM_IP			#IP over ATM support
-options		ATM_SIGPVC		#SIGPVC signalling manager
-options		ATM_SPANS		#SPANS signalling manager
-options		ATM_UNI			#UNI signalling manager
+options 	ATM_CORE		#core ATM protocol family
+options 	ATM_IP			#IP over ATM support
+options 	ATM_SIGPVC		#SIGPVC signalling manager
+options 	ATM_SPANS		#SPANS signalling manager
+options 	ATM_UNI			#UNI signalling manager
 device		hea0			#Efficient ENI-155p ATM PCI
 device		hfa0			#FORE PCA-200E ATM PCI
 
@@ -530,30 +530,30 @@ device		hfa0			#FORE PCA-200E ATM PCI
 #
 
 # One of these is mandatory:
-options		FFS			#Fast filesystem
-options		MFS			#Memory File System
-options		NFS			#Network File System
+options 	FFS			#Fast filesystem
+options 	MFS			#Memory File System
+options 	NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		CD9660			#ISO 9660 filesystem
-options		FDESC			#File descriptor filesystem
-options		KERNFS			#Kernel filesystem
-options		MSDOSFS			#MS DOS File System
-options		NTFS			#NT File System
-options		NULLFS			#NULL filesystem
-options		PORTAL			#Portal filesystem
-options		PROCFS			#Process filesystem
-options		UMAPFS			#UID map filesystem
-options		UNION			#Union filesystem
+options 	CD9660			#ISO 9660 filesystem
+options 	FDESC			#File descriptor filesystem
+options 	KERNFS			#Kernel filesystem
+options 	MSDOSFS			#MS DOS File System
+options 	NTFS			#NT File System
+options 	NULLFS			#NULL filesystem
+options 	PORTAL			#Portal filesystem
+options 	PROCFS			#Process filesystem
+options 	UMAPFS			#UID map filesystem
+options 	UNION			#Union filesystem
 # The xFS_ROOT options REQUIRE the associated ``options xFS''
-options		CD9660_ROOT		#CD-ROM usable as root device
-options		FFS_ROOT		#FFS usable as root device
-options		MFS_ROOT		#MFS usable as root device
-options		NFS_ROOT		#NFS usable as root device
+options 	CD9660_ROOT		#CD-ROM usable as root device
+options 	FFS_ROOT		#FFS usable as root device
+options 	MFS_ROOT		#MFS usable as root device
+options 	NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).
 # Also, 'options MFS' is currently incompatible with DEVFS.
-options		DEVFS			#devices filesystem
+options 	DEVFS			#devices filesystem
 
 # Soft updates is technique for improving file system speed and
 # making abrupt shutdown less risky.  It is not enabled by default due
@@ -563,32 +563,32 @@ options		DEVFS			#devices filesystem
 # do to enable this.  ../../../contrib/sys/softupdates/README gives
 # more details on how they actually work.
 #
-#options		SOFTUPDATES
+#options 	SOFTUPDATES
 
 # Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
-options		MFS_ROOT_SIZE=10
+options 	MFS_ROOT_SIZE=10
 # Allows MFS filesystems to be exported via nfs
-options		EXPORTMFS
+options 	EXPORTMFS
 
 # Allow this many swap-devices.
-options		NSWAPDEV=20
+options 	NSWAPDEV=20
 
 # Disk quotas are supported when this option is enabled.
-options		QUOTA			#enable disk quotas
+options 	QUOTA			#enable disk quotas
 
 # Add more checking code to various filesystems
-#options		NULLFS_DIAGNOSTIC
-#options		KERNFS_DIAGNOSTIC
-#options		UMAPFS_DIAGNOSTIC
-#options		UNION_DIAGNOSTIC
+#options 	NULLFS_DIAGNOSTIC
+#options 	KERNFS_DIAGNOSTIC
+#options 	UMAPFS_DIAGNOSTIC
+#options 	UNION_DIAGNOSTIC
 
 # In particular multi-session CD-Rs might require a huge amount of
 # time in order to "settle".  If we are about mounting them as the
 # root f/s, we gotta wait a little.
 #
 # The number is supposed to be in seconds.
-options		CD9660_ROOTDELAY=20
+options 	CD9660_ROOTDELAY=20
 
 # If you are running a machine just as a fileserver for PC and MAC
 # users, using SAMBA or Netatalk, you may consider setting this option
@@ -603,27 +603,27 @@ options		CD9660_ROOTDELAY=20
 # you all the support calls as the filesystem it's used on will act as
 # they expect: "It's my dir so it must be my file".
 #
-options		SUIDDIR
+options 	SUIDDIR
 
 
 # Add some error checking code to the null_bypass routine
 # in the NULL filesystem
-#options		SAFETY
+#options 	SAFETY
 
 
 # NFS options:
-options		NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
-options		NFS_MAXATTRTIMO=60
-options		NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
-options		NFS_MAXDIRATTRTIMO=60
-options		NFS_GATHERDELAY=10	# Default write gather delay (msec)
-options		NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
-options		NFS_WDELAYHASHSIZ=16	# and with this
-options		NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
-options		NFS_DEBUG		# Enable NFS Debugging
+options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
+options 	NFS_MAXATTRTIMO=60
+options 	NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
+options 	NFS_MAXDIRATTRTIMO=60
+options 	NFS_GATHERDELAY=10	# Default write gather delay (msec)
+options 	NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
+options 	NFS_WDELAYHASHSIZ=16	# and with this
+options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
+options 	NFS_DEBUG		# Enable NFS Debugging
 
 # Coda stuff:
-options		CODA			#CODA filesystem.
+options 	CODA			#CODA filesystem.
 pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 
 #
@@ -632,7 +632,7 @@ pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 # changes and not be exercised very much, so mounting read/write could
 # be dangerous (and even mounting read only could result in panics.)
 #
-options		EXT2FS
+options 	EXT2FS
 
 
 
@@ -644,9 +644,9 @@ options		EXT2FS
 # _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
 # _KPOSIX_VERSION:             Version kernel is built for
 
-options		P1003_1B
-options		_KPOSIX_PRIORITY_SCHEDULING
-options		_KPOSIX_VERSION=199309L
+options 	P1003_1B
+options 	_KPOSIX_PRIORITY_SCHEDULING
+options 	_KPOSIX_VERSION=199309L
 
 
 #####################################################################
@@ -728,16 +728,16 @@ device sctarg0 at scbus? # SCSI target
 # SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
 #             queue after a bus reset, and the number of milliseconds to
 #             freeze the device queue after a bus device reset.
-options		CAMDEBUG
-options		CAM_DEBUG_BUS=-1
-options		CAM_DEBUG_TARGET=-1
-options		CAM_DEBUG_LUN=-1
-options		CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
-options		CAM_MAX_HIGHPOWER=4
-options		SCSI_NO_SENSE_STRINGS
-options		SCSI_NO_OP_STRINGS
-options		SCSI_REPORT_GEOMETRY
-options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options 	CAMDEBUG
+options 	CAM_DEBUG_BUS=-1
+options 	CAM_DEBUG_TARGET=-1
+options 	CAM_DEBUG_LUN=-1
+options 	CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
+options 	CAM_MAX_HIGHPOWER=4
+options 	SCSI_NO_SENSE_STRINGS
+options 	SCSI_NO_OP_STRINGS
+options 	SCSI_REPORT_GEOMETRY
+options 	SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 
 # Options for the CAM CDROM driver:
 # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
@@ -750,16 +750,16 @@ options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 # kern.cam.cd.changer.min_busy_seconds
 # kern.cam.cd.changer.max_busy_seconds
 #
-options		CHANGER_MIN_BUSY_SECONDS=2
-options		CHANGER_MAX_BUSY_SECONDS=10
+options 	CHANGER_MIN_BUSY_SECONDS=2
+options 	CHANGER_MAX_BUSY_SECONDS=10
 
 # Options for the CAM sequential access driver:
 # SA_SPACE_TIMEOUT: Timeout for space operations, in minutes
 # SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes
 # SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes
-options		SA_SPACE_TIMEOUT="(60)"
-options		SA_REWIND_TIMEOUT="(2*60)"
-options		SA_ERASE_TIMEOUT="(4*60)"
+options 	SA_SPACE_TIMEOUT="(60)"
+options 	SA_REWIND_TIMEOUT="(2*60)"
+options 	SA_ERASE_TIMEOUT="(4*60)"
 
 
 #####################################################################
@@ -795,7 +795,7 @@ options 	VINUMDEBUG	#enable Vinum debugging hooks
 #pseudo-device	tb
 
 # Size of the kernel message buffer.  Should be N * pagesize.
-options		MSGBUF_SIZE=40960
+options 	MSGBUF_SIZE=40960
 
 
 #####################################################################
@@ -841,18 +841,18 @@ controller	isa0
 #
 # PAS_JOYSTICK_ENABLE enables the gameport on the ProAudio Spectrum
 
-options		AUTO_EOI_1
-#options	AUTO_EOI_2
-options		MAXMEM="(128*1024)"
+options 	AUTO_EOI_1
+#options 	AUTO_EOI_2
+options 	MAXMEM="(128*1024)"
 options 	TUNE_1542
-#options	BROKEN_KEYBOARD_RESET
-#options	PAS_JOYSTICK_ENABLE
+#options 	BROKEN_KEYBOARD_RESET
+#options 	PAS_JOYSTICK_ENABLE
 
 # Enable support for the kernel PLL to use an external PPS signal,
 # under supervision of [x]ntpd(8)
 # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
 
-options		PPS_SYNC
+options 	PPS_SYNC
 
 # If you see the "calcru: negative time of %ld usec for pid %d (%s)\n"
 # message you probably have some broken sw/hw which disables interrupts
@@ -861,7 +861,7 @@ options		PPS_SYNC
 # is no upper limit but more than a couple of hundred are not productive.
 # A better strategy may be to sysctl -w kern.timecounter.method=1
 
-options		NTIMECOUNTER=20
+options 	NTIMECOUNTER=20
 
 # Enable PnP support in the kernel.  This allows you to automatically
 # attach to PnP cards for drivers that support it and allows you to
@@ -875,12 +875,12 @@ controller	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 
 # Options for atkbd:
-options		ATKBD_DFLT_KEYMAP	# specify the built-in keymap
+options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	ATKBD_DFLT_KEYMAP="jp.106"
 
 # These options are valid for other keyboard drivers as well.
-options		KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard
@@ -891,9 +891,9 @@ options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 device		psm0	at atkbdc? irq 12
 
 # Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
+options 	PSM_HOOKAPM		#hook the APM resume event, useful
 					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
 device		vga0	at isa? port ? conflicts
@@ -902,60 +902,60 @@ device		vga0	at isa? port ? conflicts
 # Try the following option if the mouse pointer is not drawn correctly 
 # or font does not seem to be loaded properly.  May cause flicker on 
 # some systems.
-options		VGA_ALT_SEQACCESS
+options 	VGA_ALT_SEQACCESS
 
 # If you can dispense with some vga driver features, you may want to
 # use the following options to save some memory.
-options		VGA_NO_FONT_LOADING	# don't save/load font
-options		VGA_NO_MODE_CHANGE	# don't change video modes
+options 	VGA_NO_FONT_LOADING	# don't save/load font
+options 	VGA_NO_MODE_CHANGE	# don't change video modes
 
 # Older video cards may require this option for proper operation.
-options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
+options 	VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
 # The following option probably won't work with the LCD displays.
 options		VGA_WIDTH90		# support 90 column modes
 
 # To include support for VESA video modes
-options		VESA
+options 	VESA
 
 # Splash screen at start up!  Screen savers require this too.
 pseudo-device	splash
 
 # The pcvt console driver (vt220 compatible).
 device		vt0	at isa?
-options		XSERVER			# support for running an X server.
-options		FAT_CURSOR		# start with block cursor
+options 	XSERVER			# support for running an X server.
+options 	FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
-options		PCVT_SCANSET=2 		# IBM keyboards are non-std
+options 	PCVT_SCANSET=2 		# IBM keyboards are non-std
 # Other PCVT options are documented in pcvt(4).
-options		PCVT_24LINESDEF
-options		PCVT_CTRL_ALT_DEL
-options		PCVT_EMU_MOUSE
-options		PCVT_FREEBSD=211
-options		PCVT_META_ESC
-options		PCVT_NSCREENS=9
-options		PCVT_PRETTYSCRNS
-options		PCVT_SCREENSAVER
-options		PCVT_USEKBDSEC
-options		PCVT_VT220KEYB
+options 	PCVT_24LINESDEF
+options 	PCVT_CTRL_ALT_DEL
+options 	PCVT_EMU_MOUSE
+options 	PCVT_FREEBSD=211
+options 	PCVT_META_ESC
+options 	PCVT_NSCREENS=9
+options 	PCVT_PRETTYSCRNS
+options 	PCVT_SCREENSAVER
+options 	PCVT_USEKBDSEC
+options 	PCVT_VT220KEYB
 
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
-options		MAXCONS=16		# number of virtual consoles
-options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
-options		SC_DFLT_FONT		# compile font in
-makeoptions	SC_DFLT_FONT="cp850"
-options		SC_DISABLE_DDBKEY	# disable `debug' key
-options		SC_DISABLE_REBOOT	# disable reboot key sequence
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
-options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
-options		SC_PIXEL_MODE		# add support for the raster text mode
+options 	MAXCONS=16		# number of virtual consoles
+options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options 	SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT=cp850
+options 	SC_DISABLE_DDBKEY	# disable `debug' key
+options 	SC_DISABLE_REBOOT	# disable reboot key sequence
+options 	SC_HISTORY_SIZE=200	# number of history buffer lines
+options 	SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options 	SC_PIXEL_MODE		# add support for the raster text mode
 
 # You can selectively disable features in syscons.
-options		SC_NO_CUTPASTE
-options		SC_NO_FONT_LOADING
-options		SC_NO_HISTORY
-options		SC_NO_SYSMOUSE
+options 	SC_NO_CUTPASTE
+options 	SC_NO_FONT_LOADING
+options 	SC_NO_HISTORY
+options 	SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -1102,7 +1102,7 @@ disk		wd3	at wdc1 drive 1
 # the IDE specs, but may still work for you (it will work for most
 # people).
 #
-options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
+options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller
 device          wcd0
@@ -1122,13 +1122,13 @@ controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
 # FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
 # gotta turn it actually on by setting the variable fd_debug with DDB,
 # however.
-options		FDC_DEBUG
+options 	FDC_DEBUG
 # FDC_YE enables support for the floppies used on the Libretto.  This is a
 # pcmcia floppy.  You will also need to add
 #card "Y-E DATA" "External FDD"
 #        config 0x4 "fdc0" 10
 # to your pccard.conf file.
-options		FDC_YE		#XXX newbus broken
+options 	FDC_YE		#XXX newbus broken
 #
 # Activate this line instead of the fdc0 line above if you happen to
 # have an Insight floppy tape.  Probing them proved to be dangerous
@@ -1168,14 +1168,14 @@ device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
 #
 
 # Options for serial drivers that support consoles (only for sio now):
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
 					#DDB, if available.
-options		CONSPEED=9600		#default speed for serial console (default 9600)
+options 	CONSPEED=9600		#default speed for serial console (default 9600)
 
 # Options for sio:
-options		COM_ESP			#code for Hayes ESP
-options		COM_MULTIPORT		#code for some cards with shared IRQs
-options		EXTRA_SIO=2		#number of extra sio ports to allocate
+options 	COM_ESP			#code for Hayes ESP
+options 	COM_MULTIPORT		#code for some cards with shared IRQs
+options 	EXTRA_SIO=2		#number of extra sio ports to allocate
 
 # Other flags for sio that aren't documented in the man page.
 #	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
@@ -1225,8 +1225,8 @@ device lnc0 at isa? port 0x280 irq 10 drq 0
 device rdp0 at isa? port 0x378 irq 7 flags 2
 device sr0 at isa? port 0x300 irq 5 iomem 0xd0000
 device wi0 at isa? port? irq?
-options		WLCACHE		# enables the signal-strength cache
-options		WLDEBUG		# enables verbose debugging output
+options 	WLCACHE		# enables the signal-strength cache
+options 	WLDEBUG		# enables verbose debugging output
 device wl0 at isa? port 0x300 irq ?
 device xe0 at isa? port? irq ?
 # We can (bogusly) include both the dedicated PCCARD drivers and the generic
@@ -1254,7 +1254,7 @@ device oltr0 at isa?
 pseudo-device	atm
 device en0
 device en1
-options		NATM			#native ATM
+options 	NATM			#native ATM
 
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
@@ -1468,9 +1468,9 @@ device		gp0	at isa? port 0x2c0
 device		gsc0	at isa? port IO_GSC1 drq 3
 device		joy0	at isa? port IO_GAME
 device		cy0	at isa? irq 10 iomem 0xd4000 iosiz 0x2000
-options		CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
+options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 device		dgb0	at isa? port 0x220 iomem 0xfc000 iosiz ?
-options		NDGBPORTS=16		# Defaults to 16*NDGB
+options 	NDGBPORTS=16		# Defaults to 16*NDGB
 device		dgm0	at isa? port 0x104 iomem 0xd0000 iosiz ?
 device		labpc0	at isa? port 0x260 irq 5
 device          rc0     at isa? port 0x220 irq 12
@@ -1516,7 +1516,7 @@ options AHC_ALLOW_MEMIO
 # for most machines, but in particular the HP NetServer LC series comes
 # with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
 # thus you need to bump this figure to 12 for them.
-options	EISA_SLOTS=12
+options EISA_SLOTS=12
 
 #
 # PCI devices & PCI options:
@@ -1691,14 +1691,14 @@ controller	isp0
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
 #	(these really just to save code space)
 #	(use of all three will cause the driver to not compile)
-options	SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
+options SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
 options SCSI_ISP_NO_NVRAM_MASK=0x1	# disable NVRAM for isp0
 options SCSI_ISP_PREFER_MEM_MAP=0	# prefer I/O mapping
 options SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 					# we want in full duplex mode.
-#options	ISP_DISABLE_1020_SUPPORT
-#options	ISP_DISABLE_1080_SUPPORT
-#options	ISP_DISABLE_2100_SUPPORT
+#options ISP_DISABLE_1020_SUPPORT
+#options ISP_DISABLE_1080_SUPPORT
+#options ISP_DISABLE_2100_SUPPORT
 
 device		al0
 device		ax0
@@ -1733,7 +1733,7 @@ device		bktr0
 #
 # PCI options
 #
-#options	PCI_QUIET	#quiets PCI code on chipset settings
+#options 	PCI_QUIET	#quiets PCI code on chipset settings
 
 #
 # PCCARD/PCMCIA
@@ -1745,7 +1745,7 @@ device		pcic0 at card?
 device		pcic1 at card?
 
 # You may need to reset all pccards after resuming
-options		PCIC_RESUME_RESET	# reset after resume
+options 	PCIC_RESUME_RESET	# reset after resume
 
 #
 # Laptop/Notebook options:
@@ -1757,7 +1757,7 @@ options		PCIC_RESUME_RESET	# reset after resume
 # For older notebooks that signal a powerfail condition (external
 # power supply dropped, or battery state low) by issuing an NMI:
 
-options		POWERFAIL_NMI	# make it beep instead of panicing
+options 	POWERFAIL_NMI	# make it beep instead of panicing
 
 #
 # SMB bus
@@ -1924,7 +1924,7 @@ pseudo-device   "i4btel"        2
 # network driver for IP over raw HDLC ISDN
 pseudo-device   "i4bipr"	4
 # enable VJ header compression detection for ipr i/f
-options		IPR_VJ
+options 	IPR_VJ
 #
 # network driver for sync PPP over ISDN
 pseudo-device	"i4bisppp"	4
@@ -1950,14 +1950,14 @@ pseudo-device	"i4bisppp"	4
 # ppc	ISA-bus parallel port interfaces.  
 #
 
-options		DEBUG_1284	# IEEE1284 signaling protocol debug
-options		PERIPH_1284	# Makes your computer act as a IEEE1284
+options 	DEBUG_1284	# IEEE1284 signaling protocol debug
+options 	PERIPH_1284	# Makes your computer act as a IEEE1284
 				# compliant peripheral
-options		DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
-options		VP0_DEBUG	# ZIP/ZIP+ debug
-options		LPT_DEBUG	# Printer driver debug
-options		PPC_DEBUG	# Parallel chipset level debug
-options		PLIP_DEBUG	# Parallel network IP interface debug
+options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
+options 	VP0_DEBUG	# ZIP/ZIP+ debug
+options 	LPT_DEBUG	# Printer driver debug
+options 	PPC_DEBUG	# Parallel chipset level debug
+options 	PLIP_DEBUG	# Parallel network IP interface debug
 
 controller	ppbus0
 controller	vpo0	at ppbus?
@@ -1971,17 +1971,17 @@ device		ppc0	at isa? port? irq 7
 
 # Kernel BOOTP support 
 
-options		BOOTP		# Use BOOTP to obtain IP address/hostname
-options		BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
-options		BOOTP_NFSV3	# Use NFS v3 to NFS mount root
-options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
-options		BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
+options 	BOOTP		# Use BOOTP to obtain IP address/hostname
+options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
+options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
+options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
+options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
 #
 # Add tie-ins for a hardware watchdog.  This only enable the hooks;
 # the user must still supply the actual driver.
 #
-options		HW_WDOG
+options 	HW_WDOG
 
 #
 # Set the number of PV entries per process.  Increasing this can
@@ -2004,14 +2004,14 @@ options         PMAP_SHPGPERPROC=201
 # (see also sysctls "vm.defer_swapspace_pageouts" and
 # "vm.disable_swapspace_pageouts")
 #
-#options	NO_SWAPPING
+#options 	NO_SWAPPING
 
 # Set the number of sf_bufs to allocate. sf_bufs are virtual buffers
 # for sendfile(2) that are used to map file VM pages, and normally
 # default to a quantity that is roughly 16*MAXUSERS+512. You would
 # typically want about 4 of these for each simultaneous file send.
 #
-options		NSFBUFS=1024
+options 	NSFBUFS=1024
 
 #
 # Enable extra debugging code for locks.  This stores the filename and
@@ -2021,65 +2021,65 @@ options		NSFBUFS=1024
 # that it is likely to break e.g. fstat(1) unless you recompile your
 # userland with -DDEBUG_LOCKS as well.
 #
-options		DEBUG_LOCKS
+options 	DEBUG_LOCKS
 
 # More undocumented options for linting.
 
-options		CLK_CALIBRATION_LOOP
-options		CLK_USE_I8254_CALIBRATION
-options		CLK_USE_TSC_CALIBRATION
-options		TIMER_FREQ="((14318182+6)/12)"
-options		CLUSTERDEBUG
-options		COMPAT_LINUX
-options		CPU_UPGRADE_HW_CACHE
-options		DEBUG
-options		DEBUG_VFS_LOCKS
-#options	DISABLE_PSE
-options		I586_PMC_GUPROF=0x70000
-options		IBCS2
-options		KEY
-options		KEY_DEBUG
-options		LOCKF_DEBUG
-options		LOUTB
-options		KBD_MAXRETRY=4
-options		KBD_MAXWAIT=6
-options		KBD_RESETDELAY=201
-options		KBDIO_DEBUG=2
-options		MSGMNB=2049
-options		MSGMNI=41
-options		MSGSEG=2049
-options		MSGSSZ=16
-options		MSGTQL=41
-options		NBUF=512
-options		NETATALKDEBUG
-options		NMBCLUSTERS=1024
-options		NPX_DEBUG
-options		PANIC_REBOOT_WAIT_TIME=16
-options		PSM_DEBUG=1
-options		SCSI_NCR_DEBUG
-options		SCSI_NCR_DFLT_TAGS=4
-options		SCSI_NCR_MAX_SYNC=10000
-options		SCSI_NCR_MAX_WIDE=1
-options		SCSI_NCR_MYADDR=7
-options		SEMMAP=31
-options		SEMMNI=11
-options		SEMMNS=61
-options		SEMMNU=31
-options		SEMMSL=61
-options		SEMOPM=101
-options		SEMUME=11
-options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
-options		SHMALL=1025
-options		SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
-options		SHMMAXPGS=1025
-options		SHMMIN=2
-options		SHMMNI=33
-options		SHMSEG=9
-options		SI_DEBUG
-options		SIMPLELOCK_DEBUG
-options		SPX_HACK
-options		VFS_BIO_DEBUG
-options		ENABLE_ALART
+options 	CLK_CALIBRATION_LOOP
+options 	CLK_USE_I8254_CALIBRATION
+options 	CLK_USE_TSC_CALIBRATION
+options 	TIMER_FREQ="((14318182+6)/12)"
+options 	CLUSTERDEBUG
+options 	COMPAT_LINUX
+options 	CPU_UPGRADE_HW_CACHE
+options 	DEBUG
+options 	DEBUG_VFS_LOCKS
+#options 	DISABLE_PSE
+options 	I586_PMC_GUPROF=0x70000
+options 	IBCS2
+options 	KEY
+options 	KEY_DEBUG
+options 	LOCKF_DEBUG
+options 	LOUTB
+options 	KBD_MAXRETRY=4
+options 	KBD_MAXWAIT=6
+options 	KBD_RESETDELAY=201
+options 	KBDIO_DEBUG=2
+options 	MSGMNB=2049
+options 	MSGMNI=41
+options 	MSGSEG=2049
+options 	MSGSSZ=16
+options 	MSGTQL=41
+options 	NBUF=512
+options 	NETATALKDEBUG
+options 	NMBCLUSTERS=1024
+options 	NPX_DEBUG
+options 	PANIC_REBOOT_WAIT_TIME=16
+options 	PSM_DEBUG=1
+options 	SCSI_NCR_DEBUG
+options 	SCSI_NCR_DFLT_TAGS=4
+options 	SCSI_NCR_MAX_SYNC=10000
+options 	SCSI_NCR_MAX_WIDE=1
+options 	SCSI_NCR_MYADDR=7
+options 	SEMMAP=31
+options 	SEMMNI=11
+options 	SEMMNS=61
+options 	SEMMNU=31
+options 	SEMMSL=61
+options 	SEMOPM=101
+options 	SEMUME=11
+options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options 	SHMALL=1025
+options 	SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
+options 	SHMMAXPGS=1025
+options 	SHMMIN=2
+options 	SHMMNI=33
+options 	SHMSEG=9
+options 	SI_DEBUG
+options 	SIMPLELOCK_DEBUG
+options 	SPX_HACK
+options 	VFS_BIO_DEBUG
+options 	ENABLE_ALART
 
 # The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
 # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
@@ -2131,7 +2131,7 @@ options DPT_RESTRICTED_FREELIST
 options DPT_FREELIST_IS_STACK
 #!CAM# options DPT_HANDLE_TIMEOUTS
 options DPT_TIMEOUT_FACTOR=4
-options	DPT_INTR_DELAY=200      # Some motherboards need that
+options DPT_INTR_DELAY=200      # Some motherboards need that
 options DPT_LOST_IRQ
 options DPT_RESET_HBA
 
@@ -2163,25 +2163,25 @@ device		ums0
 
 # debugging options for the USB subsystem
 #
-options		UHCI_DEBUG
-options		OHCI_DEBUG
-options		USB_DEBUG
+options 	UHCI_DEBUG
+options 	OHCI_DEBUG
+options 	USB_DEBUG
 
-options		UGEN_DEBUG
-options		UHID_DEBUG
-options		UHUB_DEBUG
-options		UKBD_DEBUG
-options		ULPT_DEBUG
-options		UMASS_DEBUG
-options		UMS_DEBUG
+options 	UGEN_DEBUG
+options 	UHID_DEBUG
+options 	UHUB_DEBUG
+options 	UKBD_DEBUG
+options 	ULPT_DEBUG
+options 	UMASS_DEBUG
+options 	UMS_DEBUG
 
 # options for ukbd:
-options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP=it.iso
 
 #
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.
-options		INIT_PATH="/sbin/init:/stand/sysinstall"
+options 	INIT_PATH="/sbin/init:/stand/sysinstall"
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 01ab89e..c2ad1f2 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.609 1999/06/24 03:54:54 jlemon Exp $
+#	$Id: LINT,v 1.610 1999/06/27 19:35:23 mjacob Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -53,13 +53,13 @@ maxusers	10
 # max, and explicitly set the maximum with a shell command for processes
 # that regularly exceed the limit like INND.
 #
-options		MAXDSIZ="(256*1024*1024)"
-options		DFLDSIZ="(256*1024*1024)"
+options 	MAXDSIZ="(256*1024*1024)"
+options 	DFLDSIZ="(256*1024*1024)"
 
 # Options for the VM subsystem
-#options	PQ_NOOPT		# No coloring
-options		PQ_LARGECACHE		# color for 512k/16k cache
-#options	PQ_HUGECACHE		# color for 1024k/16k cache
+#options 	PQ_NOOPT		# No coloring
+options 	PQ_LARGECACHE		# color for 512k/16k cache
+#options 	PQ_HUGECACHE		# color for 1024k/16k cache
 
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
@@ -89,14 +89,14 @@ options         INCLUDE_CONFIG_FILE     # Include this file in kernel
 #
 
 # Mandatory:
-options		SMP			# Symmetric MultiProcessor Kernel
-options		APIC_IO			# Symmetric (APIC) I/O
+options 	SMP			# Symmetric MultiProcessor Kernel
+options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
-options		NCPU=5			# number of CPUs
-options		NBUS=5			# number of busses
-options		NAPIC=2			# number of IO APICs
-options		NINTR=25		# number of INTs
+options 	NCPU=5			# number of CPUs
+options 	NBUS=5			# number of busses
+options 	NAPIC=2			# number of IO APICs
+options 	NINTR=25		# number of INTs
 
 #
 # Rogue SMP hardware:
@@ -195,21 +195,21 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 # NOTE 3: This option may cause failures for software that requires
 # locked cycles in order to operate correctly.
 #
-options		CPU_BLUELIGHTNING_FPU_OP_CACHE
-options		CPU_BLUELIGHTNING_3X
-options		CPU_BTB_EN
-options		CPU_DIRECT_MAPPED_CACHE
-options		CPU_DISABLE_5X86_LSSER
-options		CPU_FASTER_5X86_FPU
-options		CPU_I486_ON_386
-options		CPU_IORT
-options		CPU_LOOP_EN
-options		CPU_RSTK_EN
-options		CPU_SUSP_HLT
-options		CPU_WT_ALLOC
-options		CYRIX_CACHE_WORKS
-options		CYRIX_CACHE_REALLY_WORKS
-#options	NO_F00F_HACK
+options 	CPU_BLUELIGHTNING_FPU_OP_CACHE
+options 	CPU_BLUELIGHTNING_3X
+options 	CPU_BTB_EN
+options 	CPU_DIRECT_MAPPED_CACHE
+options 	CPU_DISABLE_5X86_LSSER
+options 	CPU_FASTER_5X86_FPU
+options 	CPU_I486_ON_386
+options 	CPU_IORT
+options 	CPU_LOOP_EN
+options 	CPU_RSTK_EN
+options 	CPU_SUSP_HLT
+options 	CPU_WT_ALLOC
+options 	CYRIX_CACHE_WORKS
+options 	CYRIX_CACHE_REALLY_WORKS
+#options 	NO_F00F_HACK
 
 #
 # A math emulator is mandatory if you wish to run on hardware which
@@ -217,9 +217,9 @@ options		CYRIX_CACHE_REALLY_WORKS
 # bogus (but freely-distributable) math emulator, or a much more
 # fully-featured but GPL-licensed emulator taken from Linux.
 #
-options		MATH_EMULATE		#Support for x87 emulation
+options 	MATH_EMULATE		#Support for x87 emulation
 # Don't enable both of these in a real config.
-options		GPL_MATH_EMULATE	#Support for x87 emulation via
+options 	GPL_MATH_EMULATE	#Support for x87 emulation via
 					#new math emulator 
 
 
@@ -231,29 +231,29 @@ options		GPL_MATH_EMULATE	#Support for x87 emulation via
 # FreeBSD.  You probably do NOT want to remove this as much current code
 # still relies on the 4.3 emulation.
 #
-options		COMPAT_43
+options 	COMPAT_43
 
 #
 # Allow user-mode programs to manipulate their local descriptor tables.
 # This option is required for the WINE Windows(tm) emulator, and is
 # not used by anything else (that we know of).
 #
-options		USER_LDT		#allow user-level control of i386 ldt
+options 	USER_LDT		#allow user-level control of i386 ldt
 
 #
 # These three options provide support for System V Interface
 # Definition-style interprocess communication, in the form of shared
 # memory, semaphores, and message queues, respectively.
 #
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
+options 	SYSVSHM
+options 	SYSVSEM
+options 	SYSVMSG
 
 #
 # This option includes a MD5 routine in the kernel, this is used for
 # various authentication and privacy uses.
 #
-options		MD5
+options 	MD5
 
 
 #####################################################################
@@ -262,14 +262,14 @@ options		MD5
 #
 # Enable the kernel debugger.
 #
-options		DDB
+options 	DDB
 
 #
 # Don't drop into DDB for a panic. Intended for unattended operation
 # where you may want to drop to DDB from the console, but still want
 # the machine to recover from a panic
 #
-options		DDB_UNATTENDED
+options 	DDB_UNATTENDED
 
 #
 # If using GDB remote mode to debug the kernel, there's a non-standard
@@ -278,12 +278,12 @@ options		DDB_UNATTENDED
 # standard and you're on your own if you enable it.  See also the
 # "remotechat" variables in the FreeBSD specific version of gdb.
 #
-options		GDB_REMOTE_CHAT
+options 	GDB_REMOTE_CHAT
 
 # 
 # KTRACE enables the system-call tracing facility ktrace(2).
 #
-options		KTRACE			#kernel tracing
+options 	KTRACE			#kernel tracing
 
 #
 # The INVARIANTS option is used in a number of source files to enable
@@ -292,7 +292,7 @@ options		KTRACE			#kernel tracing
 # for these conditions, which can only occur as a result of
 # programming errors.
 #
-options		INVARIANTS
+options 	INVARIANTS
 
 #
 # The INVARIANT_SUPPORT option makes us compile in support for
@@ -302,20 +302,20 @@ options		INVARIANTS
 # source files (by changing the source file or specifying it on the
 # command line) if you have 'INVARIANT_SUPPORT' enabled.
 #
-options		INVARIANT_SUPPORT
+options 	INVARIANT_SUPPORT
 
 #
 # The DIAGNOSTIC option is used to enable extra debugging information
 # from some parts of the kernel.  As this makes everything more noisy,
 # it is disabled by default.
 #
-options		DIAGNOSTIC
+options 	DIAGNOSTIC
 
 #
 # PERFMON causes the driver for Pentium/Pentium Pro performance counters
 # to be compiled.  See perfmon(4) for more information.
 #
-options		PERFMON
+options 	PERFMON
 
 
 #
@@ -329,15 +329,15 @@ options COMPILING_LINT
 
 # XXX - this doesn't belong here.
 # Allow ordinary users to take the console - this is useful for X.
-options		UCONSOLE
+options 	UCONSOLE
 
 # XXX - this doesn't belong here either
-options		USERCONFIG		#boot -c editor
-options		INTRO_USERCONFIG	#imply -c and show intro screen
-options		VISUAL_USERCONFIG	#visual boot -c editor
+options 	USERCONFIG		#boot -c editor
+options 	INTRO_USERCONFIG	#imply -c and show intro screen
+options 	VISUAL_USERCONFIG	#visual boot -c editor
 
 # XXX - neither does this
-options		ROOTDEVNAME=\"da0s2e\"
+options 	ROOTDEVNAME=\"da0s2e\"
 
 #####################################################################
 # NETWORKING OPTIONS
@@ -348,27 +348,27 @@ options		ROOTDEVNAME=\"da0s2e\"
 #  Source code for the NS (Xerox Network Service) is provided for amusement
 #  value.
 #
-options		INET			#Internet communications protocols
+options 	INET			#Internet communications protocols
 
-options		IPX			#IPX/SPX communications protocols
-options		IPXIP			#IPX in IP encapsulation (not available)
-options		IPTUNNEL		#IP in IPX encapsulation (not available)
+options 	IPX			#IPX/SPX communications protocols
+options 	IPXIP			#IPX in IP encapsulation (not available)
+options 	IPTUNNEL		#IP in IPX encapsulation (not available)
 
-options		NETATALK		#Appletalk communications protocols
+options 	NETATALK		#Appletalk communications protocols
 
 # These are currently broken but are shipped due to interest.
-#options		NS			#Xerox NS protocols
+#options 	NS			#Xerox NS protocols
 
 # These are currently broken and are no longer shipped due to lack
 # of interest.
-#options		CCITT			#X.25 network layer
-#options		ISO
-#options		TPIP			#ISO TP class 4 over IP
-#options		TPCONS			#ISO TP class 0 over X.25
-#options		LLC			#X.25 link layer for Ethernets
-#options		HDLC			#X.25 link layer for serial lines
-#options		EON			#ISO CLNP over IP
-#options		NSIP			#XNS over IP
+#options 	CCITT			#X.25 network layer
+#options 	ISO
+#options 	TPIP			#ISO TP class 4 over IP
+#options 	TPCONS			#ISO TP class 0 over X.25
+#options 	LLC			#X.25 link layer for Ethernets
+#options 	HDLC			#X.25 link layer for serial lines
+#options 	EON			#ISO CLNP over IP
+#options 	NSIP			#XNS over IP
 
 #
 # Network interfaces:
@@ -454,20 +454,20 @@ options PPP_FILTER			#enable bpf filtering (needs bpfilter)
 #
 # TCPDEBUG is undocumented.
 #
-options		TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
-options		MROUTING		# Multicast routing
+options 	TCP_COMPAT_42		#emulate 4.2BSD TCP bugs
+options 	MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
 options         IPFIREWALL_FORWARD      #enable transparent proxy support
-options		IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
-options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
-options		IPDIVERT		#divert sockets
-options		IPFILTER		#kernel ipfilter support
-options		IPFILTER_LOG		#ipfilter logging
-#options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
-options		IPSTEALTH		#support for stealth forwarding
-options		TCPDEBUG
+options 	IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
+options 	IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
+options 	IPDIVERT		#divert sockets
+options 	IPFILTER		#kernel ipfilter support
+options 	IPFILTER_LOG		#ipfilter logging
+#options 	IPFILTER_LKM		#kernel support for ip_fil.o LKM
+options 	IPSTEALTH		#support for stealth forwarding
+options 	TCPDEBUG
 
 # ICMP_BANDLIM enables icmp error response bandwidth limiting.   You
 # typically want this option as it will help protect the machine from
@@ -479,8 +479,8 @@ options         ICMP_BANDLIM
 # IPFIREWALL as well. See the dummynet(4) manpage for more info.
 # BRIDGE enables bridging between ethernet cards -- see bridge(4).
 # You can use IPFIREWALL and dummynet together with bridging.
-options	DUMMYNET
-options	BRIDGE
+options DUMMYNET
+options BRIDGE
 
 #
 # ATM (HARP version) options
@@ -504,11 +504,11 @@ options	BRIDGE
 # The `hfa' driver provides support for the FORE Systems, Inc.
 # PCA-200E ATM PCI Adapter.
 #
-options		ATM_CORE		#core ATM protocol family
-options		ATM_IP			#IP over ATM support
-options		ATM_SIGPVC		#SIGPVC signalling manager
-options		ATM_SPANS		#SPANS signalling manager
-options		ATM_UNI			#UNI signalling manager
+options 	ATM_CORE		#core ATM protocol family
+options 	ATM_IP			#IP over ATM support
+options 	ATM_SIGPVC		#SIGPVC signalling manager
+options 	ATM_SPANS		#SPANS signalling manager
+options 	ATM_UNI			#UNI signalling manager
 device		hea0			#Efficient ENI-155p ATM PCI
 device		hfa0			#FORE PCA-200E ATM PCI
 
@@ -530,30 +530,30 @@ device		hfa0			#FORE PCA-200E ATM PCI
 #
 
 # One of these is mandatory:
-options		FFS			#Fast filesystem
-options		MFS			#Memory File System
-options		NFS			#Network File System
+options 	FFS			#Fast filesystem
+options 	MFS			#Memory File System
+options 	NFS			#Network File System
 
 # The rest are optional:
 # options	NFS_NOSERVER		#Disable the NFS-server code.
-options		CD9660			#ISO 9660 filesystem
-options		FDESC			#File descriptor filesystem
-options		KERNFS			#Kernel filesystem
-options		MSDOSFS			#MS DOS File System
-options		NTFS			#NT File System
-options		NULLFS			#NULL filesystem
-options		PORTAL			#Portal filesystem
-options		PROCFS			#Process filesystem
-options		UMAPFS			#UID map filesystem
-options		UNION			#Union filesystem
+options 	CD9660			#ISO 9660 filesystem
+options 	FDESC			#File descriptor filesystem
+options 	KERNFS			#Kernel filesystem
+options 	MSDOSFS			#MS DOS File System
+options 	NTFS			#NT File System
+options 	NULLFS			#NULL filesystem
+options 	PORTAL			#Portal filesystem
+options 	PROCFS			#Process filesystem
+options 	UMAPFS			#UID map filesystem
+options 	UNION			#Union filesystem
 # The xFS_ROOT options REQUIRE the associated ``options xFS''
-options		CD9660_ROOT		#CD-ROM usable as root device
-options		FFS_ROOT		#FFS usable as root device
-options		MFS_ROOT		#MFS usable as root device
-options		NFS_ROOT		#NFS usable as root device
+options 	CD9660_ROOT		#CD-ROM usable as root device
+options 	FFS_ROOT		#FFS usable as root device
+options 	MFS_ROOT		#MFS usable as root device
+options 	NFS_ROOT		#NFS usable as root device
 # This code is still experimental (e.g. doesn't handle disk slices well).
 # Also, 'options MFS' is currently incompatible with DEVFS.
-options		DEVFS			#devices filesystem
+options 	DEVFS			#devices filesystem
 
 # Soft updates is technique for improving file system speed and
 # making abrupt shutdown less risky.  It is not enabled by default due
@@ -563,32 +563,32 @@ options		DEVFS			#devices filesystem
 # do to enable this.  ../../../contrib/sys/softupdates/README gives
 # more details on how they actually work.
 #
-#options		SOFTUPDATES
+#options 	SOFTUPDATES
 
 # Make space in the kernel for a MFS root filesystem.  Define to the number
 # of kilobytes to reserve for the filesystem.
-options		MFS_ROOT_SIZE=10
+options 	MFS_ROOT_SIZE=10
 # Allows MFS filesystems to be exported via nfs
-options		EXPORTMFS
+options 	EXPORTMFS
 
 # Allow this many swap-devices.
-options		NSWAPDEV=20
+options 	NSWAPDEV=20
 
 # Disk quotas are supported when this option is enabled.
-options		QUOTA			#enable disk quotas
+options 	QUOTA			#enable disk quotas
 
 # Add more checking code to various filesystems
-#options		NULLFS_DIAGNOSTIC
-#options		KERNFS_DIAGNOSTIC
-#options		UMAPFS_DIAGNOSTIC
-#options		UNION_DIAGNOSTIC
+#options 	NULLFS_DIAGNOSTIC
+#options 	KERNFS_DIAGNOSTIC
+#options 	UMAPFS_DIAGNOSTIC
+#options 	UNION_DIAGNOSTIC
 
 # In particular multi-session CD-Rs might require a huge amount of
 # time in order to "settle".  If we are about mounting them as the
 # root f/s, we gotta wait a little.
 #
 # The number is supposed to be in seconds.
-options		CD9660_ROOTDELAY=20
+options 	CD9660_ROOTDELAY=20
 
 # If you are running a machine just as a fileserver for PC and MAC
 # users, using SAMBA or Netatalk, you may consider setting this option
@@ -603,27 +603,27 @@ options		CD9660_ROOTDELAY=20
 # you all the support calls as the filesystem it's used on will act as
 # they expect: "It's my dir so it must be my file".
 #
-options		SUIDDIR
+options 	SUIDDIR
 
 
 # Add some error checking code to the null_bypass routine
 # in the NULL filesystem
-#options		SAFETY
+#options 	SAFETY
 
 
 # NFS options:
-options		NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
-options		NFS_MAXATTRTIMO=60
-options		NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
-options		NFS_MAXDIRATTRTIMO=60
-options		NFS_GATHERDELAY=10	# Default write gather delay (msec)
-options		NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
-options		NFS_WDELAYHASHSIZ=16	# and with this
-options		NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
-options		NFS_DEBUG		# Enable NFS Debugging
+options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
+options 	NFS_MAXATTRTIMO=60
+options 	NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
+options 	NFS_MAXDIRATTRTIMO=60
+options 	NFS_GATHERDELAY=10	# Default write gather delay (msec)
+options 	NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
+options 	NFS_WDELAYHASHSIZ=16	# and with this
+options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
+options 	NFS_DEBUG		# Enable NFS Debugging
 
 # Coda stuff:
-options		CODA			#CODA filesystem.
+options 	CODA			#CODA filesystem.
 pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 
 #
@@ -632,7 +632,7 @@ pseudo-device	vcoda	4		#coda minicache <-> venus comm.
 # changes and not be exercised very much, so mounting read/write could
 # be dangerous (and even mounting read only could result in panics.)
 #
-options		EXT2FS
+options 	EXT2FS
 
 
 
@@ -644,9 +644,9 @@ options		EXT2FS
 # _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
 # _KPOSIX_VERSION:             Version kernel is built for
 
-options		P1003_1B
-options		_KPOSIX_PRIORITY_SCHEDULING
-options		_KPOSIX_VERSION=199309L
+options 	P1003_1B
+options 	_KPOSIX_PRIORITY_SCHEDULING
+options 	_KPOSIX_VERSION=199309L
 
 
 #####################################################################
@@ -728,16 +728,16 @@ device sctarg0 at scbus? # SCSI target
 # SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
 #             queue after a bus reset, and the number of milliseconds to
 #             freeze the device queue after a bus device reset.
-options		CAMDEBUG
-options		CAM_DEBUG_BUS=-1
-options		CAM_DEBUG_TARGET=-1
-options		CAM_DEBUG_LUN=-1
-options		CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
-options		CAM_MAX_HIGHPOWER=4
-options		SCSI_NO_SENSE_STRINGS
-options		SCSI_NO_OP_STRINGS
-options		SCSI_REPORT_GEOMETRY
-options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options 	CAMDEBUG
+options 	CAM_DEBUG_BUS=-1
+options 	CAM_DEBUG_TARGET=-1
+options 	CAM_DEBUG_LUN=-1
+options 	CAM_DEBUG_FLAGS="CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
+options 	CAM_MAX_HIGHPOWER=4
+options 	SCSI_NO_SENSE_STRINGS
+options 	SCSI_NO_OP_STRINGS
+options 	SCSI_REPORT_GEOMETRY
+options 	SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 
 # Options for the CAM CDROM driver:
 # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
@@ -750,16 +750,16 @@ options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
 # kern.cam.cd.changer.min_busy_seconds
 # kern.cam.cd.changer.max_busy_seconds
 #
-options		CHANGER_MIN_BUSY_SECONDS=2
-options		CHANGER_MAX_BUSY_SECONDS=10
+options 	CHANGER_MIN_BUSY_SECONDS=2
+options 	CHANGER_MAX_BUSY_SECONDS=10
 
 # Options for the CAM sequential access driver:
 # SA_SPACE_TIMEOUT: Timeout for space operations, in minutes
 # SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes
 # SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes
-options		SA_SPACE_TIMEOUT="(60)"
-options		SA_REWIND_TIMEOUT="(2*60)"
-options		SA_ERASE_TIMEOUT="(4*60)"
+options 	SA_SPACE_TIMEOUT="(60)"
+options 	SA_REWIND_TIMEOUT="(2*60)"
+options 	SA_ERASE_TIMEOUT="(4*60)"
 
 
 #####################################################################
@@ -795,7 +795,7 @@ options 	VINUMDEBUG	#enable Vinum debugging hooks
 #pseudo-device	tb
 
 # Size of the kernel message buffer.  Should be N * pagesize.
-options		MSGBUF_SIZE=40960
+options 	MSGBUF_SIZE=40960
 
 
 #####################################################################
@@ -841,18 +841,18 @@ controller	isa0
 #
 # PAS_JOYSTICK_ENABLE enables the gameport on the ProAudio Spectrum
 
-options		AUTO_EOI_1
-#options	AUTO_EOI_2
-options		MAXMEM="(128*1024)"
+options 	AUTO_EOI_1
+#options 	AUTO_EOI_2
+options 	MAXMEM="(128*1024)"
 options 	TUNE_1542
-#options	BROKEN_KEYBOARD_RESET
-#options	PAS_JOYSTICK_ENABLE
+#options 	BROKEN_KEYBOARD_RESET
+#options 	PAS_JOYSTICK_ENABLE
 
 # Enable support for the kernel PLL to use an external PPS signal,
 # under supervision of [x]ntpd(8)
 # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
 
-options		PPS_SYNC
+options 	PPS_SYNC
 
 # If you see the "calcru: negative time of %ld usec for pid %d (%s)\n"
 # message you probably have some broken sw/hw which disables interrupts
@@ -861,7 +861,7 @@ options		PPS_SYNC
 # is no upper limit but more than a couple of hundred are not productive.
 # A better strategy may be to sysctl -w kern.timecounter.method=1
 
-options		NTIMECOUNTER=20
+options 	NTIMECOUNTER=20
 
 # Enable PnP support in the kernel.  This allows you to automatically
 # attach to PnP cards for drivers that support it and allows you to
@@ -875,12 +875,12 @@ controller	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 
 # Options for atkbd:
-options		ATKBD_DFLT_KEYMAP	# specify the built-in keymap
+options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	ATKBD_DFLT_KEYMAP="jp.106"
 
 # These options are valid for other keyboard drivers as well.
-options		KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard
@@ -891,9 +891,9 @@ options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 device		psm0	at atkbdc? irq 12
 
 # Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
+options 	PSM_HOOKAPM		#hook the APM resume event, useful
 					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
 device		vga0	at isa? port ? conflicts
@@ -902,60 +902,60 @@ device		vga0	at isa? port ? conflicts
 # Try the following option if the mouse pointer is not drawn correctly 
 # or font does not seem to be loaded properly.  May cause flicker on 
 # some systems.
-options		VGA_ALT_SEQACCESS
+options 	VGA_ALT_SEQACCESS
 
 # If you can dispense with some vga driver features, you may want to
 # use the following options to save some memory.
-options		VGA_NO_FONT_LOADING	# don't save/load font
-options		VGA_NO_MODE_CHANGE	# don't change video modes
+options 	VGA_NO_FONT_LOADING	# don't save/load font
+options 	VGA_NO_MODE_CHANGE	# don't change video modes
 
 # Older video cards may require this option for proper operation.
-options		VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
+options 	VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
 
 # The following option probably won't work with the LCD displays.
 options		VGA_WIDTH90		# support 90 column modes
 
 # To include support for VESA video modes
-options		VESA
+options 	VESA
 
 # Splash screen at start up!  Screen savers require this too.
 pseudo-device	splash
 
 # The pcvt console driver (vt220 compatible).
 device		vt0	at isa?
-options		XSERVER			# support for running an X server.
-options		FAT_CURSOR		# start with block cursor
+options 	XSERVER			# support for running an X server.
+options 	FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
-options		PCVT_SCANSET=2 		# IBM keyboards are non-std
+options 	PCVT_SCANSET=2 		# IBM keyboards are non-std
 # Other PCVT options are documented in pcvt(4).
-options		PCVT_24LINESDEF
-options		PCVT_CTRL_ALT_DEL
-options		PCVT_EMU_MOUSE
-options		PCVT_FREEBSD=211
-options		PCVT_META_ESC
-options		PCVT_NSCREENS=9
-options		PCVT_PRETTYSCRNS
-options		PCVT_SCREENSAVER
-options		PCVT_USEKBDSEC
-options		PCVT_VT220KEYB
+options 	PCVT_24LINESDEF
+options 	PCVT_CTRL_ALT_DEL
+options 	PCVT_EMU_MOUSE
+options 	PCVT_FREEBSD=211
+options 	PCVT_META_ESC
+options 	PCVT_NSCREENS=9
+options 	PCVT_PRETTYSCRNS
+options 	PCVT_SCREENSAVER
+options 	PCVT_USEKBDSEC
+options 	PCVT_VT220KEYB
 
 # The syscons console driver (sco color console compatible).
 device		sc0	at isa?
-options		MAXCONS=16		# number of virtual consoles
-options		SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
-options		SC_DFLT_FONT		# compile font in
-makeoptions	SC_DFLT_FONT="cp850"
-options		SC_DISABLE_DDBKEY	# disable `debug' key
-options		SC_DISABLE_REBOOT	# disable reboot key sequence
-options		SC_HISTORY_SIZE=200	# number of history buffer lines
-options		SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
-options		SC_PIXEL_MODE		# add support for the raster text mode
+options 	MAXCONS=16		# number of virtual consoles
+options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
+options 	SC_DFLT_FONT		# compile font in
+makeoptions	SC_DFLT_FONT=cp850
+options 	SC_DISABLE_DDBKEY	# disable `debug' key
+options 	SC_DISABLE_REBOOT	# disable reboot key sequence
+options 	SC_HISTORY_SIZE=200	# number of history buffer lines
+options 	SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
+options 	SC_PIXEL_MODE		# add support for the raster text mode
 
 # You can selectively disable features in syscons.
-options		SC_NO_CUTPASTE
-options		SC_NO_FONT_LOADING
-options		SC_NO_HISTORY
-options		SC_NO_SYSMOUSE
+options 	SC_NO_CUTPASTE
+options 	SC_NO_FONT_LOADING
+options 	SC_NO_HISTORY
+options 	SC_NO_SYSMOUSE
 
 #
 # The Numeric Processing eXtension driver.  This should be configured if
@@ -1102,7 +1102,7 @@ disk		wd3	at wdc1 drive 1
 # the IDE specs, but may still work for you (it will work for most
 # people).
 #
-options		IDE_DELAY=8000	# Be optimistic about Joe IDE device
+options 	IDE_DELAY=8000	# Be optimistic about Joe IDE device
 
 # IDE CD-ROM & CD-R/RW  driver - requires wdc controller
 device          wcd0
@@ -1122,13 +1122,13 @@ controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
 # FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
 # gotta turn it actually on by setting the variable fd_debug with DDB,
 # however.
-options		FDC_DEBUG
+options 	FDC_DEBUG
 # FDC_YE enables support for the floppies used on the Libretto.  This is a
 # pcmcia floppy.  You will also need to add
 #card "Y-E DATA" "External FDD"
 #        config 0x4 "fdc0" 10
 # to your pccard.conf file.
-options		FDC_YE		#XXX newbus broken
+options 	FDC_YE		#XXX newbus broken
 #
 # Activate this line instead of the fdc0 line above if you happen to
 # have an Insight floppy tape.  Probing them proved to be dangerous
@@ -1168,14 +1168,14 @@ device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
 #
 
 # Options for serial drivers that support consoles (only for sio now):
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
 					#DDB, if available.
-options		CONSPEED=9600		#default speed for serial console (default 9600)
+options 	CONSPEED=9600		#default speed for serial console (default 9600)
 
 # Options for sio:
-options		COM_ESP			#code for Hayes ESP
-options		COM_MULTIPORT		#code for some cards with shared IRQs
-options		EXTRA_SIO=2		#number of extra sio ports to allocate
+options 	COM_ESP			#code for Hayes ESP
+options 	COM_MULTIPORT		#code for some cards with shared IRQs
+options 	EXTRA_SIO=2		#number of extra sio ports to allocate
 
 # Other flags for sio that aren't documented in the man page.
 #	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
@@ -1225,8 +1225,8 @@ device lnc0 at isa? port 0x280 irq 10 drq 0
 device rdp0 at isa? port 0x378 irq 7 flags 2
 device sr0 at isa? port 0x300 irq 5 iomem 0xd0000
 device wi0 at isa? port? irq?
-options		WLCACHE		# enables the signal-strength cache
-options		WLDEBUG		# enables verbose debugging output
+options 	WLCACHE		# enables the signal-strength cache
+options 	WLDEBUG		# enables verbose debugging output
 device wl0 at isa? port 0x300 irq ?
 device xe0 at isa? port? irq ?
 # We can (bogusly) include both the dedicated PCCARD drivers and the generic
@@ -1254,7 +1254,7 @@ device oltr0 at isa?
 pseudo-device	atm
 device en0
 device en1
-options		NATM			#native ATM
+options 	NATM			#native ATM
 
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
@@ -1468,9 +1468,9 @@ device		gp0	at isa? port 0x2c0
 device		gsc0	at isa? port IO_GSC1 drq 3
 device		joy0	at isa? port IO_GAME
 device		cy0	at isa? irq 10 iomem 0xd4000 iosiz 0x2000
-options		CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
+options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 device		dgb0	at isa? port 0x220 iomem 0xfc000 iosiz ?
-options		NDGBPORTS=16		# Defaults to 16*NDGB
+options 	NDGBPORTS=16		# Defaults to 16*NDGB
 device		dgm0	at isa? port 0x104 iomem 0xd0000 iosiz ?
 device		labpc0	at isa? port 0x260 irq 5
 device          rc0     at isa? port 0x220 irq 12
@@ -1516,7 +1516,7 @@ options AHC_ALLOW_MEMIO
 # for most machines, but in particular the HP NetServer LC series comes
 # with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
 # thus you need to bump this figure to 12 for them.
-options	EISA_SLOTS=12
+options EISA_SLOTS=12
 
 #
 # PCI devices & PCI options:
@@ -1691,14 +1691,14 @@ controller	isp0
 #	ISP_DISABLE_2100_SUPPORT	Disable support for 2100 cards
 #	(these really just to save code space)
 #	(use of all three will cause the driver to not compile)
-options	SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
+options SCSI_ISP_NO_FWLOAD_MASK=0x12	# disable FW load for isp1 and isp4
 options SCSI_ISP_NO_NVRAM_MASK=0x1	# disable NVRAM for isp0
 options SCSI_ISP_PREFER_MEM_MAP=0	# prefer I/O mapping
 options SCSI_ISP_FCDUPLEX=0x4		# isp2 is a Fibre Channel card
 					# we want in full duplex mode.
-#options	ISP_DISABLE_1020_SUPPORT
-#options	ISP_DISABLE_1080_SUPPORT
-#options	ISP_DISABLE_2100_SUPPORT
+#options ISP_DISABLE_1020_SUPPORT
+#options ISP_DISABLE_1080_SUPPORT
+#options ISP_DISABLE_2100_SUPPORT
 
 device		al0
 device		ax0
@@ -1733,7 +1733,7 @@ device		bktr0
 #
 # PCI options
 #
-#options	PCI_QUIET	#quiets PCI code on chipset settings
+#options 	PCI_QUIET	#quiets PCI code on chipset settings
 
 #
 # PCCARD/PCMCIA
@@ -1745,7 +1745,7 @@ device		pcic0 at card?
 device		pcic1 at card?
 
 # You may need to reset all pccards after resuming
-options		PCIC_RESUME_RESET	# reset after resume
+options 	PCIC_RESUME_RESET	# reset after resume
 
 #
 # Laptop/Notebook options:
@@ -1757,7 +1757,7 @@ options		PCIC_RESUME_RESET	# reset after resume
 # For older notebooks that signal a powerfail condition (external
 # power supply dropped, or battery state low) by issuing an NMI:
 
-options		POWERFAIL_NMI	# make it beep instead of panicing
+options 	POWERFAIL_NMI	# make it beep instead of panicing
 
 #
 # SMB bus
@@ -1924,7 +1924,7 @@ pseudo-device   "i4btel"        2
 # network driver for IP over raw HDLC ISDN
 pseudo-device   "i4bipr"	4
 # enable VJ header compression detection for ipr i/f
-options		IPR_VJ
+options 	IPR_VJ
 #
 # network driver for sync PPP over ISDN
 pseudo-device	"i4bisppp"	4
@@ -1950,14 +1950,14 @@ pseudo-device	"i4bisppp"	4
 # ppc	ISA-bus parallel port interfaces.  
 #
 
-options		DEBUG_1284	# IEEE1284 signaling protocol debug
-options		PERIPH_1284	# Makes your computer act as a IEEE1284
+options 	DEBUG_1284	# IEEE1284 signaling protocol debug
+options 	PERIPH_1284	# Makes your computer act as a IEEE1284
 				# compliant peripheral
-options		DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
-options		VP0_DEBUG	# ZIP/ZIP+ debug
-options		LPT_DEBUG	# Printer driver debug
-options		PPC_DEBUG	# Parallel chipset level debug
-options		PLIP_DEBUG	# Parallel network IP interface debug
+options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
+options 	VP0_DEBUG	# ZIP/ZIP+ debug
+options 	LPT_DEBUG	# Printer driver debug
+options 	PPC_DEBUG	# Parallel chipset level debug
+options 	PLIP_DEBUG	# Parallel network IP interface debug
 
 controller	ppbus0
 controller	vpo0	at ppbus?
@@ -1971,17 +1971,17 @@ device		ppc0	at isa? port? irq 7
 
 # Kernel BOOTP support 
 
-options		BOOTP		# Use BOOTP to obtain IP address/hostname
-options		BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
-options		BOOTP_NFSV3	# Use NFS v3 to NFS mount root
-options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
-options		BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
+options 	BOOTP		# Use BOOTP to obtain IP address/hostname
+options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
+options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
+options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
+options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
 #
 # Add tie-ins for a hardware watchdog.  This only enable the hooks;
 # the user must still supply the actual driver.
 #
-options		HW_WDOG
+options 	HW_WDOG
 
 #
 # Set the number of PV entries per process.  Increasing this can
@@ -2004,14 +2004,14 @@ options         PMAP_SHPGPERPROC=201
 # (see also sysctls "vm.defer_swapspace_pageouts" and
 # "vm.disable_swapspace_pageouts")
 #
-#options	NO_SWAPPING
+#options 	NO_SWAPPING
 
 # Set the number of sf_bufs to allocate. sf_bufs are virtual buffers
 # for sendfile(2) that are used to map file VM pages, and normally
 # default to a quantity that is roughly 16*MAXUSERS+512. You would
 # typically want about 4 of these for each simultaneous file send.
 #
-options		NSFBUFS=1024
+options 	NSFBUFS=1024
 
 #
 # Enable extra debugging code for locks.  This stores the filename and
@@ -2021,65 +2021,65 @@ options		NSFBUFS=1024
 # that it is likely to break e.g. fstat(1) unless you recompile your
 # userland with -DDEBUG_LOCKS as well.
 #
-options		DEBUG_LOCKS
+options 	DEBUG_LOCKS
 
 # More undocumented options for linting.
 
-options		CLK_CALIBRATION_LOOP
-options		CLK_USE_I8254_CALIBRATION
-options		CLK_USE_TSC_CALIBRATION
-options		TIMER_FREQ="((14318182+6)/12)"
-options		CLUSTERDEBUG
-options		COMPAT_LINUX
-options		CPU_UPGRADE_HW_CACHE
-options		DEBUG
-options		DEBUG_VFS_LOCKS
-#options	DISABLE_PSE
-options		I586_PMC_GUPROF=0x70000
-options		IBCS2
-options		KEY
-options		KEY_DEBUG
-options		LOCKF_DEBUG
-options		LOUTB
-options		KBD_MAXRETRY=4
-options		KBD_MAXWAIT=6
-options		KBD_RESETDELAY=201
-options		KBDIO_DEBUG=2
-options		MSGMNB=2049
-options		MSGMNI=41
-options		MSGSEG=2049
-options		MSGSSZ=16
-options		MSGTQL=41
-options		NBUF=512
-options		NETATALKDEBUG
-options		NMBCLUSTERS=1024
-options		NPX_DEBUG
-options		PANIC_REBOOT_WAIT_TIME=16
-options		PSM_DEBUG=1
-options		SCSI_NCR_DEBUG
-options		SCSI_NCR_DFLT_TAGS=4
-options		SCSI_NCR_MAX_SYNC=10000
-options		SCSI_NCR_MAX_WIDE=1
-options		SCSI_NCR_MYADDR=7
-options		SEMMAP=31
-options		SEMMNI=11
-options		SEMMNS=61
-options		SEMMNU=31
-options		SEMMSL=61
-options		SEMOPM=101
-options		SEMUME=11
-options		SHOW_BUSYBUFS	# List buffers that prevent root unmount
-options		SHMALL=1025
-options		SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
-options		SHMMAXPGS=1025
-options		SHMMIN=2
-options		SHMMNI=33
-options		SHMSEG=9
-options		SI_DEBUG
-options		SIMPLELOCK_DEBUG
-options		SPX_HACK
-options		VFS_BIO_DEBUG
-options		ENABLE_ALART
+options 	CLK_CALIBRATION_LOOP
+options 	CLK_USE_I8254_CALIBRATION
+options 	CLK_USE_TSC_CALIBRATION
+options 	TIMER_FREQ="((14318182+6)/12)"
+options 	CLUSTERDEBUG
+options 	COMPAT_LINUX
+options 	CPU_UPGRADE_HW_CACHE
+options 	DEBUG
+options 	DEBUG_VFS_LOCKS
+#options 	DISABLE_PSE
+options 	I586_PMC_GUPROF=0x70000
+options 	IBCS2
+options 	KEY
+options 	KEY_DEBUG
+options 	LOCKF_DEBUG
+options 	LOUTB
+options 	KBD_MAXRETRY=4
+options 	KBD_MAXWAIT=6
+options 	KBD_RESETDELAY=201
+options 	KBDIO_DEBUG=2
+options 	MSGMNB=2049
+options 	MSGMNI=41
+options 	MSGSEG=2049
+options 	MSGSSZ=16
+options 	MSGTQL=41
+options 	NBUF=512
+options 	NETATALKDEBUG
+options 	NMBCLUSTERS=1024
+options 	NPX_DEBUG
+options 	PANIC_REBOOT_WAIT_TIME=16
+options 	PSM_DEBUG=1
+options 	SCSI_NCR_DEBUG
+options 	SCSI_NCR_DFLT_TAGS=4
+options 	SCSI_NCR_MAX_SYNC=10000
+options 	SCSI_NCR_MAX_WIDE=1
+options 	SCSI_NCR_MYADDR=7
+options 	SEMMAP=31
+options 	SEMMNI=11
+options 	SEMMNS=61
+options 	SEMMNU=31
+options 	SEMMSL=61
+options 	SEMOPM=101
+options 	SEMUME=11
+options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
+options 	SHMALL=1025
+options 	SHMMAX="(SHMMAXPGS*PAGE_SIZE+1)"
+options 	SHMMAXPGS=1025
+options 	SHMMIN=2
+options 	SHMMNI=33
+options 	SHMSEG=9
+options 	SI_DEBUG
+options 	SIMPLELOCK_DEBUG
+options 	SPX_HACK
+options 	VFS_BIO_DEBUG
+options 	ENABLE_ALART
 
 # The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
 # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
@@ -2131,7 +2131,7 @@ options DPT_RESTRICTED_FREELIST
 options DPT_FREELIST_IS_STACK
 #!CAM# options DPT_HANDLE_TIMEOUTS
 options DPT_TIMEOUT_FACTOR=4
-options	DPT_INTR_DELAY=200      # Some motherboards need that
+options DPT_INTR_DELAY=200      # Some motherboards need that
 options DPT_LOST_IRQ
 options DPT_RESET_HBA
 
@@ -2163,25 +2163,25 @@ device		ums0
 
 # debugging options for the USB subsystem
 #
-options		UHCI_DEBUG
-options		OHCI_DEBUG
-options		USB_DEBUG
+options 	UHCI_DEBUG
+options 	OHCI_DEBUG
+options 	USB_DEBUG
 
-options		UGEN_DEBUG
-options		UHID_DEBUG
-options		UHUB_DEBUG
-options		UKBD_DEBUG
-options		ULPT_DEBUG
-options		UMASS_DEBUG
-options		UMS_DEBUG
+options 	UGEN_DEBUG
+options 	UHID_DEBUG
+options 	UHUB_DEBUG
+options 	UKBD_DEBUG
+options 	ULPT_DEBUG
+options 	UMASS_DEBUG
+options 	UMS_DEBUG
 
 # options for ukbd:
-options		UKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	UKBD_DFLT_KEYMAP="it.iso"
+options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
+makeoptions	UKBD_DFLT_KEYMAP=it.iso
 
 #
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.
-options		INIT_PATH="/sbin/init:/stand/sysinstall"
+options 	INIT_PATH="/sbin/init:/stand/sysinstall"