diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 215069eefcbf..7497403564f8 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $
+#	$Id: Makefile.i386,v 1.46 1994/10/18 19:45:46 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -27,12 +27,12 @@ CPP?=	cpp
 DBSYM?=	/usr/sbin/dbsym
 .if defined(DEBUG)
 .if defined(NOSTRIP)
-STRIP?=  echo '(skipping) strip'
+STRIP=  echo '(skipping) strip'
 .else
-STRIP?=  cp $@ $@.sym; strip
+STRIP=  cp $@ $@.sym; strip
 .endif
 .else
-STRIP?=  strip
+STRIP=  strip
 .endif
 
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 215069eefcbf..7497403564f8 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $
+#	$Id: Makefile.i386,v 1.46 1994/10/18 19:45:46 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -27,12 +27,12 @@ CPP?=	cpp
 DBSYM?=	/usr/sbin/dbsym
 .if defined(DEBUG)
 .if defined(NOSTRIP)
-STRIP?=  echo '(skipping) strip'
+STRIP=  echo '(skipping) strip'
 .else
-STRIP?=  cp $@ $@.sym; strip
+STRIP=  cp $@ $@.sym; strip
 .endif
 .else
-STRIP?=  strip
+STRIP=  strip
 .endif
 
 .if exists(./@/.)
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5085d538aa49..b5632ebe969f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,87 +4,192 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
+#	$Id: LINT,v 1.97 1994/10/20 00:53:29 phk Exp $
 #
 
+#
+# This directive is mandatory; it defines the architecture to be
+# configured for; in this case, the 386 family.  You must also specify
+# at least one CPU (the one you intend to run on); deleting the
+# specification for CPUs you don't need to use may make parts of the
+# system run faster
+#
 machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
-cpu		"I586_CPU"
-ident		LINT
-maxusers	10
-# maxfdescs	2048			#Max file descriptors per process
-options		MATH_EMULATE		#Support for x87 emulation
+cpu		"I586_CPU"		# a/k/a Pentium(tm)
 
-# Do not use in binary distributions
+# 
+# This is the ``identification'' of the kernel.  Usually this should
+# be the same as the name of your kernel.
+#
+ident		LINT
+
+#
+# The `maxusers' parameter controls the static sizing of a number of
+# internal system tables by a complicated formula defined in param.c.
+#
+maxusers	10
+
+#
+# A math emulator is mandatory if you wish to run on hardware which
+# does not have a floating-point processor.  Pick either the original,
+# 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        GPL_MATH_EMULATE        #Support for x87 emualtion via
                                         #new math emulator 
 
+#
+# This directive defines a number of things:
+#  - The compiled kernel is to be called `kernel'
+#  - The root filesystem might be on partition wd0a
+#  - The kernel can swap on wd0b and sd0b, defaulting to the former
+#  - Crash dumps will be written to wd0b, if possible
+#
 config		kernel	root on wd0 swap on wd0 and sd0 dumps on wd0
 
-#
-# options that appear as inline #ifdef's
-#
-options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
-options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
+
+#####################################################################
+# COMPATIBILITY OPTIONS                                             
 
-options		"COMPAT_43"		#compatible with BSD 4.3
+#
+# Implement system calls compatible with 4.3BSD and older versions of
+# FreeBSD.
+#
+options		"COMPAT_43"
+
+#
+# Allow user-mode programs to manipulat 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
+
+#
+# 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
+
+
+#####################################################################
+# DEBUGGING OPTIONS
+
+#
+# This line enables the kernel debugger, DDB, and the line following
+# allocates extra space for a copy of the debugger symbol table which
+# is stored in the initialized data area of the kernel.  If you change
+# the latter option, remove db_aout.o before compiling.
+#
+options		DDB			#Kernel debugger
 options		"SYMTAB_SPACE=113498"	#This kernel needs LOTS of symtable
-options		GATEWAY			#internetwork gateway
+
+# 
+# KTRACE enables the system-call tracing facility ktrace(2).
+#
 options		KTRACE			#kernel tracing
 
-options		"NCONS=8"		#number of syscons virtual consoles
-options		"FAT_CURSOR"		#block cursor in syscons or pccons
-options		HARDFONTS		#load iso8859 fonts instead of
-					#standard VGA fonts
-
-#options	ALLOW_CONFLICT_IOADDR	#no IO addr conflict checks (PS/2 mice)
-#options	ALLOW_CONFLICT_IRQ	#no IRQ conflict checks (mport serial)
-
-options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
-
-options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
-					# ^^^ NOT RECOMMENDED FOR NORMAL USE
-options		UCONSOLE		#x console support
-options		DECBIT			#here because clnp.h wanted it here
-					#support for CLNP ``congestion 
-					#experienced'' bit in ISO-TP
-options		TROLL			#CLNP network error simulator
-options		ICMPPRINTFS		#ICMP packet dump by printf()
-options		NSERRPRINTFS		#ditto for XNS Error protocol
-					#^^above three NOT RECOMMENTED
-options		MACHVMCOMPAT		#support for Mach-style vm calls
-options		IPBROADCASTECHO=1	#send reply to broadcast pings
-options		IPMASKAGENT=1		#send reply to icmp mask requests
-options		TPCONS			#support X.25 network-layer service
-options		USER_LDT		#allow user-level control of i386 ldt
-options		DSI_SOFT_MODEM		#code for DSI Softmodems
+#
+# The DIAGNOSTIC option is used in a number of source files to enable
+# extra sanity checking of internal structures.  This support is not
+# enabled by default because of the extra time it would take to check
+# for these conditions, which can only occur as a result of
+# programming errors.
+#
 options		DIAGNOSTIC
-options		MSDOSFS_DEBUG
 
-options		APM			#Advance Power Management support for laptops
-					#(Note: also need apm device)
 
-options		USE_RTC_CENTURY		#Use it, if you	are shure that your BIOS
-					#supports century byte
+
+#####################################################################
+# NETWORKING OPTIONS
 
-# See /sys/i386/doc/sound.doc for information about EXCLUDE options for
-#  the sound drivers.
+#
+# Protocol families:
+#  Only the INET (Internet) family is officially supported in FreeBSD.
+#  Source code for the NS (Xerox Network Service), ISO (OSI), and
+#  CCITT (X.25) families is provided for amusement value, although we
+#  try to ensure that it actually compiles.
+#
+options		INET			#Internet communications protocols
+options		ISO
+options		CCITT			#X.25 network layer
+options		NS			#Xerox NS communications protocols
 
-# Multicast support.
+#
+# Network interfaces:
+#  The `loop' pseudo-device is mandatory when networking is enabled.
+#  The `ether' pseudo-device provides generic code to handle
+#  Ethernets; it is mandatory when a Ethernet device driver is
+#  configured.
+#  The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
+#  The `ppp' pseudo-device implements the Point-to-Point Protocol.
+#
+pseudo-device	ether			#Generic Ethernet
+pseudo-device	loop			#Network loop back device
+pseudo-device	sl	2		#Serial Line IP
+pseudo-device	ppp	2		#Point-to-point protocol
+options		NSIP			#XNS over IP
+options		EON			#ISO CLNP over IP
+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
+
+#
+# Internet family options:
+#
+# TCP_COMPAT_42 causes the TCP code to emulate certain bugs present in
+# 4.2BSD.  This option should not be used unless you have a 4.2BSD
+# machine and TCP connections fail.
+#
+# GATEWAY allows the machine to forward packets, and also configures
+# larger static sizes of a number of system tables.
+#
+# MROUTING enables the kernel multicast packet forwarder, which works
+# with mrouted(8).
+#
+# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
+# aware of the legal and administrative consequences of enabling this
+# option.  The number of devices determines the maximum number of
+# simultaneous BPF clients programs runnable.
+#
+options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
+options		GATEWAY			#internetwork gateway
 options		MROUTING		# Multicast routing
