docs/86650: [patch] correct various issues in the handbook entry geom/chapter.sgml (gmirror section)

[Chris Larsen]

>Number:         86650
>Category:       docs
>Synopsis:       [patch] correct various issues in the handbook entry geom/chapter.sgml (gmirror section)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 27 21:10:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Chris Larsen
>Release:        FreeBSD 6.0-BETA5 amd64
>Organization:
The Empire
>Environment:

>Description:
Order of commands issued and result is inconsistent.
Some minor typos.
Swap space removed, should reference how to re-establish that.

>How-To-Repeat:
Read the handbook section:  RAID1 - Mirroring
>Fix:

- add expected output when correctly applying gmirror
- the device entries do not appear after 'gmirror label' but first after 'gmirror load' (move para)
- 'geom load' -> 'gmirror load' (could also have been 'geom mirror load')
- add footnote about that references section about adding swapspace, since this example removes it.
- make fstab file be a 'screen', not a 'programlisting'
- typo; gm0sa1 -> gm0s1a

--- doc-geom-chapter.patch begins here ---
Index: en_US.ISO8859-1/books/handbook/geom/chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v
retrieving revision 1.10
diff -u -r1.10 chapter.sgml
--- en_US.ISO8859-1/books/handbook/geom/chapter.sgml	13 Sep 2005 18:23:09 -0000	1.10
+++ en_US.ISO8859-1/books/handbook/geom/chapter.sgml	27 Sep 2005 21:00:14 -0000
@@ -267,6 +267,17 @@
 
     <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 @@
 	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,13 +328,21 @@
       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
+      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 further
+      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#
+    <screen>
+# Device                Mountpoint      FStype  Options         Dump    Pass#
 #/dev/da0s2b             none            swap    sw              0       0
-/dev/mirror/gm0sa1       /               ufs     rw              1       1</programlisting>
+/dev/mirror/gm0s1a       /               ufs     rw              1       1
+    </screen>
+
 
     <para>Now create a <filename>boot.conf</filename> file on both the
       current and new root partitions.  This file will
--- doc-geom-chapter.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: