Since we all seem to be on this kick lately: s/options/option/g.

Also, add some description as to what these are for.

5 files changed, 245 insertions, 245 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 5fd7c2f64a4..9d83d6ec757 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.20 1997/04/14 18:47:48 gene Exp $
+#	$OpenBSD: GENERIC,v 1.21 1997/06/05 18:52:40 gene Exp $
 #	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
 #
 # GENERIC
@@ -7,64 +7,64 @@ include	"arch/mac68k/conf/std.mac68k"
 
 maxusers	16
 
-# Standard system options
-options		DIAGNOSTIC		# DEBUG for extra kernel debugging
-options		KTRACE			# system call tracing support
-#options	KGDB			# support for kernel gdb
-#options	GDB			# support for normal gdb
-#options	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		DDB
-options		FFS
-options		QUOTA		# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-#options	NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		NULLFS		# Null (formerly loop-back) filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-#options	UMAPFS		# uid/gid remapping filesystem
-#options	LFS		# Log-based filesystem (still experimental)
-#options	PORTAL		# portal filesystem (still experimental)
-options		PROCFS		# Process filesystem
-
-options		LKM		# loadable kernel modules
-
-options		SCSI
-#options	SCSIDEBUG
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-options		IPFILTER
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-options		COMPAT_43
-options		NS
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-options		PPP_BSDCOMP,PPP_DEFLATE
-
-# Mac-specific options
-options		M68040
-options		M68030
-options		M68020		# Must have 68851 PMMU
-options		FPSP
-options		FPU_EMULATE
-options		COMPAT_NOMID
-options		COMPAT_SUNOS
-options		ZS_CONSOLE_ABORT
-options		DISABLE_EXT_CACHE # Don't use IIci external cache
-options		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#options	MRG_ADB		  # Use ROM-based ADB driver
+# Standard system option
+option		DIAGNOSTIC		# DEBUG for extra kernel debugging
+option		KTRACE			# system call tracing support
+#option	KGDB			# support for kernel gdb
+#option	GDB			# support for normal gdb
+#option	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
+
+# Filesystem option
+option		FIFO		# POSIX fifo support (in all filesystems)
+option		DDB
+option		FFS
+option		QUOTA		# fast filesystem with user and group quotas
+option		MFS		# memory-based filesystem
+#option	NFSSERVER	# Sun NFS-compatible filesystem
+option		NFSCLIENT	# Sun NFS-compatible filesystem
+option		NULLFS		# Null (formerly loop-back) filesystem
+option		CD9660		# ISO-9660 w/ RockRidge
+option		KERNFS		# kernel data-structure filesystem
+option		FDESC		# user file descriptor filesystem
+#option	UMAPFS		# uid/gid remapping filesystem
+#option	LFS		# Log-based filesystem (still experimental)
+#option	PORTAL		# portal filesystem (still experimental)
+option		PROCFS		# Process filesystem
+
+option		LKM		# loadable kernel modules
+
+option		SCSI
+#option	SCSIDEBUG
+
+# Networking option
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+option		IPFILTER
+#option	ISO		# OSI networking
+#option	TPIP
+#option	EON
+option		COMPAT_43
+option		NS
+option		MAPMEM
+option		SYSVSHM,SYSVSEM,SYSVMSG
+option		PPP_BSDCOMP,PPP_DEFLATE
+
+# Mac-specific option
+option		M68040
+option		M68030
+option		M68020		# Must have 68851 PMMU
+option		FPSP
+option		FPU_EMULATE
+option		COMPAT_NOMID
+option		COMPAT_SUNOS
+option		ZS_CONSOLE_ABORT
+option		DISABLE_EXT_CACHE # Don't use IIci external cache
+option		DISABLE_ADB_WITH_SERIAL_CONSOLE
+#option	MRG_ADB		  # Use ROM-based ADB driver
 
 config		bsd	swap generic
-options		GENERIC
+option		GENERIC
 
 sn*		at obio?	# Internal ethernet
 
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 47a91100241..3a36f2f4702 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,70 +1,70 @@
-#	$OpenBSD: GENERICSBC,v 1.6 1997/04/14 18:47:50 gene Exp $
+#	$OpenBSD: GENERICSBC,v 1.7 1997/06/05 18:52:41 gene Exp $
 #	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
 #
