From 1ec150b729eb57e1846f12086271022c9b255b1a Mon Sep 17 00:00:00 2001
From: Remko Lodder <remko@FreeBSD.org>
Date: Wed, 9 Nov 2005 20:10:54 +0000
Subject: [PATCH] Correct various issues in the gmirror section.

PR:		docs/86650
Submitted by:	Chris Larsen <darth dot vader dot dk>
Feedback from:	flz
---
 .../books/handbook/geom/chapter.sgml          | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
index 92b5f885e4..924ce97482 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
@@ -267,6 +267,17 @@ XXX: What message?  Put it inside the screen output above.
 
     <screen>&prompt.root; <userinput>gmirror label -vnb round-robin gm0 /dev/da1</userinput></screen>
 
+    <para>The system should respond with:</para>
+    <screen>
+Metadata value stored on /dev/da1.
+Done.</screen>
+
+    <para>Initialize GEOM, this will load the
+      <filename>/boot/kernel/geom_mirror.ko</filename> kernel
+      module:</para>
+
+    <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
+
     <note>
       <para>This command should have created the
 	<filename>gm0</filename>, <filename>gm0s1</filename>,
@@ -276,12 +287,6 @@ XXX: What message?  Put it inside the screen output above.
 	directory.</para>
     </note>
 
-    <para>Initialize GEOM; this will load the
-      <filename>/boot/kernel/geom_mirror.ko</filename> kernel
-      module:</para>
-
-    <screen>&prompt.root; <userinput>geom load</userinput></screen>
-
     <para>Install a generic <command>fdisk</command> label and boot code
       to newly created <filename>gm0</filename> device:</para>
 
@@ -323,9 +328,15 @@ XXX: What message?  Put it inside the screen output above.
       aforementioned command.</para>
 
     <para>Now edit the replicated <filename>/mnt/etc/fstab</filename>
-      file and remove or comment out the swap file.  Change the other
-      file system information to use the new disk.  See the following
-      example:</para>
+      file and remove or comment out the swap file
+      <footnote>
+	<para>It should be noted that commenting out the swap file entry
+	in <filename>fstab</filename> will most likely require you to
+	re-establish a different way of enabling swap space.  Please
+	refer to <xref linkend="adding-swap-space"> for more
+	information.</para>
+      </footnote>.  Change the other file system information to use the
+      new disk.  See the following example:</para>
 
     <programlisting># Device                Mountpoint      FStype  Options         Dump    Pass#
 #/dev/da0s2b             none            swap    sw              0       0
@@ -346,10 +357,10 @@ XXX: What message?  Put it inside the screen output above.
 	new root partition, a failsafe is available.</para>
     </note>
 
-    <para>Now add the following line to
+    <para>Now add the following line to the new
       <filename>/boot/loader.conf:</filename></para>
 
-    <screen>&prompt.root; <userinput>echo 'geom_mirror_load="YES"' &gt;&gt; /boot/loader.conf</userinput></screen>
+    <screen>&prompt.root; <userinput>echo 'geom_mirror_load="YES"' &gt;&gt; /mnt/boot/loader.conf</userinput></screen>
 
     <para>This will instruct &man.loader.8; utility to load the
       <filename>geom_mirror.ko</filename> during system