From vader@endor.vader.dk  Tue Sep 27 21:07:19 2005
Return-Path: <vader@endor.vader.dk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DA8A916A425
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Sep 2005 21:07:18 +0000 (GMT)
	(envelope-from vader@endor.vader.dk)
Received: from endor.vader.dk (213.237.74.156.adsl.sol.worldonline.dk [213.237.74.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2A0DE43D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Sep 2005 21:07:17 +0000 (GMT)
	(envelope-from vader@endor.vader.dk)
Received: from endor.vader.dk (localhost.vader.dk [127.0.0.1])
	by endor.vader.dk (8.12.11/8.12.11) with ESMTP id j8RL7960079351
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Sep 2005 23:07:09 +0200 (CEST)
	(envelope-from vader@endor.vader.dk)
Received: (from vader@localhost)
	by endor.vader.dk (8.12.11/8.12.11/Submit) id j8RL79ol079350;
	Tue, 27 Sep 2005 23:07:09 +0200 (CEST)
	(envelope-from vader)
Message-Id: <200509272107.j8RL79ol079350@endor.vader.dk>
Date: Tue, 27 Sep 2005 23:07:09 +0200 (CEST)
From: Chris Larsen <darth@vader.dk>
Reply-To: Chris Larsen <darth@vader.dk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] correct various issues in the handbook entry geom/chapter.sgml (gmirror section)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 27 21:10:16 GMT 2005
>Closed-Date:    Wed Nov 09 20:11:41 GMT 2005
>Last-Modified:  Wed Nov 09 20:11:41 GMT 2005
>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:
Responsible-Changed-From-To: freebsd-doc->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Tue Sep 27 22:52:22 GMT 2005 
Responsible-Changed-Why:  
I will update the GEOM chapter. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86650 

From: Florent Thoumie <flz@xbsd.org>
To: bug-followup@FreeBSD.org, darth@vader.dk, remko@FreeBSD.org
Cc:  
Subject: Re: docs/86650: [patch] correct various issues in the handbook
	entry geom/chapter.sgml (gmirror section)
Date: Tue, 08 Nov 2005 17:30:35 +0000

 I would change that too :
 
 @@ -346,10 +346,10 @@
         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
 
 -- 
 Florent Thoumie
 flz@FreeBSD.org
 FreeBSD Committer
 
State-Changed-From-To: open->closed 
State-Changed-By: remko 
State-Changed-When: Wed Nov 9 20:11:03 GMT 2005 
State-Changed-Why:  
I finally added your patch (with flz's feedback) to the handbook 
chapter.  Sorry for the delay! It should appear within 24 
hours from now.  Thanks for the submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86650 
>Unformatted:
