Doc fixes for CAM devices. If I ever truly understand the logic behind

this name change, I'll be a happy man.

14 files changed, 82 insertions, 82 deletions

diff --git a/release/floppies/boot/mfs/Makefile b/release/floppies/boot/mfs/Makefile
index 6a2032d..95af0b6 100644
--- a/release/floppies/boot/mfs/Makefile
+++ b/release/floppies/boot/mfs/Makefile
@@ -1,5 +1,5 @@
 ###
-#	$Id: Makefile,v 1.5 1997/07/16 12:24:24 julian Exp $
+#	$Id: Makefile,v 1.5 1997/07/22 02:51:01 julian Exp $
 #
 # What are we if we weren't told..
 CRUNCHDIRS= ../crunch
@@ -12,8 +12,8 @@ ZIP=false
 # the directories you want on the fs
 STANDLINKS=		bin sbin
 FS_DIRS=		dev stand etc mnt mnt1 mnt2 tmp
-FS_DEVICES= std wd0 wd1 wd2 sd0 sd1 sd2 cuaa0 cuaa1 cuaa2 cuaa3 \
-	fd0 fd1 cd0 mcd0 scd0 matcd0 wcd0 st0 ft0 wt0 vty4
+FS_DEVICES= std wd0 wd1 wd2 da0 da1 da2 cuaa0 cuaa1 cuaa2 cuaa3 \
+	fd0 fd1 cd0 mcd0 scd0 matcd0 wcd0 sa0 ft0 wt0 vty4
 # a subdir that contains a verbatim image to be copied to the fs
 VERBATIM=	../verbatim
 
diff --git a/release/sysinstall/help/partition.hlp b/release/sysinstall/help/partition.hlp
index 8e07d3d..37520bf 100644
--- a/release/sysinstall/help/partition.hlp
+++ b/release/sysinstall/help/partition.hlp
@@ -72,16 +72,16 @@ looking at disk storage works:
 
 
 In FreeBSD's new system, a device name can be broken up into up to 3
-parts.  Take a typical name like ``/dev/sd0s1a'':
+parts.  Take a typical name like ``/dev/da0s1a'':
 
       The first three characters represent the drive name.  If we had
-      a system with two SCSI drives on it then we'd see /dev/sd0 and
-      /dev/sd1 as the device entries representing the entire drives.
+      a system with two SCSI drives on it then we'd see /dev/da0 and
+      /dev/da1 as the device entries representing the entire drives.
 
       Next you have the "slice" (or "FDISK Partition") number,
-      as seen in the Partition Editor.  Assuming that our sd0
+      as seen in the Partition Editor.  Assuming that our da0
       contained two slices, a FreeBSD slice and a DOS slice, that
-      would give us /dev/sd0s1 and /dev/sd0s2 as device entries pointing
+      would give us /dev/da0s1 and /dev/da0s2 as device entries pointing
       to the entire slices.
 
       Next, if a slice is a FreeBSD slice, you can have a number of
@@ -89,13 +89,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
       These partitions are where various filesystems or swap areas live,
       and using our hypothetical two-SCSI-disk machine again, we might
-      have something like the following layout on sd0:
+      have something like the following layout on da0:
 
               Name            Mountpoint
               ----            ----------
-              sd0s1a          /
-              sd0s1b          <swap space>
-              sd0s1e          /usr
+              da0s1a          /
+              da0s1b          <swap space>
+              da0s1e          /usr
 
       Because of historical convention, there is also a short-cut,
       or "compatibility slice", that is maintained for easy access
@@ -108,13 +108,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
               Name            Mountpoint
               ----            ----------
-              sd0a            /
-              sd0b            <swap space>
-              sd0e            /usr
+              da0a            /
+              da0b            <swap space>
+              da0e            /usr
 
       Again, let it be noted: FreeBSD automatically maps the
       compatibility slice to the first FreeBSD slice it finds
-      (in this case, sd0s1).  You may have multiple FreeBSD slices on a
+      (in this case, da0s1).  You may have multiple FreeBSD slices on a
       drive, but only the first one will be mapped to the compatibility
       slice!
 