+pseudo-device	bpfilter	4	#berkeley packet filter
+
+
+#####################################################################
+# FILESYSTEM OPTIONS
 
 #
-# options that are in sys/conf/files
+# Only the root, /usr, and /tmp filesystems need be statically
+# compiled; everything else will be automatically loaded at mount
+# time.  (Exception: the UFS family---FFS, MFS, and LFS---cannot
+# currently be demand-loaded.)  Some people still prefer to statically
+# compile other filesystems as well.
+#
+# NB: The LFS, PORTAL, and UNION filesystems are known to be buggy,
+# and WILL panic your system if you attempt to do anything with them.
+# They are included here as an incentive for some enterprising soul to
+# sit down and fix them.
 #
 
+# One of these is mandatory:
+options		FFS			#Fast filesystem
+options		NFS			#Network File System
+
+# The rest are optional:
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
-options		FFS			#Fast filesystem
 options		KERNFS			#Kernel filesystem
 options		LFS			#Log filesystem
 options		MFS			#Memory File System
-options		NFS			#Network File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
 options		PORTAL			#Portal filesystem
@@ -92,121 +197,210 @@ options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
 
-pseudo-device	bpfilter	4	#berkeley packet filter
-options		CCITT
-device		cd0	#Only need one of these, the code dynamically grows
-device		ch0
-options		DDB			#Kernel debugger
-options		EON
-pseudo-device	ether
-#pseudo-device	imp
-options		INET			#Internet communications protocols
-options		ISO
-pseudo-device	loop			#Network loop back device
-options		NS			#Xerox NS communications protocols
-options		NSIP			#XNS over IP
-pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	pty	4		#Pseudo ttys
+#
+# Disk quotas are supported when this option is enabled.  If you
+# change the value of this option, you must do a `make clean' in your
+# kernel compile directory in order to get a working kernel.
+#
 options		QUOTA			#enable disk quotas
-options		RMP			#HP remote maint protocol
-controller	scbus0
-device		sd0
+
+
+#####################################################################
+# SCSI DEVICE CONFIGURATION
+
+#
+# The SCSI subsystem consists of the `base' SCSI code, a number of
+# high-level SCSI device drivers, and the low-level host-adapter
+# device drivers.  The host adapters are listed in the ISA and PCI
+# device configuration sections below.
+#
+# Note that, unlike most similar systems, the FreeBSD SCSI system
+# does not wire a particular device unit number to any specific
+# SCSI bus unit number.  Rather, unit numbers are assigned in the
+# order that the devices are found on the SCSI bus.  (This means that
+# if you remove a disk drive, you may have to rewrite your /etc/fstab
+# file.)  It is expected that this will change for FreeBSD 2.1.
+#
+controller	scbus0	#base SCSI code
+device		ch0	#SCSI media changers
+device		sd0	#SCSI disks
 device		sd1
 device		sd2
 device		sd3
-pseudo-device	sl	2
-device		st0
+device		st0	#SCSI tapes
 device		st1
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
-#pseudo-device	tb			#tablet line discipline.
-options		TPIP			# ISO TP class 4 over IP
-#pseudo-device	tun
 device		uk0			#unknown scsi devices
 
 #
-# options that are in sys/i386/conf/files.i386
-# 
-#This is needed here so the isa? below will work
+# The `cd' (SCSI read-only removable disk) driver is special in that
+# the code dynamically allocates more units as they are required, with
+# no limit (other than memory) to the number available.
+device		cd0	#SCSI CD-ROMs
+
+
+#####################################################################
+# MISCELLANEOUS DEVICES AND OPTIONS
+
+#
+# Of these, only the `log' device is truly mandatory.  The `pty'
+# device usually turns out to be ``effectively mandatory'', as it is
+# required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
+# among others.
+#
+pseudo-device	pty	4	#Pseudo ttys
+pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
+pseudo-device	log		#Kernel syslog interface (/dev/klog)
+pseudo-device	gzip		#Exec gzipped a.out's
+
+
+#####################################################################
+# HARDWARE DEVICE CONFIGURATION
+
+# ISA and EISA devices:
+# Currently there is no separate support for EISA.  There should be.
+# Micro Channel is not supported at all.
+
+#
+# Mandatory ISA devices: isa, sc, npx
+#
 controller	isa0
-#This is a preliminary PCI bus ``device''
-controller	pci0
 
-#Driver for Advaced Power Management (also need options APM)
-device		apm0	at isa?
+#
+# Options for `isa':
+#
+# ALLOW_CONFLICT_IOADDR suppresses the I/O address conflict checks, so
+# that the PS/2 mouse driver doesn't conflict with the console driver.
+#
+# ALLOW_CONFLICT_IRQ suppresses the interrupt line conflict checks, so
+# that multiple devices can share the same IRQ, provided that the
+# hardware supports it (it usually doesn't).
+#
+# BOUNCE_BUFFERS provides support for ISA DMA on machines with more
+# than 16 megabytes of memory.  It doesn't hurt on other machines.
+# Some broken EISA and VLB hardware may need this, too.
+#options	ALLOW_CONFLICT_IOADDR
+#options	ALLOW_CONFLICT_IRQ
+options		BOUNCE_BUFFERS
 
-# driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-# driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq ? vector ahbintr
-# Driver for Soundblaster (and PAS?) SCSI controller.
-controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
-# driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
-disk		fd0	at fdc0 drive 0
-disk		fd1	at fdc0 drive 1
-tape		ft0	at fdc0 drive 2
+#
+# Options for `sc':
+#
+# NCONS specifies the number of virtual consoles.  Specification of
+# this value is mandatory.  Due to a compiler bug, when compiling with
+# GCC 2.6.0 this option must be a power of two.
+#
+# FAT_CURSOR specifies the use of a large block cursor rather than the
+# hardware default underline.
+#
+# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
+# the default font in your display adapter's memory.
+#
+# UCONSOLE enables code to let any user get output intended for the
+# console.
+#
+options		"NCONS=8"
+options		"FAT_CURSOR"
+options		HARDFONTS
+options		UCONSOLE
 
