From owner-svn-doc-all@FreeBSD.ORG Tue Jun 24 18:41:27 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 463D6E30; Tue, 24 Jun 2014 18:41:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 268172ADE; Tue, 24 Jun 2014 18:41:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OIfRSh075226; Tue, 24 Jun 2014 18:41:27 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OIfRCp075225; Tue, 24 Jun 2014 18:41:27 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201406241841.s5OIfRCp075225@svn.freebsd.org> From: Warren Block Date: Tue, 24 Jun 2014 18:41:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45116 - head/en_US.ISO8859-1/books/handbook/geom X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 18:41:27 -0000 Author: wblock Date: Tue Jun 24 18:41:26 2014 New Revision: 45116 URL: http://svnweb.freebsd.org/changeset/doc/45116 Log: Convert some elements in the gmirror section to man page references where the text is referring to the system rather than the command name. Convert some passive voice to active. Clarify. Modified: head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Jun 24 15:50:48 2014 (r45115) +++ head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Jun 24 18:41:26 2014 (r45116) @@ -263,7 +263,7 @@ Done. RAID1, or - mirroring, is the technique of writing + mirroring, is the technique of writing the same data to more than one disk drive. Mirrors are usually used to guard against data loss due to drive failure. Each drive in a mirror contains an identical copy of the data. When @@ -295,7 +295,7 @@ Done. - While dump is used in these procedures + While &man.dump.8; is used in these procedures to copy file systems, it does not work on file systems with soft updates journaling. See &man.tunefs.8; for information on detecting and disabling soft updates journaling. @@ -311,14 +311,14 @@ Done. old metadata from a previous mirror. GPT metadata can be erased with - gpart. This example erases both primary + &man.gpart.8;. This example erases both primary and backup GPT partition tables from disk ada8: &prompt.root; gpart destroy -F ada8 A disk can be removed from an active mirror and the - metadata erased in one step using gmirror. + metadata erased in one step using &man.gmirror.8;. Here, the example disk ada8 is removed from the active mirror gm4: @@ -330,15 +330,15 @@ Done. &prompt.root; gmirror clear ada8 - When gmirror is used, one block of - metadata is stored at the end of the disk. Because + &man.gmirror.8; stores one block of + metadata at the end of the disk. Because GPT partition schemes also store metadata at the end of the disk, mirroring entire - GPT disks with gmirror + GPT disks with &man.gmirror.8; is not recommended. MBR partitioning is used here because it only stores a partition table at the - start of the disk and does not conflict with - gmirror. + start of the disk and does not conflict with the + mirror metadata. @@ -361,14 +361,14 @@ Done. &prompt.root; gmirror label -v gm0 /dev/ada1 /dev/ada2 - In this example, gm0 is a user-chosen + gm0 is a user-chosen device name assigned to the new mirror. After the mirror has - been started, this device name will appear in + been started, this device name appears in /dev/mirror/. MBR and bsdlabel partition tables can now - be created on the mirror with gpart. This + be created on the mirror with &man.gpart.8;. This example uses a traditional file system layout, with partitions for /, swap, /var, /tmp, and /usr. A @@ -422,7 +422,7 @@ Done. File systems from the original ada0 disk can now be copied onto the mirror with - dump and restore. + &man.dump.8; and &man.restore.8;. &prompt.root; mount /dev/mirror/gm0s1a /mnt &prompt.root; dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -) @@ -433,7 +433,7 @@ Done. &prompt.root; dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -) &prompt.root; dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -) - Next, edit /mnt/etc/fstab to point to + Edit /mnt/etc/fstab to point to the new mirror file systems: # Device Mountpoint FStype Options Dump Pass# @@ -493,16 +493,16 @@ Done. 1000204821504 # mediasize in bytes (931G) Create a mirror on the new disk. To make certain that the - mirror capacity is not any larger than the original drive, - gnop is used to create a fake drive of the + mirror capacity is not any larger than the original ada0 drive, + &man.gnop.8; is used to create a fake drive of the exact same size. This drive does not store any data, but is used only to limit the size of the mirror. When - gmirror creates the mirror, it will + &man.gmirror.8; creates the mirror, it will restrict the capacity to the size of - gzero.nop, even if the new drive - (ada1) has more space. Note that the + gzero.nop, even if the new + ada1 drive has more space. Note that the 1000204821504 in the second line - should be equal to ada0's media size as + is equal to ada0's media size as shown by diskinfo above. &prompt.root; geom zero load @@ -524,7 +524,7 @@ Done. ada0 to the new mirror. However, if the output shows that all of the space on the - disk is allocated, like in the following listing, there is no + disk is allocated, as in the following listing, there is no space available for the 512-byte mirror metadata at the end of the disk. @@ -562,8 +562,8 @@ BSD 8 6 freebsd-ufs 130023424 838860800 7 freebsd-ufs 968884224 984640881 - If the output of gpart show shows no - free space at the end of the disk, the size of both the slice + If no + free space is shown at the end of the disk, the size of both the slice and the last partition must be reduced by one sector. Edit the two files, reducing the size of both the slice and last partition by one. These are the last numbers in each @@ -615,11 +615,11 @@ BSD 8 710934528 1242590514 7 freebsd-ufs (592G) 1953525042 63 - free - (31k) - Both the slice and the last partition should have some - free space at the end of each disk. + Both the slice and the last partition must have at least + one free block at the end of the disk. Create file systems on these new partitions. The number - of partitions will vary, matching the partitions on the + of partitions will vary to match the original disk, ada0. &prompt.root; newfs -U /dev/mirror/gm0s1a @@ -656,15 +656,15 @@ BSD 8 If the geom_mirror.ko kernel module has not been built into the kernel, edit - /boot/loader.conf to load it: + /boot/loader.conf to load it at boot: geom_mirror_load="YES" File systems from the original disk can now be copied onto - the mirror with dump and - restore. Note that it may take some time - to create a snapshot for each file system dumped with - dump -L. + the mirror with &man.dump.8; and + &man.restore.8;. + Each file system dumped with + dump -L will create a snapshot first, which can take some time. &prompt.root; mount /dev/mirror/gm0s1a /mnt &prompt.root; dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -) @@ -693,15 +693,15 @@ BSD 8 When ada0 is inserted into the - mirror, its former contents will be overwritten by data on + mirror, its former contents will be overwritten by data from the mirror. Make certain that mirror/gm0 has the same contents as ada0 before adding - ada0 to the mirror. If there is - something wrong with the contents copied by - dump and restore, + ada0 to the mirror. If the contents + previously copied by + &man.dump.8; and &man.restore.8; are not identical to what was on ada0, revert /etc/fstab to mount the file - systems on ada0, reboot, and try the + systems on ada0, reboot, and start the whole procedure again. @@ -725,7 +725,7 @@ mirror/gm0 DEGRADED ada1 (ACTIVE) mirror/gm0 COMPLETE ada1 (ACTIVE) ada0 (ACTIVE) - The mirror, mirror/gm0, now consists + mirror/gm0 now consists of the two disks ada0 and ada1, and the contents are automatically synchronized with each other. In use, @@ -826,7 +826,7 @@ mountroot> Any old metadata should be cleared from the replacement disk using the instructions in . Then the disk, + linkend="geom-mirror-metadata"/>. Then the replacement disk, ada4 for this example, is inserted into the mirror: