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
@@ -1145,7 +1145,7 @@
       allocating disk space.</para>
 
     <figure xml:id="bsdinstall-zfs-partmenu">
-      <title>Partitioning Choices on &os; 10.x and Higher</title>
+      <title>Partitioning Choices</title>
 
       <mediaobject>
 	<imageobject>
@@ -1154,17 +1154,36 @@
       </mediaobject>
     </figure>
 
-    <para><literal>Guided</literal> partitioning automatically sets up
-      the disk partitions, <literal>Manual</literal> partitioning
-      allows advanced users to create customized partitions from menu
-      options, and <literal>Shell</literal> opens a shell prompt where
-      advanced users can create customized partitions using
-      command-line utilities like &man.gpart.8;, &man.fdisk.8;, and
-      &man.bsdlabel.8;.  <literal>ZFS</literal> partitioning, only
-      available in &os; 10 and later, creates an optionally encrypted
-      root-on-ZFS system with support for <firstterm>boot
-	environments</firstterm>.</para>
+    <para><application>bsdinstall</application> gives the user four
+      methods for allocating disk space:</para>
 
+    <itemizedlist>
+      <listitem>
+	<para><literal>Auto (UFS)</literal> partitioning
+	  automatically sets up the disk partitions using the
+	  <literal>UFS</literal> file system.</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Manual</literal> partitioning allows
+	  advanced users to create customized partitions from menu
+	  options.</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Shell</literal> opens a shell prompt where
+	  advanced users can create customized partitions using
+	  command-line utilities like &man.gpart.8;, &man.fdisk.8;,
+	  and &man.bsdlabel.8;.</para>
+      </listitem>
+
+      <listitem>
+	<para><literal>Auto (ZFS)</literal> partitioning creates a
+	  root-on-ZFS system with optional GELI encryption support for
+	  <firstterm>boot environments</firstterm>.</para>
+      </listitem>
+    </itemizedlist>
+
     <para>This section describes what to consider when laying out the
       disk partitions.  It then demonstrates how to use the different
       partitioning methods.</para>
@@ -1207,9 +1226,8 @@
 	  <filename>/var/tmp</filename>.  When new software is
 	  installed, the packaging tools extract a temporary copy of
 	  the packages under <filename>/var/tmp</filename>.  Large
-	  software packages, like <application>Firefox</application>,
-	  <application>Apache OpenOffice</application> or
-	  <application>LibreOffice</application> may be tricky to
+	  software packages, like <application>Firefox</application>
+	  or <application>LibreOffice</application> may be tricky to
 	  install if there is not enough disk space under
 	  <filename>/var/tmp</filename>.</para>
       </note>