-# driver for the Western Digital and SMCC WD80xx cards, for the Novell
-# NE1000/2000 card and the 3COM 3C503 card.
-device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
-# driver for the AT&T Starlan card.
-device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
-#driver for the Isolan AT 4114-0 and the Isolink 4110 ethernet card.
-device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
-#device ix0 at isa? port 0x320 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
-# driver for the Etherlink III ( 3C509 ) card, beta version.
-device ep0 at isa? port 0x300 net irq 10 vector epintr
-#driver for the 3c501
-device el0 at isa? port 0x300 net irq 9 vector elintr
-
-#special cased above:
-#controller	isa0
-# interruptless parallel printer port driver
-device		lpa0	at isa? port "IO_LPT1" tty
-device		lpa1	at isa? port "IO_LPT2" tty
-# interrupt driven parallel printer port driver
-device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
-# Driver for Mitsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
-# Driver for Logitech and ATI inport bus mice
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
-# Driver for the NCR 53c810 and 53c825 PCI SCSI host adapter chips
-controller	ncr0
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
-# Driver for ProAudioSpectrum SCSI, on cards with NCR 5380 chips.
-# The four units correspond to the HW-jumpers.  No intr, No DMA, slow.
+
+#
+# Optional ISA and EISA devices:
+#
+
+#
+# SCSI host adapters: `aha', `ahb', `aic', `bt', `pas'
+#
+# aha: Adaptec 154x
+# ahb: Adaptec 174x
+# aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
+# bt: Most Buslogic controllers
+# pas: ProAudioSpectrum cards using the NCR 5380 (slow!)
+# uha: UltraStore 14F and 34F
+#
+# Note that the order is important in order for Buslogic cards to be
+# probed correctly.
+#
+
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
+controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+
+controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pas0	at isa? port 0x1f88
 controller	pas1	at isa? port 0x1f84
 controller	pas2	at isa? port 0x1f8c
 controller	pas3	at isa? port 0x1e88
-# example specification of IRQ for PCI device ID 5 (ncr0 on some MB)
-#device		pci5	at isa? bio irq 9 vector pciintr
-#device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
-device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
-device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
-#PS/2 mouse driver (must follow pc0 or sc0 if enabled).  Also enable
-#ALLOW_CONFLICT_IOADDR option (see above) if you want to use this.
-#device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
 
-pseudo-device	speaker
-#tw	device-driver
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#
+# ST-506, ESDI, and IDE hard disks: `wdc' and `wd'
+#
+# NB: ``Enhanced IDE'' is NOT supported at this time.
+#
 controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
 controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
-device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 
-# Various sound card drivers.
-# See /sys/doc/sound.doc for more information.
+#
+# Standard floppy disk controllers and floppy tapes: `fdc', `fd', and `ft'
+#
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+disk		fd0	at fdc0 drive 0
+disk		fd1	at fdc0 drive 1
+tape		ft0	at fdc0 drive 2
+
+#
+# Other standard PC hardware: `lpt', `mse', `psm', `sio'
+#
+# lpt: printer port
+# mse: Logitech and ATI InPort bus mouse ports
+# psm: PS/2 mouse port (needs ALLOW_CONFLICT_IOADDR, above)
+# sio: serial ports (see sio(4))
+
+device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
+device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
+device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+
+# Options for sio:
+options		DSI_SOFT_MODEM		#code for DSI Softmodems
+
+#
+# Network interfaces: `ed', `el', `ep', `ie', `is', `le', `lnc'
+#
+# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
+# el: 3Com 3C501 (slow!)
+# ep: 3Com 3C509 (buggy)
+# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210
+# is: Isolan AT 4141-0; Isolink 4110; Novell NE2100
+# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100,
+#     DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422)
+# lnc: unknown LANCE-based
+#
+
+device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
+device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
+device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
+device ep0 at isa? port 0x300 net irq 10 vector epintr
+device el0 at isa? port 0x300 net irq 9 vector elintr
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+#device lnc0 at isa? XXX FILL ME IN
+
+#
+# Audio drivers: `snd', `pca'
+#
+# snd: Voxware sound drivers for various cards (see file `sound.doc')
+# pca: PCM audio through your PC speaker
+#
+# Someday, Voxware configuration will be done properly.
+#
 device snd5 at isa? port 0x330 irq 6 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
 device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr
@@ -215,13 +409,38 @@ device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr
 device snd7 at isa? port 0x300
 device snd1 at isa? port 0x388
 
-# Cortex-I Frame Grabber driver
-device		ctx0	at isa? port 0x230 iomem 0xd0000
-
-# The digital speaker driver (/dev/pcaudio).
 device pca0 at isa? tty
 
-# options that have not been resolved yet
-pseudo-device	log
+#
+# Miscellaneous hardware: `mcd', `wt', `ctx', `apm'
+#
+# mcd: Mitsumi CD-ROM
+# wt: Wangtek and Archive QIC-02/QIC-36 tape drives
+# ctx: Cortex-I frame grabber
+# apm: Laptop Advanced Power Management (experimental)
+#
 
-pseudo-device	gzip		# Exec gzipped a.out's
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
+device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
+device		ctx0	at isa? port 0x230 iomem 0xd0000
+
+# NB: both lines are required
+device		apm0	at isa?
+options		APM
+
+#
+# PCI devices:
+#
+# The main PCI bus device is `pci'.  It provides auto-detection and
+# configuration support for all devices on the PCI bus, using either
+# configuration mode defined in the PCI specification.
+#
+# The `ncr' device provides support for the NCR 53C810 and 53C825
+# self-contained SCSI host adapters.
+#
+# The `de' device provides support for the Digital Equipment DC21040
+# self-contained Ethernet adapter.
+#
+controller	pci0
+device		ncr0
+device		de0
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 5085d538aa49..b5632ebe969f 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,87 +4,192 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
+#	$Id: LINT,v 1.97 1994/10/20 00:53:29 phk Exp $
 #
 
+#
+# This directive is mandatory; it defines the architecture to be
+# configured for; in this case, the 386 family.  You must also specify
+# at least one CPU (the one you intend to run on); deleting the
+# specification for CPUs you don't need to use may make parts of the
+# system run faster
+#
 machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
-cpu		"I586_CPU"
-ident		LINT
-maxusers	10
-# maxfdescs	2048			#Max file descriptors per process
-options		MATH_EMULATE		#Support for x87 emulation
+cpu		"I586_CPU"		# a/k/a Pentium(tm)
 
-# Do not use in binary distributions
+# 
+# This is the ``identification'' of the kernel.  Usually this should
+# be the same as the name of your kernel.
+#
+ident		LINT
+
+#
+# The `maxusers' parameter controls the static sizing of a number of
+# internal system tables by a complicated formula defined in param.c.
+#
+maxusers	10
+
+#
+# A math emulator is mandatory if you wish to run on hardware which
+# does not have a floating-point processor.  Pick either the original,
+# 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        GPL_MATH_EMULATE        #Support for x87 emualtion via
                                         #new math emulator 
 
+#
+# This directive defines a number of things:
+#  - The compiled kernel is to be called `kernel'
+#  - The root filesystem might be on partition wd0a
+#  - The kernel can swap on wd0b and sd0b, defaulting to the former
+#  - Crash dumps will be written to wd0b, if possible
+#
 config		kernel	root on wd0 swap on wd0 and sd0 dumps on wd0
 
-#
-# options that appear as inline #ifdef's
-#
-options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
-options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
+
+#####################################################################
+# COMPATIBILITY OPTIONS                                             
 
