s/options/option/

5 files changed, 140 insertions, 141 deletions

diff --git a/sys/arch/sun3/conf/COYOTE b/sys/arch/sun3/conf/COYOTE
index 882b8b62ded..5e0053ef825 100644
--- a/sys/arch/sun3/conf/COYOTE
+++ b/sys/arch/sun3/conf/COYOTE
@@ -1,5 +1,5 @@
 #
-# $OpenBSD: COYOTE,v 1.6 1997/05/04 01:17:11 kstailey Exp $
+# $OpenBSD: COYOTE,v 1.7 1997/06/09 12:14:41 kstailey Exp $
 #
 
 #
@@ -10,55 +10,55 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-#options 	FPU_EMULATE
-#options 	HAVECACHE		# Sun3/260 VAC
+#option 	FPU_EMULATE
+#option 	HAVECACHE		# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-options 	KTRACE				# system call tracing support
+option	 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
-options 	DDB
+option	 	DDB
 # ... or these two: (for KGDB on another machine)
 #makeoptions DEBUG="-g"			# symbols for kgdb + nm
-#options 	KGDB
+#option 	KGDB
 
 # Filesystem options
-options 	NFSCLIENT			# nfs client support
+option	 	NFSCLIENT			# nfs client support
 #
-options		FFS		# fast filesystem
-options		MFS		# memory-based filesystem
-#options 	FDESC		# /dev/fd/* (depreciated)
-options 	FIFO		# FIFOs; RECOMMENDED
-options 	KERNFS		# /kern
-#options 	NULLFS		# loopback file system
-options 	PROCFS		# /proc
-#options 	UNION		# union file system (merged directories)
-#options 	PORTAL		# union file system (run programs via open(2))
+option		FFS		# fast filesystem
+option		MFS		# memory-based filesystem
+#option 	FDESC		# /dev/fd/* (depreciated)
+option	 	FIFO		# FIFOs; RECOMMENDED
+option	 	KERNFS		# /kern
+#option 	NULLFS		# loopback file system
+option	 	PROCFS		# /proc
+#option 	UNION		# union file system (merged directories)
+#option 	PORTAL		# union file system (run programs via open(2))
 
 # Networking options
-options 	INET		# IP prototol stack support
-options		GATEWAY		# IP packet forwarding
-options		IPFILTER	# IP packet filter for security and NAT
+option	 	INET		# IP prototol stack support
+option		GATEWAY		# IP packet forwarding
+option		IPFILTER	# IP packet filter for security and NAT
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-#options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-#options 	COMPAT_09	# NetBSD 0.9,
-options 	COMPAT_10	# NetBSD 1.0,
-options 	COMPAT_11	# NetBSD 1.1,
-options 	COMPAT_43	# and 4.3BSD
-#options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+#option 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+#option 	COMPAT_09	# NetBSD 0.9,
+option	 	COMPAT_10	# NetBSD 1.0,
+option	 	COMPAT_11	# NetBSD 1.1,
+option	 	COMPAT_43	# and 4.3BSD
+#option 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 # Sun3-specific debugging options
-#options 	PMAP_DEBUG
-#options 	VMFAULT_TRACE
-#options 	SYSCALL_DEBUG
-#options 	EXEC_DEBUG
-options 	DIAGNOSTIC
+#option 	PMAP_DEBUG
+#option 	VMFAULT_TRACE
+#option 	SYSCALL_DEBUG
+#option 	EXEC_DEBUG
+option	 	DIAGNOSTIC
 
 #config		bsd root on nfs swap on nfs
 config		bsd root on sd0 swap on sd0 dumps on sd0
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index b14aac34c35..a2a7a9fe7f4 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -9,50 +9,50 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-options 	FPU_EMULATE
-options 	HAVECACHE		# Sun3/260 VAC
+option	 	FPU_EMULATE
+option	 	HAVECACHE		# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-options 	KTRACE				# system call tracing support
+option	 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
-#options 	DDB
+#option 	DDB
 # ... or these two: (for KGDB on another machine)
 makeoptions DEBUG="-g"			# symbols for kgdb + nm
-options 	KGDB
+option	 	KGDB
 
 # Filesystem options
-options 	NFSCLIENT	# nfs client support
+option	 	NFSCLIENT	# nfs client support
 #
-options 	FDESC		# /dev/fd/*
-options 	FIFO		# FIFOs; RECOMMENDED
-options 	KERNFS		# /kern
-options 	NULLFS		# loopback file system
-options 	PROCFS		# /proc
+option	 	FDESC		# /dev/fd/*
+option	 	FIFO		# FIFOs; RECOMMENDED
+option	 	KERNFS		# /kern
+option	 	NULLFS		# loopback file system
+option	 	PROCFS		# /proc
 
 # Networking options