diff --git a/release/sysinstall/help/shortcuts.hlp b/release/sysinstall/help/shortcuts.hlp
index 40cd1a4..503a2a7 100644
--- a/release/sysinstall/help/shortcuts.hlp
+++ b/release/sysinstall/help/shortcuts.hlp
@@ -15,7 +15,7 @@ browserBinary           Which doc browser to use (default: lynx)
 browserPackage          Which package to get browser from (default: lynx)
 cpioVerbose             How verbose to be with cpio: high, medium or low
 debug                   Extra debugging?
-disk                    Which disk to operate on (wd0, sd0, etc).
+disk                    Which disk to operate on (wd0, da0, etc).
 domainname              Domain name
 editor                  Which screen editor to use
 ifconfig_<iface>        For each <iface> in network_devices
@@ -106,9 +106,9 @@ Examples:
 Selects an FTP site and then goes to the package configuration menu.
 
 
-/stand/sysinstall       disk=sd0 diskPartitionEditor
+/stand/sysinstall       disk=da0 diskPartitionEditor
 
-Invokes the disk partition editor on disk sd0.
+Invokes the disk partition editor on disk da0.
 
 
 If /stand/sysinstall is linked to another filename, say
diff --git a/release/sysinstall/install.cfg b/release/sysinstall/install.cfg
index 478156d..0949fd3 100644
--- a/release/sysinstall/install.cfg
+++ b/release/sysinstall/install.cfg
@@ -74,12 +74,12 @@ diskLabelEditor
 
 ################################
 # And the 3rd.
-disk=sd0
+disk=da0
 partition=exclusive
 diskPartitionEditor
 
-sd0s1-1=swap 40960 none
-sd0s1-2=ufs 0 /tmp
+da0s1-1=swap 40960 none
+da0s1-2=ufs 0 /tmp
 diskLabelEditor
 ################################
 
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index 336750f..1e1a90e 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.10 1998/07/21 06:44:42 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.11 1998/10/12 23:53:57 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -280,9 +280,9 @@ the script.
 For example, let's say you have a SCSI disk on which you've created a new
 FreeBSD partition in slice 2 (your DOS partition residing in slice 1).
 The slice name would be
-.Ar sd0s2
+.Ar da0s2
 for the whole FreeBSD partition (
-.Ar sd0s1
+.Ar da0s1
 being your DOS primary
 partition).  Now let's further assume that you have 500MB in this
 partition and you want to sub-partition that space into root, swap,
@@ -290,13 +290,13 @@ var and usr file systems for FreeBSD.  Your invocation of the
 .Ar diskLabelEditor
 function might involve setting the following variables:
 .Bl -tag -width findx
-.It Li "sd0s2-1=ufs 40960 /"
+.It Li "da0s2-1=ufs 40960 /"
 A 20MB root file system (all sizes are in 512 byte blocks).
-.It Li "sd0s2-2=swap 131072 /"
+.It Li "da0s2-2=swap 131072 /"
 A 64MB swap partition.
-.It Li "sd0s2-3=ufs 204800 /var"
+.It Li "da0s2-3=ufs 204800 /var"
 A 100MB /var file system.
-.It Li "sd0s2-4=ufs 0 /usr"
+.It Li "da0s2-4=ufs 0 /usr"
 With the balance of free space (around 316MB) going to the /usr
 file system.
 .El
@@ -311,7 +311,7 @@ entry is created for it in the new installation.  Before calling the
 .Ar diskLabelEditor
 function, we simply add an additional line:
 .nf
-	sd0s1=/dos_c N
+	da0s1=/dos_c N
 
 .fi
 before the call.  This tells the label editor that you want to mount
diff --git a/release/texts/INSTALL.TXT b/release/texts/INSTALL.TXT
index dfc1697..3a7c5cf 100644
--- a/release/texts/INSTALL.TXT
+++ b/release/texts/INSTALL.TXT
@@ -266,7 +266,7 @@ the distributions you're interested in, simply tar them onto the tape
 with a command something like this:
 
         cd /where/you/have/your/dists