-# GENERIC
+# GENERICSBC --- our generic kernel using the SBC SCSI driver
 
 include	"arch/mac68k/conf/std.mac68k"
 
 maxusers	16
 
-# Standard system options
-options		DIAGNOSTIC		# DEBUG for extra kernel debugging
-options		KTRACE			# system call tracing support
-#options	KGDB			# support for kernel gdb
-#options	GDB			# support for normal gdb
-#options	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		DDB
-options		FFS
-options		QUOTA		# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-#options	NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		NULLFS		# Null (formerly loop-back) filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-#options	UMAPFS		# uid/gid remapping filesystem
-#options	LFS		# Log-based filesystem (still experimental)
-#options	PORTAL		# portal filesystem (still experimental)
-options		PROCFS		# Process filesystem
-
-options		LKM		# loadable kernel modules
-
-options		SCSI
-#options	SCSIDEBUG
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-options		IPFILTER
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-options		COMPAT_43
-options		NS
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-options		PPP_BSDCOMP,PPP_DEFLATE
-
-# Mac-specific options
-options		M68040
-options		M68030
-options		M68020		# Must have 68851 PMMU
-options		FPSP
-options		FPU_EMULATE
-options		COMPAT_NOMID
-options		COMPAT_SUNOS
-options		ZS_CONSOLE_ABORT
-options		DISABLE_EXT_CACHE # Don't use IIci external cache
-options		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#options	MRG_ADB		  # Use ROM-based ADB driver
+# Standard system option
+option		DIAGNOSTIC		# DEBUG for extra kernel debugging
+option		KTRACE			# system call tracing support
+#option	KGDB			# support for kernel gdb
+#option	GDB			# support for normal gdb
+#option	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
+
+# Filesystem option
+option		FIFO		# POSIX fifo support (in all filesystems)
+option		DDB
+option		FFS
+option		QUOTA		# fast filesystem with user and group quotas
+option		MFS		# memory-based filesystem
+#option	NFSSERVER	# Sun NFS-compatible filesystem
+option		NFSCLIENT	# Sun NFS-compatible filesystem
+option		NULLFS		# Null (formerly loop-back) filesystem
+option		CD9660		# ISO-9660 w/ RockRidge
+option		KERNFS		# kernel data-structure filesystem
+option		FDESC		# user file descriptor filesystem
+#option	UMAPFS		# uid/gid remapping filesystem
+#option	LFS		# Log-based filesystem (still experimental)
+#option	PORTAL		# portal filesystem (still experimental)
+option		PROCFS		# Process filesystem
+
+option		LKM		# loadable kernel modules
+
+option		SCSI
+#option	SCSIDEBUG
+
+# Networking option
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+option		IPFILTER
+#option	ISO		# OSI networking
+#option	TPIP
+#option	EON
+option		COMPAT_43
+option		NS
+option		MAPMEM
+option		SYSVSHM,SYSVSEM,SYSVMSG
+option		PPP_BSDCOMP,PPP_DEFLATE
+
+# Mac-specific option
+option		M68040
+option		M68030
+option		M68020		# Must have 68851 PMMU
+option		FPSP
+option		FPU_EMULATE
+option		COMPAT_NOMID
+option		COMPAT_SUNOS
+option		ZS_CONSOLE_ABORT
+option		DISABLE_EXT_CACHE # Don't use IIci external cache
+option		DISABLE_ADB_WITH_SERIAL_CONSOLE
+#option	MRG_ADB		  # Use ROM-based ADB driver
 
 config		bsd	swap generic
-options		GENERIC
+option		GENERIC
 
 sn*		at obio?	# Internal ethernet
 
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
index efb4afbccd8..c04ae5cf97f 100644
--- a/sys/arch/mac68k/conf/PUMA
+++ b/sys/arch/mac68k/conf/PUMA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PUMA,v 1.11 1997/01/01 04:04:48 briggs Exp $
+#	$OpenBSD: PUMA,v 1.12 1997/06/05 18:52:42 gene Exp $
 #	$NetBSD: PUMA,v 1.13 1996/08/05 01:52:15 scottr Exp $
 #
 # PUMA
@@ -7,48 +7,48 @@ include	"arch/mac68k/conf/std.mac68k"
 
 maxusers	16
 
