option not options

13 files changed, 685 insertions, 685 deletions

diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index f4be44346d4..654ed2ce43e 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALL,v 1.4 1996/06/24 17:07:29 deraadt Exp $
+#	$OpenBSD: ALL,v 1.5 1996/06/29 19:17:15 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	ALL -- everything that's currently supported
@@ -6,80 +6,80 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
-options		VM86		# Virtual 8086 emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
+option		VM86		# Virtual 8086 emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=...	# size of extended memory
+#option		EXTMEM_SIZE=...	# size of extended memory
 
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
+#option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
+option		INSECURE	# insecure; allow /dev/mem writing for X
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DDB		# in-kernel debugger
+option		DDB		# in-kernel debugger
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-options		SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-options		GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-options		ISO,TPIP	# OSI
-options		EON		# OSI tunneling over IP
-options		CCITT,LLC,HDLC	# X.25
-options		IPFILTER	# IP packet filter for security
+option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# create sockets with open(2)
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		NS		# XNS
+option		ISO,TPIP	# OSI
+option		EON		# OSI tunneling over IP
+option		CCITT,LLC,HDLC	# X.25
+option		IPFILTER	# IP packet filter for security
 
 config		bsd	swap generic
 
diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index 84e4cb44d3c..f148b6fd780 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,81 +1,81 @@
-#	$OpenBSD: BABY,v 1.3 1996/06/16 11:11:05 deraadt Exp $
+#	$OpenBSD: BABY,v 1.4 1996/06/29 19:17:17 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
-#options	VM86		# Virtual 8086 emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
+#option		VM86		# Virtual 8086 emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
+#option		EXTMEM_SIZE=... # size of extended memory
 
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
+#option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
+option		INSECURE	# insecure; allow /dev/mem writing for X
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DDB		# in-kernel debugger
+option		DDB		# in-kernel debugger
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-options		ISO,TPIP	# OSI
-options		EON		# OSI tunneling over IP
-options		CCITT,LLC,HDLC	# X.25
-options		IPFILTER	# IP packet filter for security
+option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# create sockets with open(2)
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		NS		# XNS
+option		ISO,TPIP	# OSI
+option		EON		# OSI tunneling over IP
+option		CCITT,LLC,HDLC	# X.25
+option		IPFILTER	# IP packet filter for security
 
 config		bsd	root on sd0 swap on sd0 and sd1 and sd2
 
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 6885ba6c5f4..6f7f591d732 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.10 1996/06/24 17:07:30 deraadt Exp $
+#	$OpenBSD: DISKLESS,v 1.11 1996/06/29 19:17:18 deraadt Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -8,73 +8,73 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
+#option		EXTMEM_SIZE=... # size of extended memory
 
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
+#option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-options		DDB		# in-kernel debugger
-options		DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-#options	COMPAT_IBCS2	# binary compatibility with SCO and ISC
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-#options	FFS,QUOTA	# UFS and quotas
-#options	LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-#options	NFSSERVER	# Network File System server
-
-#options	CD9660		# ISO 9660 + Rock Ridge file system
-#options	MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-options		ISO,TPIP	# OSI
-options		EON		# OSI tunneling over IP
-options		CCITT,LLC,HDLC	# X.25
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
+
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
+
+option		DDB		# in-kernel debugger
+option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+#option		FFS,QUOTA	# UFS and quotas
+#option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+#option		NFSSERVER	# Network File System server
+
+#option		CD9660		# ISO 9660 + Rock Ridge file system
+#option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# create sockets with open(2)
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		NS		# XNS
+option		ISO,TPIP	# OSI
+option		EON		# OSI tunneling over IP
+option		CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on nfs swap on nfs
 
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index 496f6f74f86..35dd67abec4 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,84 +1,84 @@
 #
 #	GANDALF -- Dual Tyan P5/133 PCI/EISA bus
 #
-#	$OpenBSD: GANDALF,v 1.6 1996/06/23 21:17:49 tholo Exp $
+#	$OpenBSD: GANDALF,v 1.7 1996/06/29 19:17:19 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-#options	I386_CPU	# CPU classes; at least one is REQUIRED
-#options	I486_CPU
-options		I586_CPU
-#options	MATH_EMULATE	# floating point emulation
+#option		I386_CPU	# CPU classes; at least one is REQUIRED
+#option		I486_CPU
+option		I586_CPU
+#option		MATH_EMULATE	# floating point emulation
 
-options		PCIVERBOSE	# verbose PCI device information
-options		EISAVERBOSE	# verbose EISA device information
+option		PCIVERBOSE	# verbose PCI device information
+option		EISAVERBOSE	# verbose EISA device information
 
-options		DUMMY_NOPS	# speed hack; recommanded
-options		XSERVER,UCONSOLE
-#options	INSECURE	# insecure; allow /dev/mem writing for X
+option		DUMMY_NOPS	# speed hack; recommanded
+option		XSERVER,UCONSOLE
+#option		INSECURE	# insecure; allow /dev/mem writing for X
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=480	# time zone to adjust RTC time by
-options		DST=1		# daylight savings time used by RTC
-options		NTP		# High precision timekeeping support
+option		TIMEZONE=480	# time zone to adjust RTC time by
+option		DST=1		# daylight savings time used by RTC
+option		NTP		# High precision timekeeping support
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-#options	DDB		# in-kernel debugger
+#option		DDB		# in-kernel debugger
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-#options	COMPAT_SVR4	# binary compatibility with SVR4
-#options	COMPAT_IBCS2	# binary compatibility with SCO and ISC
-#options	COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-#options	USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-#options	QUOTA		# UFS quotas
-#options	LFS		# log-structured file system
-options		MFS		# memory file system
-
-#options	NFSCLIENT	# Network File System client
-#options	NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-#options	PORTAL		# ?
-options		PROCFS		# /proc
-#options	UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-#options	IMP		# missing files
-#options	NS		# XNS
-#options	ISO,TPIP	# OSI
-#options	EON		# OSI tunneling over IP
-#options	CCITT,LLC,HDLC	# X.25
-options		"NMBCLUSTERS=1024"
+option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+#option		COMPAT_SVR4	# binary compatibility with SVR4
+#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+
+#option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+#option		QUOTA		# UFS quotas
+#option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+#option		NFSCLIENT	# Network File System client
+#option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+#option		PORTAL		# ?
+option		PROCFS		# /proc
+#option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+#option		IMP		# missing files
+#option		NS		# XNS
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
+option		"NMBCLUSTERS=1024"
 
 config		bsd	root on sd0a swap on sd0b and sd1b dumps on sd0b
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a396f2eb826..58cc99f23dc 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.24 1996/06/24 17:07:32 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.25 1996/06/29 19:17:21 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -8,27 +8,27 @@ machine		i386		# architecture, used by config; REQUIRED
 
 include "../../../conf/GENERIC"
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
-options		VM86		# Virtual 8086 emulation
-options		USER_LDT	# user-settable LDT; used by WINE
-options		XSERVER,UCONSOLE
+option		VM86		# Virtual 8086 emulation
+option		USER_LDT	# user-settable LDT; used by WINE
+option		XSERVER,UCONSOLE
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=...	# size of extended memory
-#options	DUMMY_NOPS	# speed hack; recommended
+#option		EXTMEM_SIZE=...	# size of extended memory
+#option		DUMMY_NOPS	# speed hack; recommended
 
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
 
-options		BOOT_CONFIG	# add support for boot -c
+option		BOOT_CONFIG	# add support for boot -c
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index acd4c2ff5ad..a08c4b19e7c 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,52 +1,52 @@
-#	$OpenBSD: HELIOS_PCMCIA,v 1.7 1996/06/16 11:11:08 deraadt Exp $
+#	$OpenBSD: HELIOS_PCMCIA,v 1.8 1996/06/29 19:17:22 deraadt Exp $
 #
 #	HELIOS_PCMCIA -- Eric Hvozda's notebook
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I486_CPU
+option		I486_CPU
 
-options		DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
+option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
 
 maxusers	64		# estimated number of users
-options		TIMEZONE=300	# time zone to adjust RTC time by
-options		DST=1		# daylight savings time used by RTC
+option		TIMEZONE=300	# time zone to adjust RTC time by
+option		DST=1		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
+option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
 
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_11	# NetBSD 1.1,
-options		COMPAT_43	# and 4.3BSD
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+option		COMPAT_09	# NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_11	# NetBSD 1.1,
+option		COMPAT_43	# and 4.3BSD
 
-options		LKM		# loadable kernel modules
+option		LKM		# loadable kernel modules
 
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		MFS		# memory file system
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+option		MFS		# memory file system
 
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
 
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		PROCFS		# /proc
-options		UNION		# union file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		PROCFS		# /proc
+option		UNION		# union file system
 
-options		FDSCRIPTS	# secure setuid scripts
-#options	SETUIDSCRIPTS	# secure setuid scripts
+option		FDSCRIPTS	# secure setuid scripts
+#option		SETUIDSCRIPTS	# secure setuid scripts
 
