From 05d923d013b094f4fa5e15e83698dbf1fda0aa76 Mon Sep 17 00:00:00 2001
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Thu, 19 Oct 2006 03:31:13 +0000
Subject: A few wording fix ups to the GEOM chapter.

PR:		85353
Submitted by:	"Julien Gabel" <jpeg@thilelli.net> (original submission)
---
 en_US.ISO8859-1/books/handbook/geom/chapter.sgml | 41 +++++++++++-------------
 1 file changed, 18 insertions(+), 23 deletions(-)

(limited to 'en_US.ISO8859-1')

diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
index ca84a765f3..c388e9c163 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
@@ -148,7 +148,7 @@
       <step><para>Load the <filename>geom_stripe</filename>
         module:</para>
 
-    <screen>&prompt.root; <userinput>kldload geom_stripe.ko</userinput></screen>
+    <screen>&prompt.root; <userinput>kldload geom_stripe</userinput></screen>
 	</step>
 
       <step><para>Ensure that a suitable mount point exists.  If this
@@ -161,10 +161,9 @@
 
       <step><para>Determine the device names for the disks which will
         be striped, and create the new stripe device.  For example,
-        the following command could be used to stripe two unused,
-        unpartitioned <acronym>ATA</acronym> disks:
-        <filename>/dev/ad2</filename> and
-        <filename>/dev/ad3</filename>.</para>
+	to stripe two unused and unpartitioned <acronym>ATA</acronym> disks,
+	for example <filename>/dev/ad2</filename> and
+	<filename>/dev/ad3</filename>:</para>
 
         <screen>&prompt.root; <userinput>gstripe label -v st0 /dev/ad2 /dev/ad3</userinput></screen>
 
@@ -175,8 +174,9 @@ XXX: What message?  Put it inside the screen output above.
 -->
       </step>
 
-      <step><para>A partition table must be created on the new volume
-        with the following command:</para>
+      <step><para>Write a standard label, also known as a partition
+        table, on the new volume and install the default
+        bootstrap code:</para>
 
         <screen>&prompt.root; <userinput>bsdlabel -wB /dev/stripe/st0</userinput></screen>
 
@@ -186,9 +186,9 @@ XXX: What message?  Put it inside the screen output above.
         in the <filename role="directory">/dev/stripe</filename>
         directory in addition to the <devicename>st0</devicename> device.
         Those include <devicename>st0a</devicename> and
-        <devicename>st0c</devicename>.  A file system must now be created
-        on the <devicename>st0a</devicename> device using the following
-        <command>newfs</command> command:</para>
+        <devicename>st0c</devicename>.  At this point a file system may be created
+        on the <devicename>st0a</devicename> device with the
+        <command>newfs</command> utility:</para>
 
       <screen>&prompt.root; <userinput>newfs -U /dev/stripe/st0a</userinput></screen>
 
@@ -198,8 +198,7 @@ XXX: What message?  Put it inside the screen output above.
     </step>
   </procedure>
 
-  <para>The following command can be used to manually mount a newly
-    created disk stripe:</para>
+  <para>To manually mount the created disk stripe:</para>
 
   <screen>&prompt.root; <userinput>mount /dev/stripe/st0a /mnt</userinput></screen>
 
@@ -279,7 +278,7 @@ Done.</screen>
     </note>
 
     <para>Install a generic <command>fdisk</command> label and boot code
-      to newly created <devicename>gm0</devicename> device:</para>
+      to new <devicename>gm0</devicename> device:</para>
 
     <screen>&prompt.root; <userinput>fdisk -vBI /dev/mirror/gm0</userinput></screen>
 
@@ -294,8 +293,8 @@ Done.</screen>
 	the slice and partition size of the other disk.</para>
     </note>
 
-    <para>Use the &man.newfs.8; utility to create a default file
-      system on the <devicename>gm0s1a</devicename> device node:</para>
+    <para>Use the &man.newfs.8; utility to construct a default <acronym>UFS</acronym>
+      file system on the <devicename>gm0s1a</devicename> device node:</para>
 
     <screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput></screen>
 
@@ -326,7 +325,7 @@ Done.</screen>
 	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>
+      new disk as shown in the following example:</para>
 
     <programlisting># Device                Mountpoint      FStype  Options         Dump    Pass#
 #/dev/da0s2b             none            swap    sw              0       0
@@ -347,15 +346,11 @@ Done.</screen>
 	new root partition, a failsafe is available.</para>
     </note>
 
-    <para>Now add the following line to the new
-      <filename>/boot/loader.conf</filename>:</para>
+    <para>Ensure the <filename>geom_mirror.ko</filename> module will load
+      on boot by running the following command:</para>
 
     <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> module during system
-      initialization.</para>
-
     <para>Reboot the system:</para>
 
     <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
@@ -393,7 +388,7 @@ mountroot></programlisting>
 	  system to a &man.loader.8; prompt.  Load the kernel module
 	  manually:</para>
 
-	<screen>OK? <userinput>load geom_mirror.ko</userinput>
+	<screen>OK? <userinput>load geom_mirror</userinput>
 OK? <userinput>boot</userinput></screen>
 
 	<para>If this works then for whatever reason the module was not
-- 
cgit v1.2.3