-options		"COMPAT_43"		#compatible with BSD 4.3
+#
+# Implement system calls compatible with 4.3BSD and older versions of
+# FreeBSD.
+#
+options		"COMPAT_43"
+
+#
+# Allow user-mode programs to manipulat 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
+
+#
+# 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
+
+
+#####################################################################
+# DEBUGGING OPTIONS
+
+#
+# This line enables the kernel debugger, DDB, and the line following
+# allocates extra space for a copy of the debugger symbol table which
+# is stored in the initialized data area of the kernel.  If you change
+# the latter option, remove db_aout.o before compiling.
+#
+options		DDB			#Kernel debugger
 options		"SYMTAB_SPACE=113498"	#This kernel needs LOTS of symtable
-options		GATEWAY			#internetwork gateway
+
+# 
+# KTRACE enables the system-call tracing facility ktrace(2).
+#
 options		KTRACE			#kernel tracing
 
-options		"NCONS=8"		#number of syscons virtual consoles
-options		"FAT_CURSOR"		#block cursor in syscons or pccons
-options		HARDFONTS		#load iso8859 fonts instead of
-					#standard VGA fonts
-
-#options	ALLOW_CONFLICT_IOADDR	#no IO addr conflict checks (PS/2 mice)
-#options	ALLOW_CONFLICT_IRQ	#no IRQ conflict checks (mport serial)
-
-options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
-
-options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
-					# ^^^ NOT RECOMMENDED FOR NORMAL USE
-options		UCONSOLE		#x console support
-options		DECBIT			#here because clnp.h wanted it here
-					#support for CLNP ``congestion 
-					#experienced'' bit in ISO-TP
-options		TROLL			#CLNP network error simulator
-options		ICMPPRINTFS		#ICMP packet dump by printf()
-options		NSERRPRINTFS		#ditto for XNS Error protocol
-					#^^above three NOT RECOMMENTED
-options		MACHVMCOMPAT		#support for Mach-style vm calls
-options		IPBROADCASTECHO=1	#send reply to broadcast pings
-options		IPMASKAGENT=1		#send reply to icmp mask requests
-options		TPCONS			#support X.25 network-layer service
-options		USER_LDT		#allow user-level control of i386 ldt
-options		DSI_SOFT_MODEM		#code for DSI Softmodems
+#
+# The DIAGNOSTIC option is used in a number of source files to enable
+# extra sanity checking of internal structures.  This support is not
+# enabled by default because of the extra time it would take to check
+# for these conditions, which can only occur as a result of
+# programming errors.
+#
 options		DIAGNOSTIC
-options		MSDOSFS_DEBUG
 
-options		APM			#Advance Power Management support for laptops
-					#(Note: also need apm device)
 
-options		USE_RTC_CENTURY		#Use it, if you	are shure that your BIOS
-					#supports century byte
+
+#####################################################################
+# NETWORKING OPTIONS
 
-# See /sys/i386/doc/sound.doc for information about EXCLUDE options for
-#  the sound drivers.
+#
+# Protocol families:
+#  Only the INET (Internet) family is officially supported in FreeBSD.
+#  Source code for the NS (Xerox Network Service), ISO (OSI), and
+#  CCITT (X.25) families is provided for amusement value, although we
+#  try to ensure that it actually compiles.
+#
+options		INET			#Internet communications protocols
+options		ISO
+options		CCITT			#X.25 network layer
+options		NS			#Xerox NS communications protocols
 
-# Multicast support.
+#
+# Network interfaces:
+#  The `loop' pseudo-device is mandatory when networking is enabled.
+#  The `ether' pseudo-device provides generic code to handle
+#  Ethernets; it is mandatory when a Ethernet device driver is
+#  configured.
+#  The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
+#  The `ppp' pseudo-device implements the Point-to-Point Protocol.
+#
+pseudo-device	ether			#Generic Ethernet
+pseudo-device	loop			#Network loop back device
+pseudo-device	sl	2		#Serial Line IP
+pseudo-device	ppp	2		#Point-to-point protocol
+options		NSIP			#XNS over IP
+options		EON			#ISO CLNP over IP
+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
+
+#
+# Internet family options:
+#
+# TCP_COMPAT_42 causes the TCP code to emulate certain bugs present in
+# 4.2BSD.  This option should not be used unless you have a 4.2BSD
+# machine and TCP connections fail.
+#
+# GATEWAY allows the machine to forward packets, and also configures
+# larger static sizes of a number of system tables.
+#
+# MROUTING enables the kernel multicast packet forwarder, which works
+# with mrouted(8).
+#
+# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
+# aware of the legal and administrative consequences of enabling this
+# option.  The number of devices determines the maximum number of
+# simultaneous BPF clients programs runnable.
+#
+options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
+options		GATEWAY			#internetwork gateway
 options		MROUTING		# Multicast routing
+pseudo-device	bpfilter	4	#berkeley packet filter
+
+
+#####################################################################
+# FILESYSTEM OPTIONS
 
 #
-# options that are in sys/conf/files
+# Only the root, /usr, and /tmp filesystems need be statically
+# compiled; everything else will be automatically loaded at mount
+# time.  (Exception: the UFS family---FFS, MFS, and LFS---cannot
+# currently be demand-loaded.)  Some people still prefer to statically
+# compile other filesystems as well.
+#
+# NB: The LFS, PORTAL, and UNION filesystems are known to be buggy,
+# and WILL panic your system if you attempt to do anything with them.
+# They are included here as an incentive for some enterprising soul to
+# sit down and fix them.
 #
 
+# One of these is mandatory:
+options		FFS			#Fast filesystem
+options		NFS			#Network File System
+
+# The rest are optional:
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
-options		FFS			#Fast filesystem
 options		KERNFS			#Kernel filesystem
 options		LFS			#Log filesystem
 options		MFS			#Memory File System
-options		NFS			#Network File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
 options		PORTAL			#Portal filesystem
@@ -92,121 +197,210 @@ options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
 
-pseudo-device	bpfilter	4	#berkeley packet filter
-options		CCITT
-device		cd0	#Only need one of these, the code dynamically grows
-device		ch0
-options		DDB			#Kernel debugger
-options		EON
-pseudo-device	ether
-#pseudo-device	imp
-options		INET			#Internet communications protocols
-options		ISO
-pseudo-device	loop			#Network loop back device
-options		NS			#Xerox NS communications protocols
-options		NSIP			#XNS over IP
-pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	pty	4		#Pseudo ttys
+#
+# Disk quotas are supported when this option is enabled.  If you
+# change the value of this option, you must do a `make clean' in your
+# kernel compile directory in order to get a working kernel.
+#
 options		QUOTA			#enable disk quotas
-options		RMP			#HP remote maint protocol
-controller	scbus0
-device		sd0
+
+
+#####################################################################
+# SCSI DEVICE CONFIGURATION
+
+#
+# The SCSI subsystem consists of the `base' SCSI code, a number of
+# high-level SCSI device drivers, and the low-level host-adapter
+# device drivers.  The host adapters are listed in the ISA and PCI
+# device configuration sections below.
+#
+# Note that, unlike most similar systems, the FreeBSD SCSI system
+# does not wire a particular device unit number to any specific
+# SCSI bus unit number.  Rather, unit numbers are assigned in the
+# order that the devices are found on the SCSI bus.  (This means that
+# if you remove a disk drive, you may have to rewrite your /etc/fstab
+# file.)  It is expected that this will change for FreeBSD 2.1.
+#
+controller	scbus0	#base SCSI code
+device		ch0	#SCSI media changers
+device		sd0	#SCSI disks
 device		sd1
 device		sd2
 device		sd3
-pseudo-device	sl	2
-device		st0
+device		st0	#SCSI tapes
 device		st1
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
-#pseudo-device	tb			#tablet line discipline.
-options		TPIP			# ISO TP class 4 over IP
-#pseudo-device	tun
 device		uk0			#unknown scsi devices
 
 #
-# options that are in sys/i386/conf/files.i386
-# 
-#This is needed here so the isa? below will work
+# The `cd' (SCSI read-only removable disk) driver is special in that
+# the code dynamically allocates more units as they are required, with
+# no limit (other than memory) to the number available.
+device		cd0	#SCSI CD-ROMs
+
+
+#####################################################################
+# MISCELLANEOUS DEVICES AND OPTIONS
+
+#
+# Of these, only the `log' device is truly mandatory.  The `pty'
+# device usually turns out to be ``effectively mandatory'', as it is
+# required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
+# among others.
+#
+pseudo-device	pty	4	#Pseudo ttys
+pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
+pseudo-device	log		#Kernel syslog interface (/dev/klog)
+pseudo-device	gzip		#Exec gzipped a.out's
+
+
+#####################################################################
+# HARDWARE DEVICE CONFIGURATION
+
+# ISA and EISA devices:
+# Currently there is no separate support for EISA.  There should be.
+# Micro Channel is not supported at all.
+
+#
+# Mandatory ISA devices: isa, sc, npx
+#
 controller	isa0
-#This is a preliminary PCI bus ``device''
-controller	pci0
 
-#Driver for Advaced Power Management (also need options APM)
-device		apm0	at isa?
+#
+# Options for `isa':
+#
+# ALLOW_CONFLICT_IOADDR suppresses the I/O address conflict checks, so
+# that the PS/2 mouse driver doesn't conflict with the console driver.
+#
+# ALLOW_CONFLICT_IRQ suppresses the interrupt line conflict checks, so
+# that multiple devices can share the same IRQ, provided that the
+# hardware supports it (it usually doesn't).
+#
+# BOUNCE_BUFFERS provides support for ISA DMA on machines with more
+# than 16 megabytes of memory.  It doesn't hurt on other machines.
+# Some broken EISA and VLB hardware may need this, too.
+#options	ALLOW_CONFLICT_IOADDR
+#options	ALLOW_CONFLICT_IRQ
+options		BOUNCE_BUFFERS
 
-# driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-# driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq ? vector ahbintr
-# Driver for Soundblaster (and PAS?) SCSI controller.
-controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
-# driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
-disk		fd0	at fdc0 drive 0
-disk		fd1	at fdc0 drive 1
-tape		ft0	at fdc0 drive 2
+#
+# Options for `sc':
+#
+# NCONS specifies the number of virtual consoles.  Specification of
+# this value is mandatory.  Due to a compiler bug, when compiling with
+# GCC 2.6.0 this option must be a power of two.
+#
+# FAT_CURSOR specifies the use of a large block cursor rather than the
+# hardware default underline.
+#
+# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
+# the default font in your display adapter's memory.
+#
+# UCONSOLE enables code to let any user get output intended for the
+# console.
+#
+options		"NCONS=8"
+options		"FAT_CURSOR"
+options		HARDFONTS
+options		UCONSOLE
 
-# driver for the Western Digital and SMCC WD80xx cards, for the Novell
-# NE1000/2000 card and the 3COM 3C503 card.
-device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
-# driver for the AT&T Starlan card.
-device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
-#driver for the Isolan AT 4114-0 and the Isolink 4110 ethernet card.
-device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
-#device ix0 at isa? port 0x320 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
-# driver for the Etherlink III ( 3C509 ) card, beta version.
-device ep0 at isa? port 0x300 net irq 10 vector epintr
-#driver for the 3c501
-device el0 at isa? port 0x300 net irq 9 vector elintr
-
-#special cased above:
-#controller	isa0
-# interruptless parallel printer port driver
-device		lpa0	at isa? port "IO_LPT1" tty
-device		lpa1	at isa? port "IO_LPT2" tty
-# interrupt driven parallel printer port driver
-device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
-# Driver for Mitsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
-# Driver for Logitech and ATI inport bus mice
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
-# Driver for the NCR 53c810 and 53c825 PCI SCSI host adapter chips
-controller	ncr0
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
-# Driver for ProAudioSpectrum SCSI, on cards with NCR 5380 chips.
-# The four units correspond to the HW-jumpers.  No intr, No DMA, slow.
+
+#
+# Optional ISA and EISA devices:
+#
+
+#
+# SCSI host adapters: `aha', `ahb', `aic', `bt', `pas'
+#
+# aha: Adaptec 154x
+# ahb: Adaptec 174x
+# aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
+# bt: Most Buslogic controllers
+# pas: ProAudioSpectrum cards using the NCR 5380 (slow!)
+# uha: UltraStore 14F and 34F
+#
+# Note that the order is important in order for Buslogic cards to be
+# probed correctly.
+#
+
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
+controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+
+controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pas0	at isa? port 0x1f88
 controller	pas1	at isa? port 0x1f84
 controller	pas2	at isa? port 0x1f8c
 controller	pas3	at isa? port 0x1e88
-# example specification of IRQ for PCI device ID 5 (ncr0 on some MB)
-#device		pci5	at isa? bio irq 9 vector pciintr
-#device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
-device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
-device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
-#PS/2 mouse driver (must follow pc0 or sc0 if enabled).  Also enable
-#ALLOW_CONFLICT_IOADDR option (see above) if you want to use this.
-#device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
 
-pseudo-device	speaker
-#tw	device-driver
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#
+# ST-506, ESDI, and IDE hard disks: `wdc' and `wd'
+#
+# NB: ``Enhanced IDE'' is NOT supported at this time.
+#
 controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
 controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
-device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 
-# Various sound card drivers.
-# See /sys/doc/sound.doc for more information.
+#
+# Standard floppy disk controllers and floppy tapes: `fdc', `fd', and `ft'
+#
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+disk		fd0	at fdc0 drive 0
+disk		fd1	at fdc0 drive 1
+tape		ft0	at fdc0 drive 2
+
+#
+# Other standard PC hardware: `lpt', `mse', `psm', `sio'
+#
+# lpt: printer port
+# mse: Logitech and ATI InPort bus mouse ports
+# psm: PS/2 mouse port (needs ALLOW_CONFLICT_IOADDR, above)
+# sio: serial ports (see sio(4))
+
+device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
+device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
+device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+
+# Options for sio:
+options		DSI_SOFT_MODEM		#code for DSI Softmodems
+
+#
+# Network interfaces: `ed', `el', `ep', `ie', `is', `le', `lnc'
+#
+# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
+# el: 3Com 3C501 (slow!)
+# ep: 3Com 3C509 (buggy)
+# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210
+# is: Isolan AT 4141-0; Isolink 4110; Novell NE2100
+# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100,
+#     DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422)
+# lnc: unknown LANCE-based
+#
+
+device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
+device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
+device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
+device ep0 at isa? port 0x300 net irq 10 vector epintr
+device el0 at isa? port 0x300 net irq 9 vector elintr
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+#device lnc0 at isa? XXX FILL ME IN
+
+#
+# Audio drivers: `snd', `pca'
+#
+# snd: Voxware sound drivers for various cards (see file `sound.doc')
+# pca: PCM audio through your PC speaker
+#
+# Someday, Voxware configuration will be done properly.
+#
 device snd5 at isa? port 0x330 irq 6 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
 device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr
@@ -215,13 +409,38 @@ device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr
 device snd7 at isa? port 0x300
 device snd1 at isa? port 0x388
 
-# Cortex-I Frame Grabber driver
-device		ctx0	at isa? port 0x230 iomem 0xd0000
-
-# The digital speaker driver (/dev/pcaudio).
 device pca0 at isa? tty
 
-# options that have not been resolved yet
-pseudo-device	log
+#
+# Miscellaneous hardware: `mcd', `wt', `ctx', `apm'
+#
+# mcd: Mitsumi CD-ROM
+# wt: Wangtek and Archive QIC-02/QIC-36 tape drives
+# ctx: Cortex-I frame grabber
+# apm: Laptop Advanced Power Management (experimental)
+#
 
-pseudo-device	gzip		# Exec gzipped a.out's
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
+device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
+device		ctx0	at isa? port 0x230 iomem 0xd0000
+
+# NB: both lines are required
+device		apm0	at isa?
+options		APM
+
+#
+# PCI devices:
+#
+# The main PCI bus device is `pci'.  It provides auto-detection and
+# configuration support for all devices on the PCI bus, using either
+# configuration mode defined in the PCI specification.
+#
+# The `ncr' device provides support for the NCR 53C810 and 53C825
+# self-contained SCSI host adapters.
+#
+# The `de' device provides support for the Digital Equipment DC21040
+# self-contained Ethernet adapter.
+#
+controller	pci0
+device		ncr0
+device		de0
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 215069eefcbf..7497403564f8 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $
+#	$Id: Makefile.i386,v 1.46 1994/10/18 19:45:46 wollman Exp $
 #
 # Makefile for FreeBSD
 #
@@ -27,12 +27,12 @@ CPP?=	cpp
 DBSYM?=	/usr/sbin/dbsym
 .if defined(DEBUG)
 .if defined(NOSTRIP)
-STRIP?=  echo '(skipping) strip'
+STRIP=  echo '(skipping) strip'
 .else
-STRIP?=  cp $@ $@.sym; strip
+STRIP=  cp $@ $@.sym; strip
 .endif
 .else
-STRIP?=  strip
+STRIP=  strip
 .endif
 
 .if exists(./@/.)
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5085d538aa49..b5632ebe969f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,87 +4,192 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
+#	$Id: LINT,v 1.97 1994/10/20 00:53:29 phk Exp $
 #
 
+#
+# This directive is mandatory; it defines the architecture to be
+# configured for; in this case, the 386 family.  You must also specify
+# at least one CPU (the one you intend to run on); deleting the
+# specification for CPUs you don't need to use may make parts of the
+# system run faster
+#
 machine		"i386"
 cpu		"I386_CPU"
 cpu		"I486_CPU"
-cpu		"I586_CPU"
-ident		LINT
-maxusers	10
-# maxfdescs	2048			#Max file descriptors per process
-options		MATH_EMULATE		#Support for x87 emulation
+cpu		"I586_CPU"		# a/k/a Pentium(tm)
 
-# Do not use in binary distributions
+# 
+# This is the ``identification'' of the kernel.  Usually this should
+# be the same as the name of your kernel.
+#
+ident		LINT
+
+#
+# The `maxusers' parameter controls the static sizing of a number of
+# internal system tables by a complicated formula defined in param.c.
+#
+maxusers	10
+
+#
+# A math emulator is mandatory if you wish to run on hardware which
+# does not have a floating-point processor.  Pick either the original,
+# 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        GPL_MATH_EMULATE        #Support for x87 emualtion via
                                         #new math emulator 
 
+#
+# This directive defines a number of things:
+#  - The compiled kernel is to be called `kernel'
+#  - The root filesystem might be on partition wd0a
+#  - The kernel can swap on wd0b and sd0b, defaulting to the former
+#  - Crash dumps will be written to wd0b, if possible
+#
 config		kernel	root on wd0 swap on wd0 and sd0 dumps on wd0
 
-#
-# options that appear as inline #ifdef's
-#
-options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
-options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
+
+#####################################################################
+# COMPATIBILITY OPTIONS                                             
 
-options		"COMPAT_43"		#compatible with BSD 4.3
+#
+# Implement system calls compatible with 4.3BSD and older versions of
+# FreeBSD.
+#
+options		"COMPAT_43"
+
+#
+# Allow user-mode programs to manipulat 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
+
+#
+# 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
+
+
+#####################################################################
+# DEBUGGING OPTIONS
+
+#
+# This line enables the kernel debugger, DDB, and the line following
+# allocates extra space for a copy of the debugger symbol table which
+# is stored in the initialized data area of the kernel.  If you change
+# the latter option, remove db_aout.o before compiling.
+#
+options		DDB			#Kernel debugger
 options		"SYMTAB_SPACE=113498"	#This kernel needs LOTS of symtable
-options		GATEWAY			#internetwork gateway
+
+# 
+# KTRACE enables the system-call tracing facility ktrace(2).
+#
 options		KTRACE			#kernel tracing
 
-options		"NCONS=8"		#number of syscons virtual consoles
-options		"FAT_CURSOR"		#block cursor in syscons or pccons
-options		HARDFONTS		#load iso8859 fonts instead of
-					#standard VGA fonts
-
-#options	ALLOW_CONFLICT_IOADDR	#no IO addr conflict checks (PS/2 mice)
-#options	ALLOW_CONFLICT_IRQ	#no IRQ conflict checks (mport serial)
-
-options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
-
-options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
-					# ^^^ NOT RECOMMENDED FOR NORMAL USE
-options		UCONSOLE		#x console support
-options		DECBIT			#here because clnp.h wanted it here
-					#support for CLNP ``congestion 
-					#experienced'' bit in ISO-TP
-options		TROLL			#CLNP network error simulator
-options		ICMPPRINTFS		#ICMP packet dump by printf()
-options		NSERRPRINTFS		#ditto for XNS Error protocol
-					#^^above three NOT RECOMMENTED
-options		MACHVMCOMPAT		#support for Mach-style vm calls
-options		IPBROADCASTECHO=1	#send reply to broadcast pings
-options		IPMASKAGENT=1		#send reply to icmp mask requests
-options		TPCONS			#support X.25 network-layer service
-options		USER_LDT		#allow user-level control of i386 ldt
-options		DSI_SOFT_MODEM		#code for DSI Softmodems
+#
+# The DIAGNOSTIC option is used in a number of source files to enable
+# extra sanity checking of internal structures.  This support is not
+# enabled by default because of the extra time it would take to check
+# for these conditions, which can only occur as a result of
+# programming errors.
+#
 options		DIAGNOSTIC