-options		INET		# IP + ICMP + TCP + UDP
+option		INET		# IP + ICMP + TCP + UDP
 
 config		bsd	root on wd0a swap on wd0b dumps on wd0b
 
diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index e65c7f9ec5a..d17a2d6e2f8 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-#	$OpenBSD: INST,v 1.7 1996/06/29 06:16:52 downsj Exp $
+#	$OpenBSD: INST,v 1.8 1996/06/29 19:17:23 deraadt Exp $
 #	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #       Install kernels no longer support X.
@@ -6,44 +6,44 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
+#option		EXTMEM_SIZE=... # size of extended memory
 
-#options	DUMMY_NOPS	# speed hack; recommended
+#option		DUMMY_NOPS	# speed hack; recommended
 
 maxusers	8		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
 #makeoptions	DEBUG="-g"	# compile full symbol table
 
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_11	# NetBSD 1.1,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_11	# NetBSD 1.1,
 
-options		LKM		# loadable kernel modules
+option		LKM		# loadable kernel modules
 
-options		FFS		# UFS
+option		FFS		# UFS
 
-options		NFSCLIENT	# Network File System client
+option		NFSCLIENT	# Network File System client
 
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
 
-options		INET		# IP + ICMP + TCP + UDP
+option		INET		# IP + ICMP + TCP + UDP
 
 config		bsd	swap generic
 
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index dc3aeb006e7..9db5c524931 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.7 1996/06/24 17:07:33 deraadt Exp $
+#	$OpenBSD: LAP,v 1.8 1996/06/29 19:17:25 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -6,73 +6,73 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-#options	MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+#option		MATH_EMULATE	# floating point emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
+#option		EXTMEM_SIZE=... # size of extended memory
 
-options		DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
+option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
 
 maxusers	10		# estimated number of users
-#options	TIMEZONE=0	# time zone to adjust RTC time by
-#options	DST=0		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-options		DDB		# in-kernel debugger
-#options	DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS,QUOTA	# UFS and quotas
-#options	LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-#options	NFSSERVER	# Network File System server
-
-#options	CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-#options	FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-#options	NULLFS		# loopback file system
-#options	PORTAL		# create sockets with open(2)
-#options	PROCFS		# /proc
-#options	UMAPFS		# NULLFS + uid and gid remapping
-#options	UNION		# union file system
-
-options		GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-#options	NS		# XNS
-#options	ISO,TPIP	# OSI
-#options	EON		# OSI tunneling over IP
-#options	CCITT,LLC,HDLC	# X.25
+#option		TIMEZONE=0	# time zone to adjust RTC time by
+#option		DST=0		# daylight savings time used by RTC
+
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
+
+option		DDB		# in-kernel debugger
+#option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS,QUOTA	# UFS and quotas
+#option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+#option		NFSSERVER	# Network File System server
+
+#option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+#option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+#option		NULLFS		# loopback file system
+#option		PORTAL		# create sockets with open(2)
+#option		PROCFS		# /proc
+#option		UMAPFS		# NULLFS + uid and gid remapping
+#option		UNION		# union file system
+
+option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+#option		NS		# XNS
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on wd0 swap on wd0
 
@@ -162,10 +162,10 @@ wd*	at wdc? drive ?
 #sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 #spkr0	at pckbd? port 0x61
 
-options		APM_NOIDLE
-#options	PCIVERBOSE
-#options	PCMCIA_DEBUG
-#options	PCMCIA_ISA_DEBUG
+option		APM_NOIDLE
+#option		PCIVERBOSE
+#option		PCMCIA_DEBUG
+#option		PCMCIA_ISA_DEBUG
 
 #apm0	at mainbus?
 pcmcia* at pcic?
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index fe6d4de71c8..1b7da20b996 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,79 +1,79 @@
-#	$OpenBSD: NETTAN,v 1.7 1996/06/24 17:07:35 deraadt Exp $
+#	$OpenBSD: NETTAN,v 1.8 1996/06/29 19:17:26 deraadt Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
-#options	DUMMY_NOPS	# speed hack; recommanded
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
+#option		DUMMY_NOPS	# speed hack; recommanded
+option		XSERVER,UCONSOLE
+option		INSECURE	# insecure; allow /dev/mem writing for X
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DDB		# in-kernel debugger
+option		DDB		# in-kernel debugger
 makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		ELF_MAP_PAGE_ZERO