-options 	INET		# IP prototol stack support
-#options	GATEWAY		# IP packet forwarding
-options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option	 	INET		# IP prototol stack support
+#option		GATEWAY		# IP packet forwarding
+option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-options 	COMPAT_43	# and 4.3BSD and ...
-options 	COMPAT_10	# NetBSD 1.0
-options 	COMPAT_11	# NetBSD 1.1
-options 	COMPAT_12	# NetBSD 1.2
+option	 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+option	 	COMPAT_43	# and 4.3BSD and ...
+option	 	COMPAT_10	# NetBSD 1.0
+option	 	COMPAT_11	# NetBSD 1.1
+option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-#options 	PMAP_DEBUG
-#options 	VMFAULT_TRACE
-#options 	SYSCALL_DEBUG
-#options 	EXEC_DEBUG
-#options 	DIAGNOSTIC
+#option 	PMAP_DEBUG
+#option 	VMFAULT_TRACE
+#option 	SYSCALL_DEBUG
+#option 	EXEC_DEBUG
+#option 	DIAGNOSTIC
 
 config		bsd root on nfs swap on nfs
 
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 0e3a2e041e0..ef1c1b84be1 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -8,58 +8,58 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-options 	GENERIC
-options 	FPU_EMULATE
-options 	HAVECACHE		# Sun3/260 VAC
+option	 	GENERIC
+option	 	FPU_EMULATE
+option	 	HAVECACHE		# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-options 	KTRACE				# system call tracing support
+option	 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
-options 	DDB
+option	 	DDB
 # ... or these two: (for KGDB on another machine)
 #makeoptions DEBUG="-g"			# symbols for kgdb + nm
-#options 	KGDB
+#option 	KGDB
 
 # Filesystem options
-options 	NFSSERVER	# nfs server support
-options 	NFSCLIENT	# nfs client support
-options 	FFS		# ufs file system
+option	 	NFSSERVER	# nfs server support
+option	 	NFSCLIENT	# nfs client support
+option	 	FFS		# ufs file system
 #
-options 	CD9660		# ISO 9660 + Rock Ridge file system
-options 	FDESC		# /dev/fd/*
-options 	FIFO		# FIFOs; RECOMMENDED
-options 	KERNFS		# /kern
-options 	NULLFS		# loopback file system
-options 	PROCFS		# /proc
-options 	UNION		# union file system
-options 	MFS		# memory-based filesystem
+option	 	CD9660		# ISO 9660 + Rock Ridge file system
+option	 	FDESC		# /dev/fd/*
+option	 	FIFO		# FIFOs; RECOMMENDED
+option	 	KERNFS		# /kern
+option	 	NULLFS		# loopback file system
+option	 	PROCFS		# /proc
+option	 	UNION		# union file system
+option	 	MFS		# memory-based filesystem
 
 # Networking options
-options 	INET		# IP prototol stack support
-options		IPFILTER	# IP packet filter for security
-#options	GATEWAY		# IP packet forwarding
-options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option	 	INET		# IP prototol stack support
+option		IPFILTER	# IP packet filter for security
+#option		GATEWAY		# IP packet forwarding
+option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-options 	COMPAT_43	# and 4.3BSD and ...
-options 	COMPAT_10	# NetBSD 1.0
-options 	COMPAT_11	# NetBSD 1.1
-options 	COMPAT_12	# NetBSD 1.2
+option	 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+option	 	COMPAT_43	# and 4.3BSD and ...
+option	 	COMPAT_10	# NetBSD 1.0
+option	 	COMPAT_11	# NetBSD 1.1
+option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-options 	PMAP_DEBUG
-#options 	VMFAULT_TRACE
-#options 	SYSCALL_DEBUG
-#options 	EXEC_DEBUG
-options 	DIAGNOSTIC
-#options 	SCSIDEBUG
+option	 	PMAP_DEBUG
+#option 	VMFAULT_TRACE
+#option 	SYSCALL_DEBUG
+#option 	EXEC_DEBUG
+option	 	DIAGNOSTIC
+#option 	SCSIDEBUG
 
 config		bsd swap generic
 
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index 957b4ee7545..6d6c458ae30 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -11,44 +11,44 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-options 	FPU_EMULATE		# XXX - Should not be needed!
-options 	HAVECACHE		# Sun3/260 VAC
+option	 	FPU_EMULATE		# XXX - Should not be needed!
+option	 	HAVECACHE		# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	2
 
 # Debugging options.  Uncomment either this:
-#options 	DDB
+#option 	DDB
 # ... or these two: (for KGDB on another machine)
