Remove the old hdX device names, switch to sdX for disks

3 files changed, 21 insertions, 46 deletions

diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index ff7e895eb..584017d15 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -53,11 +53,11 @@ install desktop environments like GNOME or KDE).
 </para><para>
 
 Next, create file systems on the partitions. For example, to create an
-ext3 file system on partition <filename>/dev/hda6</filename> (that's
+ext3 file system on partition <filename>/dev/sda6</filename> (that's
 our example root partition):
 
 <informalexample><screen>
-# mke2fs -j /dev/<replaceable>hda6</replaceable>
+# mke2fs -j /dev/<replaceable>sda6</replaceable>
 </screen></informalexample>
 
 To create an ext2 file system instead, omit <userinput>-j</userinput>.
@@ -68,9 +68,9 @@ Initialize and activate swap (substitute the partition number for
 your intended &debian; swap partition):
 
 <informalexample><screen>
-# mkswap /dev/<replaceable>hda5</replaceable>
+# mkswap /dev/<replaceable>sda5</replaceable>
 # sync
-# swapon /dev/<replaceable>hda5</replaceable>
+# swapon /dev/<replaceable>sda5</replaceable>
 </screen></informalexample>
 
 Mount one partition as <filename>/mnt/debinst</filename> (the
@@ -80,7 +80,7 @@ referenced later below.
 
 <informalexample><screen>
 # mkdir /mnt/debinst
-# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst
+# mount /dev/<replaceable>sda6</replaceable> /mnt/debinst
 </screen></informalexample>
 
 </para>
@@ -552,17 +552,17 @@ Installing and setting up <classname>grub2</classname> is as easy as:
 
 <informalexample><screen>
 # aptitude install grub-pc
-# grub-install /dev/<replaceable>hda</replaceable>
+# grub-install /dev/<replaceable>sda</replaceable>
 # update-grub
 </screen></informalexample>
 
 The second command will install <command>grub2</command> (in this case in
-the MBR of <literal>hda</literal>). The last command will create a sane
+the MBR of <literal>sda</literal>). The last command will create a sane
 and working <filename>/boot/grub/grub.cfg</filename>.
 
 </para><para>
 
-Note that this assumes that a <filename>/dev/hda</filename> device file has
+Note that this assumes that a <filename>/dev/sda</filename> device file has
 been created. There are alternative methods to install <command>grub2</command>,
 but those are outside the scope of this appendix.
 
@@ -571,8 +571,8 @@ but those are outside the scope of this appendix.
 Here is a basic <filename>/etc/lilo.conf</filename> as an example:
 
 <informalexample><screen>
-boot=/dev/<replaceable>hda6</replaceable>
-root=/dev/<replaceable>hda6</replaceable>
+boot=/dev/<replaceable>sda6</replaceable>
+root=/dev/<replaceable>sda6</replaceable>
 install=menu
 delay=20
 lba32
@@ -596,10 +596,10 @@ use <filename>yaboot.conf</filename> relative to the system you call it from).
 Here is a basic <filename>/etc/yaboot.conf</filename> as an example:
 
 <informalexample><screen>
-boot=/dev/hda2
+boot=/dev/sda2
 device=hd:
 partition=6
-root=/dev/hda6
+root=/dev/sda6
 magicboot=/usr/lib/yaboot/ofboot
 timeout=50
 image=/vmlinux
diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index e389071a7..6b4456971 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -28,52 +28,27 @@ The most important device files are listed in the tables below.
 
 <informaltable><tgroup cols="2"><tbody>
 <row>
-  <entry><filename>hda</filename></entry>
-  <entry>IDE Hard disk / CD-ROM on the first IDE port (Master)</entry>
-</row><row>
-  <entry><filename>hdb</filename></entry>
-  <entry>IDE Hard disk / CD-ROM on the first IDE port (Slave)</entry>
-</row><row>
-  <entry><filename>hdc</filename></entry>
-  <entry>IDE Hard disk / CD-ROM on the second IDE port (Master)</entry>
-</row><row>
-  <entry><filename>hdd</filename></entry>
-  <entry>IDE Hard disk / CD-ROM on the second IDE port (Slave)</entry>
-</row><row>
-  <entry><filename>hda1</filename></entry>
-  <entry>First partition of the first IDE hard disk</entry>
-</row><row>
-  <entry><filename>hdd15</filename></entry>
-  <entry>Fifteenth partition of the fourth IDE hard disk</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<informaltable><tgroup cols="2"><tbody>
-<row>
   <entry><filename>sda</filename></entry>
-  <entry>SCSI Hard disk with lowest SCSI ID (e.g. 0)</entry>
+  <entry>First hard disk</entry>
 </row><row>
   <entry><filename>sdb</filename></entry>
-  <entry>SCSI Hard disk with next higher SCSI ID (e.g. 1)</entry>
-</row><row>
-  <entry><filename>sdc</filename></entry>
-  <entry>SCSI Hard disk with next higher SCSI ID (e.g. 2)</entry>
+  <entry>Second hard disk</entry>
 </row><row>
   <entry><filename>sda1</filename></entry>
-  <entry>First partition of the first SCSI hard disk</entry>
+  <entry>First partition of the first hard disk</entry>
 </row><row>
-  <entry><filename>sdd10</filename></entry>
-  <entry>Tenth partition of the fourth SCSI hard disk</entry>
+  <entry><filename>sdb7</filename></entry>
+  <entry>Seventh partition of the second hard disk</entry>
 </row>
 </tbody></tgroup></informaltable>
 
 <informaltable><tgroup cols="2"><tbody>
 <row>
   <entry><filename>sr0</filename></entry>
-  <entry>SCSI CD-ROM with the lowest SCSI ID</entry>
+  <entry>First CD-ROM</entry>
 </row><row>
   <entry><filename>sr1</filename></entry>
-  <entry>SCSI CD-ROM with the next higher SCSI ID</entry>
+  <entry>Second CD-ROM</entry>
 </row>
 </tbody></tgroup></informaltable>
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index d726ecd16..cdfffa05d 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1130,8 +1130,8 @@ correct one will be selected before using preseeding.
 
 # Alternatively, you may specify a disk to partition. If the system has only
 # one disk the installer will default to using that, but otherwise the device
-# name must be given in traditional, non-devfs format (so e.g. /dev/hda or
-# /dev/sda, and not e.g. /dev/discs/disc0/disc).
+# name must be given in traditional, non-devfs format (so e.g. /dev/sda
+# and not e.g. /dev/discs/disc0/disc).
 # For example, to use the first SCSI/SATA hard disk:
 #d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.