+option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+option		COMPAT_09	# NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_43	# and 4.3BSD
+option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		ELF_MAP_PAGE_ZERO
 				# Dell SVR4 mapped page zero read-only, if you
 				# have SW doing NULL derefs, add this option
-options		COMPAT_SVR4_NCR # 		"		 (NCR variant)
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-#options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-options		NS		# XNS
-#options		ISO,TPIP	# OSI
-#options		EON		# OSI tunneling over IP
-#options		CCITT,LLC,HDLC	# X.25
+option		COMPAT_SVR4_NCR # 		"		 (NCR variant)
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+#option			LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# create sockets with open(2)
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		NS		# XNS
+#option			ISO,TPIP	# OSI
+#option			EON		# OSI tunneling over IP
+#option			CCITT,LLC,HDLC	# X.25
 
 config		bsd	swap generic
 
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index c07a2e8d15d..5b0a55ad9cd 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -5,68 +5,68 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
-#options	DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
-options		INSECURE	# insecure; allow /dev/mem writing for X
+#option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
+option		INSECURE	# insecure; allow /dev/mem writing for X
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=0	# time zone to adjust RTC time by
-options		DST=0		# daylight savings time used by RTC
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DDB		# in-kernel debugger
+option		DDB		# in-kernel debugger
 makeoptions	DEBUG="-g"	# compile full symbol table
-options		DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
-options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
-
-options		FFS		# UFS
-options		QUOTA		# UFS quotas
-options		LFS		# log-structured file system
-options		MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-options		PORTAL		# create sockets with open(2)
-options		PROCFS		# /proc
-options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
+option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+option		COMPAT_09	# NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_43	# and 4.3BSD
+option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# create sockets with open(2)
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
 
 config		bsd	swap generic
 
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
index c139634e404..e7baae539a5 100644
--- a/sys/arch/i386/conf/PCMCIA
+++ b/sys/arch/i386/conf/PCMCIA
@@ -1,80 +1,80 @@
-#	$OpenBSD: PCMCIA,v 1.4 1996/06/24 17:07:37 deraadt Exp $
+#	$OpenBSD: PCMCIA,v 1.5 1996/06/29 19:17:29 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I586_CPU
-options		I486_CPU
-options		I386_CPU
-options		INSECURE
-options		MATH_EMULATE
+option		I586_CPU
+option		I486_CPU
+option		I386_CPU
+option		INSECURE
+option		MATH_EMULATE
 
-options		DUMMY_NOPS	# speed hack; recommanded
-options		XSERVER,UCONSOLE
+option		DUMMY_NOPS	# speed hack; recommanded
+option		XSERVER,UCONSOLE
 
 maxusers	32		# estimated number of users
-options		TIMEZONE=300	# time zone to adjust RTC time by
-options		DST=1		# daylight savings time used by RTC
+option		TIMEZONE=300	# time zone to adjust RTC time by
+option		DST=1		# daylight savings time used by RTC
 
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
 
-options		DDB		# in-kernel debugger
+option		DDB		# in-kernel debugger
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options	DIAGNOSTIC	# internally consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
+#option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
 
-options		SYSVMSG		# System V-like message queues
-options		SYSVSEM		# System V-like semaphores
-options		SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
 
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-options		COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+option		COMPAT_09	# NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_43	# and 4.3BSD
+option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
-options		COMPAT_SVR4	# binary compatibility with SVR4
-options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-options		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_SVR4	# binary compatibility with SVR4
+option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+option		COMPAT_LINUX	# binary compatibility with Linux
 
-options		USER_LDT	# user-settable LDT; used by WINE
-options		LKM		# loadable kernel modules
+option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
 
-options		FFS #,QUOTA	# UFS and quotas
-#options	LFS		# log-structured file system
-options		MFS		# memory file system
+option		FFS #,QUOTA	# UFS and quotas
+#option		LFS		# log-structured file system
+option		MFS		# memory file system
 
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-options		HAS_VOPLEASE	# XXX
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+option		HAS_VOPLEASE	# XXX
 
-options		APM_NOIDLE
-#options		PCIVERBOSE
-#options		PCMCIA_DEBUG
-#options		PCMCIA_ISA_DEBUG
+option		APM_NOIDLE
+#option			PCIVERBOSE
+#option			PCMCIA_DEBUG
+#option			PCMCIA_ISA_DEBUG
 
 ### SCSI:
-#options		CD9660		# ISO 9660 + Rock Ridge file system
+#option			CD9660		# ISO 9660 + Rock Ridge file system
 ###