-        tar cvf /dev/rwt0 (or /dev/rst0) dist1 .. dist2
+        tar cvf /dev/rwt0 (or /dev/rsa0) dist1 .. dist2
 
 When you go to do the installation, you should also make sure that you
 leave enough room in some temporary directory (which you'll be allowed
diff --git a/release/texts/TROUBLE.TXT b/release/texts/TROUBLE.TXT
index ca374ca..c3fed34 100644
--- a/release/texts/TROUBLE.TXT
+++ b/release/texts/TROUBLE.TXT
@@ -221,7 +221,7 @@ A: These CD-ROM drives are currently not supported by FreeBSD.  The command
 
 
 Q: I'm trying to install from a tape drive but all I get is something like:
-        st0(aha0:1:0) NOT READY csi 40,0,0,0
+        sa0(aha0:1:0) NOT READY csi 40,0,0,0
    on the screen.  Help!
 
 A: There's a limitation in the current sysinstall that the tape MUST
@@ -230,7 +230,7 @@ A: There's a limitation in the current sysinstall that the tape MUST
 
 
 Q: I've installed FreeBSD onto my system, but it hangs when booting from 
-   the hard drive with the message: ``Changing root to /dev/sd0a''.
+   the hard drive with the message: ``Changing root to /dev/da0a''.
 
 A: This problem may occur in a system with a 3com 3c509 Ethernet adaptor.
    The ep0 device driver appears to be sensitive to probes for other
diff --git a/release/texts/i386/INSTALL.TXT b/release/texts/i386/INSTALL.TXT
index dfc1697..3a7c5cf 100644
--- a/release/texts/i386/INSTALL.TXT
+++ b/release/texts/i386/INSTALL.TXT
@@ -266,7 +266,7 @@ the distributions you're interested in, simply tar them onto the tape
 with a command something like this:
 
         cd /where/you/have/your/dists
-        tar cvf /dev/rwt0 (or /dev/rst0) dist1 .. dist2
+        tar cvf /dev/rwt0 (or /dev/rsa0) dist1 .. dist2
 
 When you go to do the installation, you should also make sure that you
 leave enough room in some temporary directory (which you'll be allowed
diff --git a/usr.sbin/sade/help/partition.hlp b/usr.sbin/sade/help/partition.hlp
index 8e07d3d..37520bf 100644
--- a/usr.sbin/sade/help/partition.hlp
+++ b/usr.sbin/sade/help/partition.hlp
@@ -72,16 +72,16 @@ looking at disk storage works:
 
 
 In FreeBSD's new system, a device name can be broken up into up to 3
-parts.  Take a typical name like ``/dev/sd0s1a'':
+parts.  Take a typical name like ``/dev/da0s1a'':
 
       The first three characters represent the drive name.  If we had
-      a system with two SCSI drives on it then we'd see /dev/sd0 and
-      /dev/sd1 as the device entries representing the entire drives.
+      a system with two SCSI drives on it then we'd see /dev/da0 and
+      /dev/da1 as the device entries representing the entire drives.
 
       Next you have the "slice" (or "FDISK Partition") number,
-      as seen in the Partition Editor.  Assuming that our sd0
+      as seen in the Partition Editor.  Assuming that our da0
       contained two slices, a FreeBSD slice and a DOS slice, that
-      would give us /dev/sd0s1 and /dev/sd0s2 as device entries pointing
+      would give us /dev/da0s1 and /dev/da0s2 as device entries pointing
       to the entire slices.
 
       Next, if a slice is a FreeBSD slice, you can have a number of
@@ -89,13 +89,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
       These partitions are where various filesystems or swap areas live,
       and using our hypothetical two-SCSI-disk machine again, we might
-      have something like the following layout on sd0:
+      have something like the following layout on da0:
 
               Name            Mountpoint
               ----            ----------
-              sd0s1a          /
-              sd0s1b          <swap space>
-              sd0s1e          /usr
+              da0s1a          /
+              da0s1b          <swap space>
+              da0s1e          /usr
 
       Because of historical convention, there is also a short-cut,
       or "compatibility slice", that is maintained for easy access
@@ -108,13 +108,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
               Name            Mountpoint
               ----            ----------
-              sd0a            /
-              sd0b            <swap space>
-              sd0e            /usr
+              da0a            /
+              da0b            <swap space>
+              da0e            /usr
 
       Again, let it be noted: FreeBSD automatically maps the
       compatibility slice to the first FreeBSD slice it finds
-      (in this case, sd0s1).  You may have multiple FreeBSD slices on a
+      (in this case, da0s1).  You may have multiple FreeBSD slices on a
       drive, but only the first one will be mapped to the compatibility
       slice!
 
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 336750f..1e1a90e 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.10 1998/07/21 06:44:42 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.11 1998/10/12 23:53:57 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -280,9 +280,9 @@ the script.
 For example, let's say you have a SCSI disk on which you've created a new
 FreeBSD partition in slice 2 (your DOS partition residing in slice 1).
 The slice name would be
-.Ar sd0s2
+.Ar da0s2
 for the whole FreeBSD partition (
-.Ar sd0s1
+.Ar da0s1
 being your DOS primary
 partition).  Now let's further assume that you have 500MB in this
 partition and you want to sub-partition that space into root, swap,
@@ -290,13 +290,13 @@ var and usr file systems for FreeBSD.  Your invocation of the
 .Ar diskLabelEditor
 function might involve setting the following variables:
 .Bl -tag -width findx
-.It Li "sd0s2-1=ufs 40960 /"
+.It Li "da0s2-1=ufs 40960 /"
 A 20MB root file system (all sizes are in 512 byte blocks).
-.It Li "sd0s2-2=swap 131072 /"
+.It Li "da0s2-2=swap 131072 /"
 A 64MB swap partition.
-.It Li "sd0s2-3=ufs 204800 /var"
+.It Li "da0s2-3=ufs 204800 /var"
 A 100MB /var file system.
-.It Li "sd0s2-4=ufs 0 /usr"
+.It Li "da0s2-4=ufs 0 /usr"
 With the balance of free space (around 316MB) going to the /usr
 file system.
 .El
@@ -311,7 +311,7 @@ entry is created for it in the new installation.  Before calling the
 .Ar diskLabelEditor
 function, we simply add an additional line:
 .nf
-	sd0s1=/dos_c N
+	da0s1=/dos_c N
 
 .fi
 before the call.  This tells the label editor that you want to mount
diff --git a/usr.sbin/sysinstall/help/partition.hlp b/usr.sbin/sysinstall/help/partition.hlp
index 8e07d3d..37520bf 100644
--- a/usr.sbin/sysinstall/help/partition.hlp
+++ b/usr.sbin/sysinstall/help/partition.hlp
@@ -72,16 +72,16 @@ looking at disk storage works:
 
 
 In FreeBSD's new system, a device name can be broken up into up to 3
-parts.  Take a typical name like ``/dev/sd0s1a'':
+parts.  Take a typical name like ``/dev/da0s1a'':
 
       The first three characters represent the drive name.  If we had
-      a system with two SCSI drives on it then we'd see /dev/sd0 and
-      /dev/sd1 as the device entries representing the entire drives.
+      a system with two SCSI drives on it then we'd see /dev/da0 and
+      /dev/da1 as the device entries representing the entire drives.
 
       Next you have the "slice" (or "FDISK Partition") number,
-      as seen in the Partition Editor.  Assuming that our sd0
+      as seen in the Partition Editor.  Assuming that our da0
       contained two slices, a FreeBSD slice and a DOS slice, that
-      would give us /dev/sd0s1 and /dev/sd0s2 as device entries pointing
+      would give us /dev/da0s1 and /dev/da0s2 as device entries pointing
       to the entire slices.
 
       Next, if a slice is a FreeBSD slice, you can have a number of
@@ -89,13 +89,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
       These partitions are where various filesystems or swap areas live,
       and using our hypothetical two-SCSI-disk machine again, we might
-      have something like the following layout on sd0:
+      have something like the following layout on da0:
 
               Name            Mountpoint
               ----            ----------
-              sd0s1a          /
-              sd0s1b          <swap space>
-              sd0s1e          /usr
+              da0s1a          /
+              da0s1b          <swap space>
+              da0s1e          /usr
 
       Because of historical convention, there is also a short-cut,
       or "compatibility slice", that is maintained for easy access
@@ -108,13 +108,13 @@ parts.  Take a typical name like ``/dev/sd0s1a'':
 
               Name            Mountpoint
               ----            ----------
-              sd0a            /
-              sd0b            <swap space>
-              sd0e            /usr
+              da0a            /
+              da0b            <swap space>
+              da0e            /usr
 
       Again, let it be noted: FreeBSD automatically maps the
       compatibility slice to the first FreeBSD slice it finds
-      (in this case, sd0s1).  You may have multiple FreeBSD slices on a
+      (in this case, da0s1).  You may have multiple FreeBSD slices on a
       drive, but only the first one will be mapped to the compatibility
       slice!
 
diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp
index 40cd1a4..503a2a7 100644
--- a/usr.sbin/sysinstall/help/shortcuts.hlp
+++ b/usr.sbin/sysinstall/help/shortcuts.hlp
@@ -15,7 +15,7 @@ browserBinary           Which doc browser to use (default: lynx)
 browserPackage          Which package to get browser from (default: lynx)
 cpioVerbose             How verbose to be with cpio: high, medium or low
 debug                   Extra debugging?
-disk                    Which disk to operate on (wd0, sd0, etc).
+disk                    Which disk to operate on (wd0, da0, etc).
 domainname              Domain name
 editor                  Which screen editor to use
 ifconfig_<iface>        For each <iface> in network_devices
@@ -106,9 +106,9 @@ Examples:
 Selects an FTP site and then goes to the package configuration menu.
 
 
-/stand/sysinstall       disk=sd0 diskPartitionEditor
+/stand/sysinstall       disk=da0 diskPartitionEditor
 
-Invokes the disk partition editor on disk sd0.
+Invokes the disk partition editor on disk da0.
 
 
 If /stand/sysinstall is linked to another filename, say
diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg
index 478156d..0949fd3 100644
--- a/usr.sbin/sysinstall/install.cfg
+++ b/usr.sbin/sysinstall/install.cfg
@@ -74,12 +74,12 @@ diskLabelEditor
 
 ################################
 # And the 3rd.
-disk=sd0
+disk=da0
 partition=exclusive
 diskPartitionEditor
 
-sd0s1-1=swap 40960 none
-sd0s1-2=ufs 0 /tmp
+da0s1-1=swap 40960 none
+da0s1-2=ufs 0 /tmp
 diskLabelEditor
 ################################
 
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index 336750f..1e1a90e 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.10 1998/07/21 06:44:42 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.11 1998/10/12 23:53:57 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -280,9 +280,9 @@ the script.
 For example, let's say you have a SCSI disk on which you've created a new
 FreeBSD partition in slice 2 (your DOS partition residing in slice 1).
 The slice name would be
-.Ar sd0s2
+.Ar da0s2
 for the whole FreeBSD partition (
-.Ar sd0s1
+.Ar da0s1
 being your DOS primary
 partition).  Now let's further assume that you have 500MB in this
 partition and you want to sub-partition that space into root, swap,
@@ -290,13 +290,13 @@ var and usr file systems for FreeBSD.  Your invocation of the
 .Ar diskLabelEditor
 function might involve setting the following variables:
 .Bl -tag -width findx
-.It Li "sd0s2-1=ufs 40960 /"
+.It Li "da0s2-1=ufs 40960 /"
 A 20MB root file system (all sizes are in 512 byte blocks).
-.It Li "sd0s2-2=swap 131072 /"
+.It Li "da0s2-2=swap 131072 /"
 A 64MB swap partition.
-.It Li "sd0s2-3=ufs 204800 /var"
+.It Li "da0s2-3=ufs 204800 /var"
 A 100MB /var file system.
-.It Li "sd0s2-4=ufs 0 /usr"
+.It Li "da0s2-4=ufs 0 /usr"
 With the balance of free space (around 316MB) going to the /usr
 file system.
 .El
@@ -311,7 +311,7 @@ entry is created for it in the new installation.  Before calling the
 .Ar diskLabelEditor
 function, we simply add an additional line:
 .nf
-	sd0s1=/dos_c N
+	da0s1=/dos_c N
 
 .fi
 before the call.  This tells the label editor that you want to mount