svn commit: r41652 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks

[Tom Rhodes]

Author: trhodes
Date: Fri May 17 20:21:57 2013
New Revision: 41652
URL: http://svnweb.freebsd.org/changeset/doc/41652

Log:
  Migrate the encypted swap preparation section into
  the introduction and do some wording tweaks to
  remove redundancy.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 20:12:00 2013	(r41651)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 20:21:57 2013	(r41652)
@@ -3845,22 +3845,18 @@ geli_da2_flags="-p -k /root/da2.key"</pr
       <filename>encswap</filename>
       <link linkend="configtuning-rcd">rc.d</link> script.</para>
 
-    <sect2>
-      <title>Preparation</title>
-
-      <note>
-	<para>For the remainder of this section,
-	  <devicename>ad0s1b</devicename> will be the swap
-	  partition.</para>
-      </note>
-
-      <para>By default, swap is unencrypted.  It is possible that it
-	contains passwords or other sensitive data in cleartext.  To
-	rectify this, the data on the swap partition should be
-	overwritten with random garbage:</para>
+    <note>
+      <para>For the remainder of this section,
+	<devicename>ad0s1b</devicename> will be the swap
+	partition.</para>
+    </note>
+
+    <para>Swap partitions are not encrypted by default and should
+      be cleared of any sensitive data before continuing.  To
+      overwrite the current swap parition with random garbage,
+      execute the following command:</para>
 
-      <screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/ad0s1b bs=1m</userinput></screen>
-    </sect2>
+    <screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/<replaceable>ad0s1b</replaceable> bs=1m</userinput></screen>
 
     <sect2>
       <title>Swap Encryption with &man.gbde.8;</title>