-options         MAXFDESCS=2048
-
-# Standard system options
-options		SWAPPAGER, DEVPAGER	# paging
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		KTRACE
-options		DDB
-
-options		FFS
-options		MFS		# memory-based filesystem
-options		NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		NULLFS		# Null (formerly loop-back) filesystem
-options		UNION		# Union filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-options		PROCFS		# Process filesystem
-
-options		LKM		# Loadable Kernel Modules
-
-options		SCSI
-
-# Networking options
-options		INET
-#options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-options		COMPAT_43
-options		NS
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-
-# Mac-specific options
-options		M68030
-options		COMPAT_SUNOS
-options		COMPAT_NOMID
-options		COMPAT_09
-options		COMPAT_10
-options		COMPAT_11
-options		COMPAT_12
+option         MAXFDESCS=2048
+
+# Standard system option
+option		SWAPPAGER, DEVPAGER	# paging
+
+# Filesystem option
+option		FIFO		# POSIX fifo support (in all filesystems)
+option		KTRACE
+option		DDB
+
+option		FFS
+option		MFS		# memory-based filesystem
+option		NFSSERVER	# Sun NFS-compatible filesystem
+option		NFSCLIENT	# Sun NFS-compatible filesystem
+option		NULLFS		# Null (formerly loop-back) filesystem
+option		UNION		# Union filesystem
+option		CD9660		# ISO-9660 w/ RockRidge
+option		KERNFS		# kernel data-structure filesystem
+option		FDESC		# user file descriptor filesystem
+option		PROCFS		# Process filesystem
+
+option		LKM		# Loadable Kernel Modules
+
+option		SCSI
+
+# Networking option
+option		INET
+#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+option		COMPAT_43
+option		NS
+option		MAPMEM
+option		SYSVSHM,SYSVSEM,SYSVMSG
+
+# Mac-specific option
+option		M68030
+option		COMPAT_SUNOS
+option		COMPAT_NOMID
+option		COMPAT_09
+option		COMPAT_10
+option		COMPAT_11
+option		COMPAT_12
 
 config		bsd	root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b
 
@@ -76,7 +76,7 @@ pseudo-device	loop
 pseudo-device	ppp
 pseudo-device	sl
 
-# Puma-specific options
+# Puma-specific option
 
 # Try linked commands on all targets
-options		TRY_SCSI_LINKED_COMMANDS=0x7f
+option		TRY_SCSI_LINKED_COMMANDS=0x7f
diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT
index 86767c7baeb..995f529dfcf 100644
--- a/sys/arch/mac68k/conf/SPOT
+++ b/sys/arch/mac68k/conf/SPOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: SPOT,v 1.10 1997/01/24 01:35:25 briggs Exp $
+#	$OpenBSD: SPOT,v 1.11 1997/06/05 18:52:42 gene Exp $
 #	$NetBSD: SPOT,v 1.22 1997/01/20 00:31:42 scottr Exp $
 #
 # SPOT
@@ -7,50 +7,50 @@ include	"arch/mac68k/conf/std.mac68k"
 
 maxusers	16
 
-makeoptions	COPTS="-O2 -m68030"
-
-# Standard system options
-options		DIAGNOSTIC		# DEBUG for extra kernel debugging
-options		KTRACE			# system call tracing support
-#options	KGDB			# support for kernel gdb
-#options	GDB			# support for normal gdb
-#options	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
-options		UCONSOLE		# non-root can grab console
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		DDB
-options		FFS
-options		QUOTA		# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-options		NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-options		PROCFS		# Process filesystem
-
-options		SCSI
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-options		PPP_BSDCOMP
-options		PPP_DEFLATE
-options		COMPAT_42
-options		COMPAT_43
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-
-# Mac-specific options
-options		M68030
-
-# SPOT-specific options
-options		RTC_OFFSET=360	# hardware clock is this many mins. west of GMT
+makeoption	COPTS="-O2 -m68030"
+
+# Standard system option
+option		DIAGNOSTIC		# DEBUG for extra kernel debugging
+option		KTRACE			# system call tracing support
+#option	KGDB			# support for kernel gdb
+#option	GDB			# support for normal gdb
+#option	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
+option		UCONSOLE		# non-root can grab console
+
+# Filesystem option
+option		FIFO		# POSIX fifo support (in all filesystems)
+option		DDB
+option		FFS
+option		QUOTA		# fast filesystem with user and group quotas
+option		MFS		# memory-based filesystem
+option		NFSSERVER	# Sun NFS-compatible filesystem
+option		NFSCLIENT	# Sun NFS-compatible filesystem
+option		CD9660		# ISO-9660 w/ RockRidge
+option		KERNFS		# kernel data-structure filesystem
+option		FDESC		# user file descriptor filesystem
+option		PROCFS		# Process filesystem
+
+option		SCSI
+
+# Networking option
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+option		PPP_BSDCOMP
+option		PPP_DEFLATE
+option		COMPAT_42
+option		COMPAT_43
+option		MAPMEM
+option		SYSVSHM,SYSVSEM,SYSVMSG
+
+# Mac-specific option
+option		M68030
+
+# SPOT-specific option
+option		RTC_OFFSET=360	# hardware clock is this many mins. west of GMT
 
 config		bsd	swap generic
-options		GENERIC
+option		GENERIC
 
 nubus0		at mainbus?
 
diff --git a/sys/arch/mac68k/conf/TIGER b/sys/arch/mac68k/conf/TIGER
index 44e21cb63dc..7d82affe28b 100644
--- a/sys/arch/mac68k/conf/TIGER
+++ b/sys/arch/mac68k/conf/TIGER
@@ -1,4 +1,4 @@
-#	$OpenBSD: TIGER,v 1.7 1997/04/14 00:28:15 briggs Exp $
+#	$OpenBSD: TIGER,v 1.8 1997/06/05 18:52:43 gene Exp $
 #	$NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
 #
 # Allen's Q700
@@ -7,49 +7,49 @@ include	"arch/mac68k/conf/std.mac68k"
 
 maxusers	16
 
-makeoptions	COPTS="-O2 -m68040"
-
-# Standard system options
-options		DIAGNOSTIC		# DEBUG for extra kernel debugging
-options		KTRACE			# system call tracing support
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		DDB
-options		FFS
-options		QUOTA		# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-options		NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		NULLFS		# Null (formerly loop-back) filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-options		PROCFS		# Process filesystem
-
-options		LKM		# loadable kernel modules
-
-options		SCSI
-
-# Networking options
-options		INET
-options		GATEWAY		# IP packet forwarding
-options		IPFILTER
-options		COMPAT_43
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-options		PPP_BSDCOMP,PPP_DEFLATE
-
-# Mac-specific options
-options		HWDIRECT
-options		M68040
-options		FPSP
-options		COMPAT_NOMID
-options		COMPAT_SUNOS
-options		ZS_CONSOLE_ABORT
+makeoption	COPTS="-O2 -m68040"
+
+# Standard system option
+option		DIAGNOSTIC		# DEBUG for extra kernel debugging
+option		KTRACE			# system call tracing support
+
+# Filesystem option
+option		FIFO		# POSIX fifo support (in all filesystems)
+option		DDB
+option		FFS
+option		QUOTA		# fast filesystem with user and group quotas
+option		MFS		# memory-based filesystem
+option		NFSSERVER	# Sun NFS-compatible filesystem
+option		NFSCLIENT	# Sun NFS-compatible filesystem
+option		NULLFS		# Null (formerly loop-back) filesystem
+option		CD9660		# ISO-9660 w/ RockRidge
+option		KERNFS		# kernel data-structure filesystem
+option		FDESC		# user file descriptor filesystem
+option		PROCFS		# Process filesystem
+
+option		LKM		# loadable kernel modules
+
+option		SCSI
+
+# Networking option
+option		INET
+option		GATEWAY		# IP packet forwarding
+option		IPFILTER
+option		COMPAT_43
+option		MAPMEM
+option		SYSVSHM,SYSVSEM,SYSVMSG
+option		PPP_BSDCOMP,PPP_DEFLATE
+
+# Mac-specific option
+option		HWDIRECT
+option		M68040
+option		FPSP
+option		COMPAT_NOMID
+option		COMPAT_SUNOS
+option		ZS_CONSOLE_ABORT
 
 config		bsd	swap generic
-options		GENERIC
+option		GENERIC
 
 sn*		at obio?	# SONIC ethernet (68040)