Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Apr 2014 16:01:18 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r44695 - in head/en_US.ISO8859-1/books/handbook: basics disks
Message-ID:  <201404291601.s3TG1IpJ012681@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Tue Apr 29 16:01:17 2014
New Revision: 44695
URL: http://svnweb.freebsd.org/changeset/doc/44695

Log:
  Move contents of 18.1 to Table 4.3. The contents were duplicate and belong
  in the Basics section.
  Remove diskonchip flash entry as it is no longer included in a supported version.
  The page holding Table 4.3 still needs a tech review as it is outdated.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  head/en_US.ISO8859-1/books/handbook/disks/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Apr 29 15:23:56 2014	(r44694)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Apr 29 16:01:17 2014	(r44695)
@@ -2532,7 +2532,7 @@ root     5211  0.0  0.2  3620  1724   2 
       starts with a code that indicates the type of disk, and then a
       number, indicating which disk it is.  Unlike slices, disk
       numbering starts at 0.  Common codes are listed in
-      <xref linkend="basics-dev-codes"/>.</para>
+      <xref linkend="disks-naming"/>.</para>
 
     <para>When referring to a partition, include the disk name,
       <literal>s</literal>, the slice number, and then the partition
@@ -2547,8 +2547,8 @@ root     5211  0.0  0.2  3620  1724   2 
       system or swap space in each partition, and decide where each
       file system will be mounted.</para>
 
-    <table frame="none" pgwide="1" xml:id="basics-dev-codes">
-      <title>Disk Device Codes</title>
+    <table frame="none" pgwide="1" xml:id="disks-naming">
+      <title>Disk Device Names</title>
 
       <tgroup cols="2">
 	<colspec colwidth="1*"/>
@@ -2556,35 +2556,70 @@ root     5211  0.0  0.2  3620  1724   2 
 
 	<thead>
 	  <row>
-	    <entry>Code</entry>
-	    <entry>Meaning</entry>
+	    <entry>Drive Type</entry>
+	    <entry>Drive Device Name</entry>
 	  </row>
 	</thead>
 
 	<tbody>
 	  <row>
-	    <entry><filename>ad</filename></entry>
-	    <entry>ATAPI (IDE) disk</entry>
+	    <entry><acronym>IDE</acronym> and <acronym>SATA</acronym> hard drives</entry>
+	    <entry><literal>ad</literal> or
+	      <literal>ada</literal></entry>
 	  </row>
 
 	  <row>
-	    <entry><filename>da</filename></entry>
-	    <entry>SCSI direct access disk</entry>
+	    <entry><acronym>SCSI</acronym> hard drives and
+	      <acronym>USB</acronym> storage
+	      devices</entry>
+	    <entry><literal>da</literal></entry>
 	  </row>
 
 	  <row>
-	    <entry><filename>acd</filename></entry>
-	    <entry>ATAPI (IDE) CDROM</entry>
+	    <entry><acronym>IDE</acronym> and <acronym>SATA</acronym> <acronym>CD-ROM</acronym>
+	      drives</entry>
+	    <entry><literal>acd</literal> or
+	      <literal>cd</literal></entry>
 	  </row>
 
 	  <row>
-	    <entry><filename>cd</filename></entry>
-	    <entry>SCSI CDROM</entry>
+	    <entry><acronym>SCSI</acronym> <acronym>CD-ROM</acronym>
+	      drives</entry>
+	    <entry><literal>cd</literal></entry>
 	  </row>
 
 	  <row>
