Index: head/en_US.ISO8859-1/books/handbook/Makefile
===================================================================
--- head/en_US.ISO8859-1/books/handbook/Makefile
+++ head/en_US.ISO8859-1/books/handbook/Makefile
@@ -73,6 +73,7 @@
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-entire-part.png
+IMAGES_EN+= bsdinstall/bsdinstall-ufs-warning.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-guided-disk.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-guided-manual.png
 IMAGES_EN+= bsdinstall/bsdinstall-part-manual-addpart.png
Index: head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -1275,7 +1275,7 @@
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-guided">
-      <title>Guided Partitioning</title>
+      <title>Guided Partitioning Using UFS</title>
 
       <para>When this method is selected, a menu will display the
 	available disk(s).  If multiple disks are connected, choose
@@ -1312,6 +1312,40 @@
 	</mediaobject>
       </figure>
 
+      <para>After
+	<guibutton>[&nbsp;Entire&nbsp;Disk&nbsp;]</guibutton> is
+	chosen <application>bsdinstall</application> displays a
+	dialog indicating that the disk will be erased.</para>
+
+      <figure xml:id="bsdinstall-ufs-warning">
+	<title>Confirmation</title>
+
+        <mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-ufs-warning"/>
+	  </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The next menu shows a list with the partition schemes
+	types.  GPT is usually the most appropriate choice for amd64
+	computers.  Older computers that are not compatible with GPT
+	should use MBR.  The other partition schemes are generally
+	used for uncommon or older computers.  More information is
+	available in <xref linkend="partition-schemes"/>.</para>
+
+      <figure xml:id="bsdinstall-ufs-scheme">
+	<title>Select Partition Scheme</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
       <para>After the partition layout has been created, review it to
 	ensure it meets the needs of the installation.  Selecting
 	<guibutton>[&nbsp;Revert&nbsp;]</guibutton> will reset the
@@ -1331,6 +1365,30 @@
 	  </imageobject>
 	</mediaobject>
       </figure>
+
+      <para>Once the disks are configured, the next menu provides the
+	last chance to make changes before the selected drives are
+	formatted.  If changes need to be made, select
+	<guibutton>[&nbsp;Back&nbsp;]</guibutton> to return to the
+	main partitioning menu.
+      	<guibutton>[&nbsp;Revert&nbsp;&amp;&nbsp;Exit&nbsp;]</guibutton>
+	exits the installer without making any changes to the drive.
+	Select <guibutton>[&nbsp;Commit&nbsp;]</guibutton> to start
+	the installation process.</para>
+
+      <figure xml:id="bsdinstall-ufs-final-confirmation">
+	<title>Final Confirmation</title>
+
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-final-confirmation"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+
+    <para>To continue with the installation process go to
+      <xref linkend="bsdinstall-fetching-distribution"/>.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-manual">
@@ -1371,7 +1429,7 @@
 	<acronym>MBR</acronym>.  The other partition schemes are
 	generally used for uncommon or older computers.</para>
 
-      <table frame="none" rowsep="1" pgwide="1">
+      <table xml:id="partition-schemes" frame="none" rowsep="1" pgwide="1">
 	<title>Partitioning Schemes</title>
 
 	<tgroup cols="2" align="left">
@@ -1770,40 +1828,18 @@
     </sect2>
   </sect1>
 
-  <sect1 xml:id="bsdinstall-final-warning">
-    <title>Committing to the Installation</title>
+  <sect1 xml:id="bsdinstall-fetching-distribution">
+    <title>Fetching Distribution Files</title>
 
-    <para>Once the disks are configured, the next menu provides the
-      last chance to make changes before the selected hard drive(s)
-      are formatted.  If changes need to be made, select
-      <guibutton>[&nbsp;Back&nbsp;]</guibutton> to return to the main
-      partitioning menu.
-      <guibutton>[&nbsp;Revert&nbsp;&amp;&nbsp;Exit&nbsp;]</guibutton>
-      will exit the installer without making any changes to the hard
-      drive.</para>
-
-    <figure xml:id="bsdinstall-final-confirmation">
-      <title>Final Confirmation</title>
-
-      <mediaobject>
-	<imageobject>
-	  <imagedata
-	    fileref="bsdinstall/bsdinstall-final-confirmation"/>
-	</imageobject>
-      </mediaobject>
-    </figure>
-
-    <para>To instead start the actual installation, select
-      <guibutton>[&nbsp;Commit&nbsp;]</guibutton> and press
-      <keycap>Enter</keycap>.</para>
-
     <para>Installation time will vary depending on the distributions
       chosen, installation media, and speed of the computer.  A series
       of messages will indicate the progress.</para>
 
     <para>First, the installer formats the selected disk(s) and
-      initializes the partitions.  Next, in the case of a bootonly
-      media, it downloads the selected components:</para>
+      initializes the partitions.  Next, in the case of a
+      <literal>bootonly media</literal> or
+      <literal>mini memstick</literal>, it downloads the selected
+      components:</para>
 
     <figure xml:id="bsdinstall-distfile-fetching">
       <title>Fetching Distribution Files</title>