-makeoptions DEBUG="-g"			# symbols for kgdb + nm
-options 	KGDB
+#makeoptions DEBUG="-g"			# symbols for kgdb + nm
+#option	 	KGDB
 
 # Enable the hooks used for initializing the ram-disk.
-options 	RAMDISK_HOOKS
-options 	MINIROOTSIZE=512	# 256K
+option	 	RAMDISK_HOOKS
+option	 	MINIROOTSIZE=512	# 256K
 
 # Filesystem options
 # May need NFSCLIENT to get miniroot image
-options 	NFSCLIENT	# nfs client support
+option	 	NFSCLIENT	# nfs client support
 # Need FFS for the ramdisk image
-options 	FFS		# ufs file system
-options 	FIFO		# FIFOs; RECOMMENDED
+option	 	FFS		# ufs file system
+option	 	FIFO		# FIFOs; RECOMMENDED
 
 # Networking options
-options 	INET		# IP prototol stack support
-options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option	 	INET		# IP prototol stack support
+option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-#options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-#options 	COMPAT_43	# and 4.3BSD and ...
-#options 	COMPAT_10	# NetBSD 1.0
-options 	COMPAT_11	# NetBSD 1.1
-options 	COMPAT_12	# NetBSD 1.2
+#option 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+#option 	COMPAT_43	# and 4.3BSD and ...
+#option 	COMPAT_10	# NetBSD 1.0
+option	 	COMPAT_11	# NetBSD 1.1
+option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-options 	DIAGNOSTIC
+option	 	DIAGNOSTIC
 
 # The config program assumes all devices have partions...
 # Is it OK to put swap on a non-existent partition?
@@ -127,4 +127,3 @@ pseudo-device	rd	2		# RAM-disk
 pseudo-device	loop	1		# network loopback
 pseudo-device	sl	2		# CSLIP
 pseudo-device	ppp	2		# PPP
-
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index eee72632f5d..8e9cf30f0b9 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -8,57 +8,57 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-options 	GENERIC
-options 	FPU_EMULATE
-options 	HAVECACHE		# Sun3/260 VAC
+option	 	GENERIC
+option	 	FPU_EMULATE
+option	 	HAVECACHE		# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-options 	KTRACE				# system call tracing support
+option	 	KTRACE				# system call tracing support
 
 # Debugging options.  Uncomment either this:
-options 	DDB
+option	 	DDB
 # ... or these two: (for KGDB on another machine)
 #makeoptions DEBUG="-g"			# symbols for kgdb + nm
-#options 	KGDB
+#option 	KGDB
 
 # Filesystem options
-options 	NFSSERVER	# nfs server support
-options 	NFSCLIENT	# nfs client support
-options 	FFS		# ufs file system
+option	 	NFSSERVER	# nfs server support
+option	 	NFSCLIENT	# nfs client support
+option	 	FFS		# ufs file system
 #
-options 	CD9660		# ISO 9660 + Rock Ridge file system
-options 	FDESC		# /dev/fd/*
-options 	FIFO		# FIFOs; RECOMMENDED
-options 	KERNFS		# /kern
-options 	NULLFS		# loopback file system
-options 	PROCFS		# /proc
-options 	UNION		# union file system
-options 	MFS		# memory-based filesystem
+option	 	CD9660		# ISO 9660 + Rock Ridge file system
+option	 	FDESC		# /dev/fd/*
+option	 	FIFO		# FIFOs; RECOMMENDED
+option	 	KERNFS		# /kern
+option	 	NULLFS		# loopback file system
+option	 	PROCFS		# /proc
+option	 	UNION		# union file system
+option	 	MFS		# memory-based filesystem
 
 # Networking options
-options 	INET		# IP prototol stack support
-#options	GATEWAY		# IP packet forwarding
-options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option	 	INET		# IP prototol stack support
+#option		GATEWAY		# IP packet forwarding
+option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-options 	COMPAT_43	# and 4.3BSD and ...
-options 	COMPAT_10	# NetBSD 1.0
-options 	COMPAT_11	# NetBSD 1.1
-options 	COMPAT_12	# NetBSD 1.2
+option	 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+option	 	COMPAT_43	# and 4.3BSD and ...
+option	 	COMPAT_10	# NetBSD 1.0
+option	 	COMPAT_11	# NetBSD 1.1
+option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-#options 	PMAP_DEBUG
-#options 	VMFAULT_TRACE
-#options 	SYSCALL_DEBUG
-#options 	EXEC_DEBUG
-options 	DIAGNOSTIC
-#options 	SCSIDEBUG
+#option 	PMAP_DEBUG
+#option 	VMFAULT_TRACE
+#option 	SYSCALL_DEBUG
+#option 	EXEC_DEBUG
+option	 	DIAGNOSTIC
+#option 	SCSIDEBUG
 
 config		bsd swap generic