From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 20:21:58 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 75C893ED;
 Fri, 17 May 2013 20:21:58 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4F4F438A;
 Fri, 17 May 2013 20:21:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HKLvLD007798;
 Fri, 17 May 2013 20:21:57 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HKLvhD007797;
 Fri, 17 May 2013 20:21:57 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172021.r4HKLvhD007797@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 20:21:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41652 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 20:21:58 -0000

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>