-options		MSDOSFS		# MS-DOS file system
-options		FIFO		# FIFOs; RECOMMENDED
-options		PROCFS		# /proc
+option		MSDOSFS		# MS-DOS file system
+option		FIFO		# FIFOs; RECOMMENDED
+option		PROCFS		# /proc
 
-#options	GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-#options	NS		# XNS
-#options	ISO,TPIP	# OSI
-#options	EON		# OSI tunneling over IP
-#options	CCITT,LLC,HDLC	# X.25
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+#option		NS		# XNS
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
 
 config		bsd	swap generic
 
 # Local Athena options
 
-options		PCVT_CTRL_ALT_DEL	# For screwed-over Linux weenies
+option		PCVT_CTRL_ALT_DEL	# For screwed-over Linux weenies
 
 mainbus0 at root
 isa0	at mainbus0
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index a878f6888e7..64bdc51bf4f 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,4 +1,4 @@
-#	$OpenBSD: TDR,v 1.13 1996/06/24 17:07:38 deraadt Exp $
+#	$OpenBSD: TDR,v 1.14 1996/06/29 19:17:30 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -6,73 +6,73 @@
 
 machine		i386		# architecture, used by config; REQUIRED
 
-options		I386_CPU	# CPU classes; at least one is REQUIRED
-options		I486_CPU
-options		I586_CPU
-options		MATH_EMULATE	# floating point emulation
+option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+option		I586_CPU
+option		MATH_EMULATE	# floating point emulation
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
 # properly for your system.
-#options	EXTMEM_SIZE=... # size of extended memory
+#option		EXTMEM_SIZE=... # size of extended memory
 
-options		DUMMY_NOPS	# speed hack; recommended
-options		XSERVER,UCONSOLE
+option		DUMMY_NOPS	# speed hack; recommended
+option		XSERVER,UCONSOLE
 
 maxusers	10		# estimated number of users
-options		TIMEZONE=420	# time zone to adjust RTC time by
-options		DST=1		# daylight savings time used by RTC
-
-options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
-options		DEVPAGER	# mmap() of devices
-
-options		DDB		# in-kernel debugger
-#options	DIAGNOSTIC	# internal consistency checks
-options		KTRACE		# system call tracing, a la ktrace(1)
-
-#options	SYSVMSG		# System V-like message queues
-#options	SYSVSEM		# System V-like semaphores
-#options	SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-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
-
-options		COMPAT_SVR4	# binary compatibility with SVR4
-#options	COMPAT_IBCS2	# binary compatibility with SCO and ISC
-
-#options	USER_LDT	# user-settable LDT; used by WINE
-#options	LKM		# loadable kernel modules
-
-options		FFS,QUOTA	# UFS and quotas
-#options	LFS		# log-structured file system
-#options	MFS		# memory file system
-
-options		NFSCLIENT	# Network File System client
-options		NFSSERVER	# Network File System server
-
-options		CD9660		# ISO 9660 + Rock Ridge file system
-options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-#options	NULLFS		# loopback file system
-#options	PORTAL		# create sockets with open(2)
-#options	PROCFS		# /proc
-#options	UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-
-options		GATEWAY		# packet forwarding
-options		INET		# IP + ICMP + TCP + UDP
-#options	NS		# XNS
-#options	ISO,TPIP	# OSI
-#options	EON		# OSI tunneling over IP
-#options	CCITT,LLC,HDLC	# X.25
+option		TIMEZONE=420	# time zone to adjust RTC time by
+option		DST=1		# daylight savings time used by RTC
+
+option		SWAPPAGER	# paging; REQUIRED
+option		VNODEPAGER	# mmap() of files
+option		DEVPAGER	# mmap() of devices
+
+option		DDB		# in-kernel debugger
+#option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+#option		SYSVMSG		# System V-like message queues
+#option		SYSVSEM		# System V-like semaphores
+#option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+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
+
+option		COMPAT_SVR4	# binary compatibility with SVR4
+#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+
+#option		USER_LDT	# user-settable LDT; used by WINE
+#option		LKM		# loadable kernel modules
+
+option		FFS,QUOTA	# UFS and quotas
+#option		LFS		# log-structured file system
+#option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+#option		NULLFS		# loopback file system
+#option		PORTAL		# create sockets with open(2)
+#option		PROCFS		# /proc
+#option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+#option		NS		# XNS
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
 
 config		bsd	root on sd0 swap on sd0 and sd1 and wd0
 