-options		MSDOSFS_DEBUG
 
-options		APM			#Advance Power Management support for laptops
-					#(Note: also need apm device)
 
-options		USE_RTC_CENTURY		#Use it, if you	are shure that your BIOS
-					#supports century byte
+
+#####################################################################
+# NETWORKING OPTIONS
 
-# See /sys/i386/doc/sound.doc for information about EXCLUDE options for
-#  the sound drivers.
+#
+# Protocol families:
+#  Only the INET (Internet) family is officially supported in FreeBSD.
+#  Source code for the NS (Xerox Network Service), ISO (OSI), and
+#  CCITT (X.25) families is provided for amusement value, although we
+#  try to ensure that it actually compiles.
+#
+options		INET			#Internet communications protocols
+options		ISO
+options		CCITT			#X.25 network layer
+options		NS			#Xerox NS communications protocols
 
-# Multicast support.
+#
+# Network interfaces:
+#  The `loop' pseudo-device is mandatory when networking is enabled.
+#  The `ether' pseudo-device provides generic code to handle
+#  Ethernets; it is mandatory when a Ethernet device driver is
+#  configured.
+#  The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
+#  The `ppp' pseudo-device implements the Point-to-Point Protocol.
+#
+pseudo-device	ether			#Generic Ethernet
+pseudo-device	loop			#Network loop back device
+pseudo-device	sl	2		#Serial Line IP
+pseudo-device	ppp	2		#Point-to-point protocol
+options		NSIP			#XNS over IP
+options		EON			#ISO CLNP over IP
+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
+
+#
+# Internet family options:
+#
+# TCP_COMPAT_42 causes the TCP code to emulate certain bugs present in
+# 4.2BSD.  This option should not be used unless you have a 4.2BSD
+# machine and TCP connections fail.
+#
+# GATEWAY allows the machine to forward packets, and also configures
+# larger static sizes of a number of system tables.
+#
+# MROUTING enables the kernel multicast packet forwarder, which works
+# with mrouted(8).
+#
+# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
+# aware of the legal and administrative consequences of enabling this
+# option.  The number of devices determines the maximum number of
+# simultaneous BPF clients programs runnable.
+#
+options		"TCP_COMPAT_42"		#emulate 4.2BSD TCP bugs
+options		GATEWAY			#internetwork gateway
 options		MROUTING		# Multicast routing
+pseudo-device	bpfilter	4	#berkeley packet filter
+
+
+#####################################################################
+# FILESYSTEM OPTIONS
 
 #
-# options that are in sys/conf/files
+# Only the root, /usr, and /tmp filesystems need be statically
+# compiled; everything else will be automatically loaded at mount
+# time.  (Exception: the UFS family---FFS, MFS, and LFS---cannot
+# currently be demand-loaded.)  Some people still prefer to statically
+# compile other filesystems as well.
+#
+# NB: The LFS, PORTAL, and UNION filesystems are known to be buggy,
+# and WILL panic your system if you attempt to do anything with them.
+# They are included here as an incentive for some enterprising soul to
+# sit down and fix them.
 #
 
+# One of these is mandatory:
+options		FFS			#Fast filesystem
+options		NFS			#Network File System
+
+# The rest are optional:
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
-options		FFS			#Fast filesystem
 options		KERNFS			#Kernel filesystem
 options		LFS			#Log filesystem
 options		MFS			#Memory File System
-options		NFS			#Network File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
 options		PORTAL			#Portal filesystem
@@ -92,121 +197,210 @@ options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
 
-pseudo-device	bpfilter	4	#berkeley packet filter
-options		CCITT
-device		cd0	#Only need one of these, the code dynamically grows
-device		ch0
-options		DDB			#Kernel debugger
-options		EON
-pseudo-device	ether
-#pseudo-device	imp
-options		INET			#Internet communications protocols
-options		ISO
-pseudo-device	loop			#Network loop back device
-options		NS			#Xerox NS communications protocols
-options		NSIP			#XNS over IP
-pseudo-device	ppp	2		#Point-to-point protocol
-pseudo-device	pty	4		#Pseudo ttys
+#
+# Disk quotas are supported when this option is enabled.  If you
+# change the value of this option, you must do a `make clean' in your
+# kernel compile directory in order to get a working kernel.
+#
 options		QUOTA			#enable disk quotas
-options		RMP			#HP remote maint protocol
-controller	scbus0
-device		sd0
+
+
+#####################################################################
+# SCSI DEVICE CONFIGURATION
+
+#
+# The SCSI subsystem consists of the `base' SCSI code, a number of
+# high-level SCSI device drivers, and the low-level host-adapter
+# device drivers.  The host adapters are listed in the ISA and PCI
+# device configuration sections below.
+#
+# Note that, unlike most similar systems, the FreeBSD SCSI system
+# does not wire a particular device unit number to any specific
+# SCSI bus unit number.  Rather, unit numbers are assigned in the
+# order that the devices are found on the SCSI bus.  (This means that
+# if you remove a disk drive, you may have to rewrite your /etc/fstab
+# file.)  It is expected that this will change for FreeBSD 2.1.
+#
+controller	scbus0	#base SCSI code
+device		ch0	#SCSI media changers
+device		sd0	#SCSI disks
 device		sd1
 device		sd2
 device		sd3
-pseudo-device	sl	2
-device		st0
+device		st0	#SCSI tapes
 device		st1
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
-#pseudo-device	tb			#tablet line discipline.
-options		TPIP			# ISO TP class 4 over IP
-#pseudo-device	tun
 device		uk0			#unknown scsi devices
 
 #
-# options that are in sys/i386/conf/files.i386
-# 
-#This is needed here so the isa? below will work
+# The `cd' (SCSI read-only removable disk) driver is special in that
+# the code dynamically allocates more units as they are required, with
+# no limit (other than memory) to the number available.
+device		cd0	#SCSI CD-ROMs
+
+
+#####################################################################
+# MISCELLANEOUS DEVICES AND OPTIONS
+
+#
+# Of these, only the `log' device is truly mandatory.  The `pty'
+# device usually turns out to be ``effectively mandatory'', as it is
+# required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
+# among others.
+#
+pseudo-device	pty	4	#Pseudo ttys
+pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
+pseudo-device	log		#Kernel syslog interface (/dev/klog)
+pseudo-device	gzip		#Exec gzipped a.out's
+
+
+#####################################################################
+# HARDWARE DEVICE CONFIGURATION
+
+# ISA and EISA devices:
+# Currently there is no separate support for EISA.  There should be.
+# Micro Channel is not supported at all.
+
+#
+# Mandatory ISA devices: isa, sc, npx
+#
 controller	isa0
-#This is a preliminary PCI bus ``device''
-controller	pci0
 
-#Driver for Advaced Power Management (also need options APM)
-device		apm0	at isa?
+#
+# Options for `isa':
+#
+# ALLOW_CONFLICT_IOADDR suppresses the I/O address conflict checks, so
+# that the PS/2 mouse driver doesn't conflict with the console driver.
+#
+# ALLOW_CONFLICT_IRQ suppresses the interrupt line conflict checks, so
+# that multiple devices can share the same IRQ, provided that the
+# hardware supports it (it usually doesn't).
+#
+# BOUNCE_BUFFERS provides support for ISA DMA on machines with more
+# than 16 megabytes of memory.  It doesn't hurt on other machines.
+# Some broken EISA and VLB hardware may need this, too.
+#options	ALLOW_CONFLICT_IOADDR
+#options	ALLOW_CONFLICT_IRQ
+options		BOUNCE_BUFFERS
 
-# driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-# driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq ? vector ahbintr
-# Driver for Soundblaster (and PAS?) SCSI controller.
-controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
-# driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
-disk		fd0	at fdc0 drive 0
-disk		fd1	at fdc0 drive 1
-tape		ft0	at fdc0 drive 2
+#
+# Options for `sc':
+#
+# NCONS specifies the number of virtual consoles.  Specification of
+# this value is mandatory.  Due to a compiler bug, when compiling with
+# GCC 2.6.0 this option must be a power of two.
+#
+# FAT_CURSOR specifies the use of a large block cursor rather than the
+# hardware default underline.
+#
+# HARDFONTS allows the driver to load an ISO-8859-1 font to replace
+# the default font in your display adapter's memory.
+#
+# UCONSOLE enables code to let any user get output intended for the
+# console.
+#
+options		"NCONS=8"
+options		"FAT_CURSOR"
+options		HARDFONTS
+options		UCONSOLE
 
-# driver for the Western Digital and SMCC WD80xx cards, for the Novell
-# NE1000/2000 card and the 3COM 3C503 card.
-device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
-# driver for the AT&T Starlan card.
-device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
-#driver for the Isolan AT 4114-0 and the Isolink 4110 ethernet card.
-device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
-#device ix0 at isa? port 0x320 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
-# driver for the Etherlink III ( 3C509 ) card, beta version.
-device ep0 at isa? port 0x300 net irq 10 vector epintr
-#driver for the 3c501
-device el0 at isa? port 0x300 net irq 9 vector elintr
-
-#special cased above:
-#controller	isa0
-# interruptless parallel printer port driver
-device		lpa0	at isa? port "IO_LPT1" tty
-device		lpa1	at isa? port "IO_LPT2" tty
-# interrupt driven parallel printer port driver
-device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
-# Driver for Mitsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
-# Driver for Logitech and ATI inport bus mice
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
-# Driver for the NCR 53c810 and 53c825 PCI SCSI host adapter chips
-controller	ncr0
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
-# Driver for ProAudioSpectrum SCSI, on cards with NCR 5380 chips.
-# The four units correspond to the HW-jumpers.  No intr, No DMA, slow.
+
+#
+# Optional ISA and EISA devices:
+#
+
+#
+# SCSI host adapters: `aha', `ahb', `aic', `bt', `pas'
+#
+# aha: Adaptec 154x
+# ahb: Adaptec 174x
+# aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
+# bt: Most Buslogic controllers
+# pas: ProAudioSpectrum cards using the NCR 5380 (slow!)
+# uha: UltraStore 14F and 34F
+#
+# Note that the order is important in order for Buslogic cards to be
+# probed correctly.
+#
+
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
+controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+
+controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pas0	at isa? port 0x1f88
 controller	pas1	at isa? port 0x1f84
 controller	pas2	at isa? port 0x1f8c
 controller	pas3	at isa? port 0x1e88
-# example specification of IRQ for PCI device ID 5 (ncr0 on some MB)
-#device		pci5	at isa? bio irq 9 vector pciintr
-#device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
-device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
-device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
-#PS/2 mouse driver (must follow pc0 or sc0 if enabled).  Also enable
-#ALLOW_CONFLICT_IOADDR option (see above) if you want to use this.
-#device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
 
-pseudo-device	speaker
-#tw	device-driver
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#
+# ST-506, ESDI, and IDE hard disks: `wdc' and `wd'
+#
+# NB: ``Enhanced IDE'' is NOT supported at this time.
+#
 controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
 controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
-device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 
-# Various sound card drivers.
-# See /sys/doc/sound.doc for more information.
+#
+# Standard floppy disk controllers and floppy tapes: `fdc', `fd', and `ft'
+#
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+disk		fd0	at fdc0 drive 0
+disk		fd1	at fdc0 drive 1
+tape		ft0	at fdc0 drive 2
+
+#
+# Other standard PC hardware: `lpt', `mse', `psm', `sio'
+#
+# lpt: printer port
+# mse: Logitech and ATI InPort bus mouse ports
+# psm: PS/2 mouse port (needs ALLOW_CONFLICT_IOADDR, above)
+# sio: serial ports (see sio(4))
+
+device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
+device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
+device		psm0	at isa? port "IO_KBD" tty irq 12 vector psmintr
+device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+
+# Options for sio:
+options		DSI_SOFT_MODEM		#code for DSI Softmodems
+
+#
+# Network interfaces: `ed', `el', `ep', `ie', `is', `le', `lnc'
+#
+# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
+# el: 3Com 3C501 (slow!)
+# ep: 3Com 3C509 (buggy)
+# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210
+# is: Isolan AT 4141-0; Isolink 4110; Novell NE2100
+# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100,
+#     DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422)
+# lnc: unknown LANCE-based
+#
+
+device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr
+device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr
+device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
+device ep0 at isa? port 0x300 net irq 10 vector epintr
+device el0 at isa? port 0x300 net irq 9 vector elintr
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+#device lnc0 at isa? XXX FILL ME IN
+
+#
+# Audio drivers: `snd', `pca'
+#
+# snd: Voxware sound drivers for various cards (see file `sound.doc')
+# pca: PCM audio through your PC speaker
+#
+# Someday, Voxware configuration will be done properly.
+#
 device snd5 at isa? port 0x330 irq 6 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
 device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr
@@ -215,13 +409,38 @@ device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr
 device snd7 at isa? port 0x300
 device snd1 at isa? port 0x388
 
-# Cortex-I Frame Grabber driver
-device		ctx0	at isa? port 0x230 iomem 0xd0000
-
-# The digital speaker driver (/dev/pcaudio).
 device pca0 at isa? tty
 
-# options that have not been resolved yet
-pseudo-device	log
+#
+# Miscellaneous hardware: `mcd', `wt', `ctx', `apm'
+#
+# mcd: Mitsumi CD-ROM
+# wt: Wangtek and Archive QIC-02/QIC-36 tape drives
+# ctx: Cortex-I frame grabber
+# apm: Laptop Advanced Power Management (experimental)
+#
 
-pseudo-device	gzip		# Exec gzipped a.out's
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
+device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
+device		ctx0	at isa? port 0x230 iomem 0xd0000
+
+# NB: both lines are required
+device		apm0	at isa?
+options		APM
+
+#
+# PCI devices:
+#
+# The main PCI bus device is `pci'.  It provides auto-detection and
+# configuration support for all devices on the PCI bus, using either
+# configuration mode defined in the PCI specification.
+#
+# The `ncr' device provides support for the NCR 53C810 and 53C825
+# self-contained SCSI host adapters.
+#
+# The `de' device provides support for the Digital Equipment DC21040
+# self-contained Ethernet adapter.
+#
+controller	pci0
+device		ncr0
+device		de0