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
@@ -1507,17 +1507,19 @@
 	</listitem>
 
 	<listitem>
+	  <para><literal>freebsd-zfs</literal> - A &os;
+	    <acronym>ZFS</acronym> file system.  More information about
+	    ZFS is available in <xref linkend="zfs"/>.</para>
+	</listitem>
+
+	<listitem>
 	  <para><literal>freebsd-swap</literal> - &os; swap
 	    space.</para>
 	</listitem>
       </itemizedlist>
 
-      <para>Another partition type worth noting is
-	<literal>freebsd-zfs</literal>, used for partitions that will
-	contain a &os; <acronym>ZFS</acronym> file system (<xref
-	  linkend="zfs"/>).  Refer to &man.gpart.8; for
-	descriptions of the available <acronym>GPT</acronym> partition
-	types.</para>
+      <para>Refer to &man.gpart.8; for descriptions of the available
+	<acronym>GPT</acronym> partition types.</para>
 
       <para>Multiple file system partitions can be created and some
 	people prefer a traditional layout with separate partitions
@@ -1650,11 +1652,12 @@
 
       <para>After the custom partitions have been created, select
 	<guibutton>[&nbsp;Finish&nbsp;]</guibutton> to continue with
-	the installation.</para>
+	the installation and go to
+	<xref linkend="bsdinstall-fetching-distribution"/>.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-part-zfs">
-      <title>Root-on-ZFS Automatic Partitioning</title>
+      <title>Guided Partitioning Using Root-on-ZFS</title>
 
       <para>Support for automatic creation of root-on-ZFS
 	installations was added in &os; 10.0-RELEASE.  This