-	    <entry><filename>fd</filename></entry>
-	    <entry>Floppy disk</entry>
+	    <entry>Floppy drives</entry>
+	    <entry><literal>fd</literal></entry>
+	  </row>
+
+	  <row>
+	    <entry>Assorted non-standard <acronym>CD-ROM</acronym>
+	      drives</entry>
+	    <entry><literal>mcd</literal> for Mitsumi
+	      <acronym>CD-ROM</acronym> and
+	      <literal>scd</literal> for Sony
+	      <acronym>CD-ROM</acronym> devices</entry>
+	  </row>
+
+	  <row>
+	    <entry><acronym>SCSI</acronym> tape drives</entry>
+	    <entry><literal>sa</literal></entry>
+	  </row>
+
+	  <row>
+	    <entry><acronym>IDE</acronym> tape drives</entry>
+	    <entry><literal>ast</literal></entry>
+	  </row>
+
+	  <row>
+	    <entry>RAID drives</entry>
+	    <entry>Examples include <literal>aacd</literal> for &adaptec; AdvancedRAID,
+	      <literal>mlxd</literal> and <literal>mlyd</literal>
+	      for &mylex;,
+	      <literal>amrd</literal> for AMI &megaraid;,
+	      <literal>idad</literal> for Compaq Smart RAID,
+	      <literal>twed</literal> for &tm.3ware; RAID.</entry>
 	  </row>
 	</tbody>
       </tgroup>

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Tue Apr 29 15:23:56 2014	(r44694)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Tue Apr 29 16:01:17 2014	(r44695)
@@ -24,11 +24,6 @@
 
     <itemizedlist>
       <listitem>
-	<para>The terminology &os; uses to describe the organization
-	  of data on a physical disk.</para>
-      </listitem>
-
-      <listitem>
 	<para>How to add additional hard disks to a &os;
 	  system.</para>
       </listitem>
@@ -87,107 +82,6 @@
     </itemizedlist>
   </sect1>
 
-  <sect1 xml:id="disks-naming">
-    <title>Device Names</title>
-
-    <para>The following is a list of physical storage devices
-      supported in &os; and their associated device names.</para>
-
-    <table xml:id="disk-naming-physical-table" frame="none">
-      <title>Physical Disk Naming Conventions</title>
-
-      <tgroup cols="2">
-	<thead>
-	  <row>
-	    <entry>Drive type</entry>
-	    <entry>Drive device name</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><acronym>IDE</acronym> hard drives</entry>
-	    <entry><literal>ad</literal> or
-	      <literal>ada</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>IDE</acronym> <acronym>CD-ROM</acronym>
-	      drives</entry>
-	    <entry><literal>acd</literal> or
-	      <literal>cd</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>SATA</acronym> hard drives</entry>
-	    <entry><literal>ad</literal> or
-	      <literal>ada</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>SATA</acronym> <acronym>CD-ROM</acronym>
-	      drives</entry>
-	    <entry><literal>acd</literal> or
-	      <literal>cd</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>SCSI</acronym> hard drives and
-	      <acronym>USB</acronym> Mass storage
-	      devices</entry>
-	    <entry><literal>da</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>SCSI</acronym> <acronym>CD-ROM</acronym>
-	      drives</entry>
-	    <entry><literal>cd</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry>Assorted non-standard <acronym>CD-ROM</acronym>
-	      drives</entry>
-	    <entry><literal>mcd</literal> for Mitsumi
-	      <acronym>CD-ROM</acronym> and
-	      <literal>scd</literal> for Sony
-	      <acronym>CD-ROM</acronym> devices</entry>
-	  </row>
-
-	  <row>
-	    <entry>Floppy drives</entry>
-	    <entry><literal>fd</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>SCSI</acronym> tape drives</entry>
-	    <entry><literal>sa</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry><acronym>IDE</acronym> tape drives</entry>
-	    <entry><literal>ast</literal></entry>
-	  </row>
-
-	  <row>
-	    <entry>Flash drives</entry>
-	    <entry><literal>fla</literal> for &diskonchip; Flash
-	      device</entry>
-	  </row>
-
-	  <row>
-	    <entry>RAID drives</entry>
-	    <entry><literal>aacd</literal> for &adaptec; AdvancedRAID,
-	      <literal>mlxd</literal> and <literal>mlyd</literal>
-	      for &mylex;,
-	      <literal>amrd</literal> for AMI &megaraid;,
-	      <literal>idad</literal> for Compaq Smart RAID,
-	      <literal>twed</literal> for &tm.3ware; RAID.</entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </table>
-  </sect1>
-
   <sect1 xml:id="disks-adding">
     <info>
       <title>Adding Disks</title>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404291601.s3TG1IpJ012681>