4 files changed, 14 insertions, 8 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 9b41f20b4647..6cb62e352534 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -14,7 +14,10 @@
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../i386/conf/LINT configuration file. 
 # If you are in doubt as to the purpose or necessity of a line, check first 
-# in LINT.
+# in LINT. Please note that this is the i386 LINT, but it still contains
+# valuable info for alpha too
+#
+# For hardware specific information check HARDWARE.TXT
 #
 # $FreeBSD$
 
@@ -50,7 +53,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root device
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
 options 	UCONSOLE		#Allow users to grab the console
 options 	KTRACE			#ktrace(1) syscall trace support
 options 	SYSVSHM			#SYSV-style shared memory
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 9b41f20b4647..6cb62e352534 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -14,7 +14,10 @@
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../i386/conf/LINT configuration file. 
 # If you are in doubt as to the purpose or necessity of a line, check first 
-# in LINT.
+# in LINT. Please note that this is the i386 LINT, but it still contains
+# valuable info for alpha too
+#
+# For hardware specific information check HARDWARE.TXT
 #
 # $FreeBSD$
 
@@ -50,7 +53,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root device
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
 options 	UCONSOLE		#Allow users to grab the console
 options 	KTRACE			#ktrace(1) syscall trace support
 options 	SYSVSHM			#SYSV-style shared memory
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 5c60d0f33e97..f3d09fdda29c 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
+# GENERIC -- Generic kernel configuration file for FreeBSD/i386
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -40,7 +40,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	UCONSOLE		#Allow users to grab the console
 options 	USERCONFIG		#boot -c editor
 options 	VISUAL_USERCONFIG	#visual boot -c editor
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 5c60d0f33e97..f3d09fdda29c 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
+# GENERIC -- Generic kernel configuration file for FreeBSD/i386
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -40,7 +40,7 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	UCONSOLE		#Allow users to grab the console
 options 	USERCONFIG		#boot -c editor
 options 	VISUAL_USERCONFIG	#visual boot -c editor