@@ -90,7 +90,7 @@ isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
-#options PCVT_NOFASTSCROLL
+#option	 PCVT_NOFASTSCROLL
 
 com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
@@ -168,10 +168,10 @@ ep2	at isa? port ? irq ?
 #sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 #spkr0	at pckbd? port 0x61
 
-#options	APM_NOIDLE
-#options	PCIVERBOSE
-#options	PCMCIA_DEBUG
-#options	PCMCIA_ISA_DEBUG
+#option		APM_NOIDLE
+#option		PCIVERBOSE
+#option		PCMCIA_DEBUG
+#option		PCMCIA_ISA_DEBUG
 
 #apm0	at mainbus?
 #pcmcia* at pcic?
diff --git a/sys/arch/i386/conf/THREADWAY b/sys/arch/i386/conf/THREADWAY
index 81ff8d23139..b3c00d04592 100644
--- a/sys/arch/i386/conf/THREADWAY
+++ b/sys/arch/i386/conf/THREADWAY
@@ -1,73 +1,73 @@
 #
 #	THREADWAY: threadway.teeny.org
 #
-#	$OpenBSD: THREADWAY,v 1.1 1996/06/24 10:23:16 downsj Exp $
+#	$OpenBSD: THREADWAY,v 1.2 1996/06/29 19:17:31 deraadt Exp $
 #
 
 machine		i386
-options		I586_CPU
+option		I586_CPU
 
-options		XSERVER,UCONSOLE
-options		EXTMEM_SIZE=39936
-options		PCVT_USL_VT_COMPAT=1,PCVT_SCREENSAVER=1,PCVT_PRETTYSCRNS=0
+option		XSERVER,UCONSOLE
+option		EXTMEM_SIZE=39936
+option		PCVT_USL_VT_COMPAT=1,PCVT_SCREENSAVER=1,PCVT_PRETTYSCRNS=0
 
 maxusers	32
-options		TIMEZONE=480
-options		DST=0
+option		TIMEZONE=480
+option		DST=0
 
-options		SWAPPAGER
-options		VNODEPAGER
-options		DEVPAGER
+option		SWAPPAGER
+option		VNODEPAGER
+option		DEVPAGER
 
-#options	DDB
+#option		DDB
 #makeoptions	DEBUG="-g"
-#options	DIAGNOSTIC
-options		KTRACE
-
-options		SYSVMSG
-options		SYSVSEM
-options		SYSVSHM
-#options	SHMMAXPGS=1024
-
-options		COMPAT_NOMID
-options		COMPAT_09
-options		COMPAT_10
-options		COMPAT_11
-options		COMPAT_43
-options		TCP_COMPAT_42
-
-options		COMPAT_SVR4
-options		COMPAT_IBCS2
-options		COMPAT_LINUX
-options		COMPAT_FREEBSD
-
-options		VM86
-options		USER_LDT
-options		LKM
-
-options		FFS
-options		QUOTA
-options		MFS
-options		EXT2FS
-
-options		PPP_BSDCOMP,PPP_DEFLATE
-options		IPFILTER
-
-options		NFSCLIENT
-options		NFSSERVER
-
-options		CD9660
-options		MSDOSFS
-options		FDESC
-options		FIFO
-options		KERNFS
-options		NULLFS
-options		PROCFS
-options		UMAPFS
-options		UNION
-
-options		GATEWAY
-options		INET
+#option		DIAGNOSTIC
+option		KTRACE
+
+option		SYSVMSG
+option		SYSVSEM
+option		SYSVSHM
+#option		SHMMAXPGS=1024
+
+option		COMPAT_NOMID
+option		COMPAT_09
+option		COMPAT_10
+option		COMPAT_11
+option		COMPAT_43
+option		TCP_COMPAT_42
+
+option		COMPAT_SVR4
+option		COMPAT_IBCS2
+option		COMPAT_LINUX
+option		COMPAT_FREEBSD
+
+option		VM86
+option		USER_LDT
+option		LKM
+
+option		FFS
+option		QUOTA
+option		MFS
+option		EXT2FS
+
+option		PPP_BSDCOMP,PPP_DEFLATE
+option		IPFILTER
+
+option		NFSCLIENT
+option		NFSSERVER
+
+option		CD9660
+option		MSDOSFS
+option		FDESC
+option		FIFO
+option		KERNFS
+option		NULLFS
+option		PROCFS
+option		UMAPFS
+option		UNION
+
+option		GATEWAY
+option		INET
 
 config		bsd root on wd0 swap on wd0 and wd2