From 26bc5e6b1b99cdac660d168577ac949fa8bdb028 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 28 Dec 2012 07:19:40 +0000
Subject: [PATCH] zfsadmin is now subsumed into mkpointyhat.  Move its
 description.

---
 en_US.ISO8859-1/articles/portbuild/article.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 0b70a31c98..ef6f275187 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2674,7 +2674,7 @@ sysutils/zfs-stats</programlisting>
 
 	  <screen>&prompt.root; sh /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>/mkportbuild</screen>
 
-	  <para>This will accomplish all the following 4 steps:</para>
+	  <para>This will accomplish all the following 5 steps:</para>
 
 	  <procedure>
 
@@ -2712,6 +2712,12 @@ sysutils/zfs-stats</programlisting>
 	</step>
 <!-- end of whitespace-broken area -->
 
+	    <step>
+	      <para>Set up the <application>zfs</application>
+		<literal>permission set</literal>:</para>
+
+	      <screen>&prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin</screen>
+	    </step>
 	  </procedure>
 
 	</step>
@@ -2809,13 +2815,6 @@ sysutils/zfs-stats</programlisting>
       <title>pre-<application>qmanager</application></title>
 
       <procedure>
-	<step>
-	  <para>As euid root, set up the <application>zfs</application>
-	    <literal>permission set</literal>:</para>
-
-	  <screen>&prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin</screen>
-	</step>
-
 	<step>
 	  <para>For each architecture, follow the steps in
 	    <xref linkend="new-arch-pre-qmanager"/>.</para>