Thu Aug 19 02:52:44 UTC 2010

en-US/Book_Info.xml                               |    2 
 en-US/DG_Filesys-Disk_Quotas.xml                  |    2 
 en-US/DG_Filesys-Ext3.xml                         |    6 
 en-US/DG_Filesys-File_System.xml                  |    2 
 en-US/DG_Filesys-Lvm.xml                          |    6 
 en-US/DG_Filesys-Parted.xml                       |    4 
 en-US/DG_Filesys-Raid-softconfig.xml              |    2 
 en-US/DG_Filesys-Raid.xml                         |    8 
 en-US/DG_NFS-NFS.xml                              |    6 
 en-US/DG_NFS-clientconfig.xml                     |    2 
 en-US/OSG_ch-fc-api-procedures.xml                |    2 
 en-US/OSG_reference_fc-native-drivers.xml         |    4 
 en-US/OSG_task_scanning-for-new-devices.xml       |    2 
 en-US/OSG_task_scanning-storage-interconnects.xml |    2 
 en-US/Storage_Administration_Guide.ent            |  257 ----------------------
 en-US/ch-dmultipath_virtstorage.xml               |   12 -
 en-US/ch-osrg.xml                                 |    2 
 en-US/ch-overview_main.xml                        |    8 
 en-US/new-p1-installconfig.xml                    |   12 -
 en-US/newfilesys-efs.xml                          |    2 
 en-US/newfilesys-ext4.xml                         |    6 
 en-US/newfilesys-fscache.xml                      |    4 
 en-US/newmds-ssdtuning.xml                        |    6 
 en-US/newosrg-fcoeiscsi.xml                       |  115 ---------
 en-US/newstorage-disklesssystems.xml              |    8 
 en-US/newstorage-iolimits.xml                     |   10 
 en-US/newstorage-writebarriers.xml                |    2 
 en-US/swap-extending-lvm2.xml                     |    2 
 en-US/xfs-XFS_Filesystem_Structure.xml            |    6 
 29 files changed, 68 insertions(+), 434 deletions(-)

New commits:
commit 7096aaefef0a5e770ff745d311609495e4a6cafd
Author: Don Domingo <ddomingo at redhat.com>
Date:   Thu Aug 19 12:54:39 2010 +1000

    removed something

diff --git a/en-US/newosrg-fcoeiscsi.xml b/en-US/newosrg-fcoeiscsi.xml
deleted file mode 100644
index fecb5b0..0000000
--- a/en-US/newosrg-fcoeiscsi.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
-<section id="newosrg-fcoeiscsi">
-<title><remark><command>[NEW!]</command></remark>Network Block Storage (FCoE, iSCSI)</title>
-
-<remark><ulink url="https://bu-platform.devel.redhat.com/PMRHEL6/rhel6/features/storage-management/network-block-storage-fcoe-iscsi"/></remark>
-<screen>
-  Network Block Storage (FCoE, iSCSI)
-by Siddharth Nagar â€” last modified Nov 19, 2009 12:03 AM
-â€” filed under: In: Fedora 12, Owner: coughlan, Feature: DOC-RED, QEOwner:kernel-storage, In: Fedora 11, Feature: DEV-GREEN, Feature: QE-RED
-
-Enhance existing support for FCoE and iSCSI.
-Overview
-
-Enhance existing support for FCoE and iSCSI.
-Owner (package maintainer):
-
-    * kernel
-
-Summary:
-
-    * Continue development of FCoE and iSCSI drivers. This includes software-only solutions, running on standard NICs, as well as NICs and HBAs that provide hardware assists.
-    * This also includes the development of management applications.
-
-Detailed description:
-
-    * Enhance existing support for FCoE and iSCSI.
-
-Completion Status
-
-    * % Completed in F11: 60%
-    * % Completed in F12: 90%
-    * Confidence factor that any remaining work for this feature will land by F12 beta (~2009-07-28) (high/med/low): high
-    * % Completed in RHEL 6 (if only in RHEL6): 100%
-    * Basic support is upstream. Enhancements are being developed.
-    * add fcoe-utils, driver updates, and more HW support to Fedora 12 and RHEL5.4
-
-Fedora Links Other Helpful Information
-
-    *
-
-Scoping
-Target Audience
-
-    * OPEN
-
-Product Variants / High Level Use Cases
-
-    * OPEN
-
-Hardware Architectures
-
-    * OPEN
-
-Constraints and Limitations
-
-    * OPEN
-
-Third-Party Dependencies
-
-    * OPEN
-
-Links
-Features this feature depends on
-
-    * This project depends on Anaconda to provide support for install and boot on these interconnects.
-    * OPEN
-
-Features depending on this Feature
-
-    * OPEN
-
-Use-Cases
-
-    * OPEN
-
-Test Cases
-
-    * OPEN
-
-Bugzilla Numbers
-
-    * https://bugzilla.redhat.com/show_bug.cgi?id=519880
-
-Documentation Upstream Project
-
-    * OPEN
-
-Business Aspects
-Business Justification
-
-    * OPEN
-
-Themes
-
-    * OPEN
-
-Customers
-
-    * OPEN
-
-Partners
-
-    * OPEN
-
-Planned Certifications
-
-    * OPEN
-
-
-</screen>
-
-</section>


commit 0eb29dc1a6283b0cbf66ccd02136fc5df4eb8981
Author: Don Domingo <ddomingo at redhat.com>
Date:   Thu Aug 19 12:53:58 2010 +1000

    minor edits

diff --git a/en-US/DG_Filesys-Disk_Quotas.xml b/en-US/DG_Filesys-Disk_Quotas.xml
index c43e244..cb65bf1 100644
--- a/en-US/DG_Filesys-Disk_Quotas.xml
+++ b/en-US/DG_Filesys-Disk_Quotas.xml
@@ -101,7 +101,7 @@ none                     /sys      sysfs   defaults        0 0
 				<title>Note</title>
 				
 				<para>
-					The following examples assume that a separate <command moreinfo="none">/home</command> partition was created during the installation of &PROD;. The root (<command moreinfo="none">/</command>) partition can be used for setting quota policies in the <filename moreinfo="none">/etc/fstab</filename> file.
+					The following examples assume that a separate <command moreinfo="none">/home</command> partition was created during the installation of Fedora. The root (<command moreinfo="none">/</command>) partition can be used for setting quota policies in the <filename moreinfo="none">/etc/fstab</filename> file.
 				</para>
 
 			</note>
diff --git a/en-US/DG_Filesys-Parted.xml b/en-US/DG_Filesys-Parted.xml
index 1471b23..5b9f1bd 100644
--- a/en-US/DG_Filesys-Parted.xml
+++ b/en-US/DG_Filesys-Parted.xml
@@ -46,7 +46,7 @@
 
 		
 
-		<para>By default, the <filename>parted</filename> package is included when installing &PROD;. To start <command>parted</command>, log in as root and type the command <command>parted <replaceable>/dev/sda</replaceable></command> at a shell prompt (where <command><replaceable>/dev/sda</replaceable></command> is the device name for the drive you want to configure).</para>
+		<para>By default, the <filename>parted</filename> package is included when installing Fedora. To start <command>parted</command>, log in as root and type the command <command>parted <replaceable>/dev/sda</replaceable></command> at a shell prompt (where <command><replaceable>/dev/sda</replaceable></command> is the device name for the drive you want to configure).</para>
 
 
 		 


commit 725f6173c026dd2ff5b2c17a834aee11779e3070
Author: Don Domingo <ddomingo at redhat.com>
Date:   Thu Aug 19 12:50:42 2010 +1000

    fixed RHEL entity occurrences and Fedora 13 mentions

diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 3f391e4..18846d7 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -12,7 +12,7 @@
 	 <pubsnumber>1</pubsnumber>
 	 <abstract>
 		<para>
-			This guide provides instructions on how to effectively manage storage devices and file systems on Fedora 13 and later. It is intended for use by system administrators with basic to intermediate knowledge of Red Hat Enterprise Linux or Fedora.
+			This guide provides instructions on how to effectively manage storage devices and file systems on Fedora &PRODVER; and later. It is intended for use by system administrators with basic to intermediate knowledge of Red Hat Enterprise Linux or Fedora.
 		</para>
 		 
 	</abstract>
diff --git a/en-US/DG_Filesys-Ext3.xml b/en-US/DG_Filesys-Ext3.xml
index b25d437..a76fbce 100644
--- a/en-US/DG_Filesys-Ext3.xml
+++ b/en-US/DG_Filesys-Ext3.xml
@@ -76,7 +76,7 @@ reformatting. Refer to <xref linkend="s1-filesystem-ext3-convert"/> for more on
 		</variablelist>
 
 <para>
-The Fedora 13 version of ext3 features the following updates:
+As of Fedora 13, ext3 features the following updates:
 </para>
 
 <formalpara>
@@ -93,7 +93,7 @@ selected with the <command>mke2fs -I</command> option, or specified in <command>
 
 <note>
 <para>
-If you upgrade to Fedora 13 with the intention of keeping any ext3 file systems intact, you do not need to remake the file system. 
+If you upgrade to Fedora &PRODVER; with the intention of keeping any ext3 file systems intact, you do not need to remake the file system. 
 </para>
 </note>
 
@@ -171,7 +171,7 @@ and formatting sections below and go directly to <xref linkend="s1-filesystem-ex
 				Always use the <command>e2fsck</command> utility to check your file system before and after using <command>tune2fs</command>.
 				
 				
-				A default installation of Fedora 13 uses ext4 for all file systems.
+				A default installation of Fedora &PRODVER; uses ext4 for all file systems.
 			</para>
 		</note>
 		 
diff --git a/en-US/DG_Filesys-Lvm.xml b/en-US/DG_Filesys-Lvm.xml
index b8ea6cd..ac4c97a 100644
--- a/en-US/DG_Filesys-Lvm.xml
+++ b/en-US/DG_Filesys-Lvm.xml
@@ -98,9 +98,9 @@ please refer to the <citetitle>Logical Volume Manager Administration</citetitle>
 </para>
 
 <para>
-In addition, the <citetitle>Installation Guide</citetitle> for Fedora 13 also documents how to 
+In addition, the <citetitle>Installation Guide</citetitle> for Fedora &PRODVER; also documents how to 
 create and configure LVM logical volumes during installation. For more information, refer to the <citetitle>Create LVM Logical Volume</citetitle>
-section of the <citetitle>Installation Guide</citetitle> for Fedora 13.
+section of the <citetitle>Installation Guide</citetitle> for Fedora &PRODVER;.
 </para>
 
 
diff --git a/en-US/DG_Filesys-Parted.xml b/en-US/DG_Filesys-Parted.xml
index 3577c46..1471b23 100644
--- a/en-US/DG_Filesys-Parted.xml
+++ b/en-US/DG_Filesys-Parted.xml
@@ -408,7 +408,7 @@ Number  Start   End    Size    Type      File system  Flags
 				</indexterm>
 				<para>
 					From the partition table, determine the start and end points of the new partition and what partition type it should be. You can only have four primary partitions (with no extended partition) on a device. If you need more than four partitions, you can
-					have three primary partitions, one extended partition, and multiple logical partitions within the extended. For an overview of disk partitions, refer to the appendix <citetitle>An Introduction to Disk Partitions</citetitle> in the Fedora 13 <citetitle>Installation Guide</citetitle>.
+					have three primary partitions, one extended partition, and multiple logical partitions within the extended. For an overview of disk partitions, refer to the appendix <citetitle>An Introduction to Disk Partitions</citetitle> in the Fedora &PRODVER; <citetitle>Installation Guide</citetitle>.
 				</para>
 
 				<para>
diff --git a/en-US/DG_Filesys-Raid-softconfig.xml b/en-US/DG_Filesys-Raid-softconfig.xml
index ea84568..845d1a2 100644
--- a/en-US/DG_Filesys-Raid-softconfig.xml
+++ b/en-US/DG_Filesys-Raid-softconfig.xml
@@ -476,7 +476,7 @@ From this terminal, use <command>parted</command> to create RAID partitions on t
 
 <step>
 <para>
-Once the arrays are created, you can optionally create file systems on the arrays as well. Refer to the different chapters under <xref linkend="part-fs"/> for information on file systems supported by Fedora 13. <xref linkend="installconfig-fs"/> also contains basic technical information on supported file systems for quick review.
+Once the arrays are created, you can optionally create file systems on the arrays as well. Refer to the different chapters under <xref linkend="part-fs"/> for information on file systems supported by Fedora &PRODVER;. <xref linkend="installconfig-fs"/> also contains basic technical information on supported file systems for quick review.
 </para>
 
 </step>
diff --git a/en-US/DG_Filesys-Raid.xml b/en-US/DG_Filesys-Raid.xml
index c80277a..aa1935b 100644
--- a/en-US/DG_Filesys-Raid.xml
+++ b/en-US/DG_Filesys-Raid.xml
@@ -521,7 +521,7 @@ metadata format, generally refered to as native <command>mdraid</command> metada
 <para>
 <command>mdraid</command> also
 supports other metadata formats, known as external metadata.
-Fedora 13 uses <command>mdraid</command> with
+Fedora &PRODVER; uses <command>mdraid</command> with
 external metadata to access
 ISW / IMSM (Intel firmware RAID) sets. <command>mdraid</command> sets are configured and
 controlled through the <command>mdadm</command> utility.
@@ -553,7 +553,7 @@ configuration mechanism.
 <command>dmraid</command> is configured entirely in user-space, making it easy
 to support various on-disk metadata formats. As such, <command>dmraid</command>
 is used on a wide variety of firmware RAID implementations. <command>dmraid</command>
-also supports Intel firmware RAID, although Fedora 13 uses <command>mdraid</command>
+also supports Intel firmware RAID, although Fedora &PRODVER; uses <command>mdraid</command>
 to access Intel firmware RAID sets.
 </para>
 </simplesect>
@@ -606,7 +606,7 @@ RAID set(s) to activate before searching for the root file system.
 </para>
 
 <para>
-For instructions on configuring RAID during installation, refer to the Fedora 13 <citetitle>Installation Guide</citetitle>.
+For instructions on configuring RAID during installation, refer to the Fedora &PRODVER; <citetitle>Installation Guide</citetitle>.
 </para>
 
 
@@ -732,7 +732,7 @@ From this terminal, use <command>parted</command> to create RAID partitions on t
 
 <step>
 <para>
-Once the arrays are created, you can optionally create file systems on the arrays as well. Refer to <xref linkend="installconfig-fs"/> for basic technical information on file systems supported by Fedora 13.
+Once the arrays are created, you can optionally create file systems on the arrays as well. Refer to <xref linkend="installconfig-fs"/> for basic technical information on file systems supported by Fedora &PRODVER;.
 </para>
 
 </step>
diff --git a/en-US/DG_NFS-NFS.xml b/en-US/DG_NFS-NFS.xml
index c890c96..8c345a9 100644
--- a/en-US/DG_NFS-NFS.xml
+++ b/en-US/DG_NFS-NFS.xml
@@ -111,14 +111,14 @@ The NFS initialization script and <command moreinfo="none">rpc.nfsd</command> pr
 <remark>sprabhu at redhat.com</remark>
 <remark>renamed <command>portmap</command> to <command>rpcbind</command></remark>
 	<para>
-Fedora uses a combination of kernel-level support and daemon processes to provide NFS file sharing. All NFS versions rely on <firstterm>Remote Procedure Calls</firstterm> (<firstterm>RPC</firstterm>) between clients and servers. RPC services under Fedora 13 are controlled by the <command moreinfo="none">rpcbind</command> service. To share or mount NFS file systems, the following services work together, depending on which version of NFS is implemented:
+Fedora uses a combination of kernel-level support and daemon processes to provide NFS file sharing. All NFS versions rely on <firstterm>Remote Procedure Calls</firstterm> (<firstterm>RPC</firstterm>) between clients and servers. RPC services under Fedora &PRODVER; are controlled by the <command moreinfo="none">rpcbind</command> service. To share or mount NFS file systems, the following services work together, depending on which version of NFS is implemented:
 	</para>
 
 <note>
 <para>
 The <command>portmap</command> service was used to map RPC program numbers to IP address port number combinations 
 in earlier versions of Fedora. This service is now replaced by <command>rpcbind</command> in
-Fedora 13 to enable IPv6 support. For more information about this change, refer to the following
+Fedora &PRODVER; to enable IPv6 support. For more information about this change, refer to the following
 links:
 </para>
 
diff --git a/en-US/DG_NFS-clientconfig.xml b/en-US/DG_NFS-clientconfig.xml
index a2ead12..141c2f2 100644
--- a/en-US/DG_NFS-clientconfig.xml
+++ b/en-US/DG_NFS-clientconfig.xml
@@ -129,7 +129,7 @@ The client location where <replaceable>/remote/export</replaceable> should be mo
 
 
 <para>
-The NFS protocol version used in Fedora 13 is identified by the <command>mount</command> options <command>nfsvers</command> or <command>vers</command>. By default, <command>mount</command> will use NFSv4 with <command>mount -t nfs</command>. If the server does not support NFSv4, the client will automatically step down to a version supported by the server. If you use the <command>nfsvers</command>/<command>vers</command> option to pass a particular version not supported by the server, the mount will fail. The file system type nfs4 is also available for legacy reasons; this is equivalent to running <command>mount -t nfs -o nfsvers=4 <replaceable>host</replaceable>:<replaceable>/remote/export</replaceable> <replaceable>/local/directory</replaceable></command>.
+The NFS protocol version used in Fedora &PRODVER; is identified by the <command>mount</command> options <command>nfsvers</command> or <command>vers</command>. By default, <command>mount</command> will use NFSv4 with <command>mount -t nfs</command>. If the server does not support NFSv4, the client will automatically step down to a version supported by the server. If you use the <command>nfsvers</command>/<command>vers</command> option to pass a particular version not supported by the server, the mount will fail. The file system type nfs4 is also available for legacy reasons; this is equivalent to running <command>mount -t nfs -o nfsvers=4 <replaceable>host</replaceable>:<replaceable>/remote/export</replaceable> <replaceable>/local/directory</replaceable></command>.
 </para>
 
 
diff --git a/en-US/OSG_ch-fc-api-procedures.xml b/en-US/OSG_ch-fc-api-procedures.xml
index bcceeee..b747b73 100644
--- a/en-US/OSG_ch-fc-api-procedures.xml
+++ b/en-US/OSG_ch-fc-api-procedures.xml
@@ -15,7 +15,7 @@
 </indexterm>
 
 	<para>
-		This section discusses the Fibre Channel API, native Fedora 13 Fibre Channel drivers, and the Fibre Channel capabilities of these drivers.
+		This section discusses the Fibre Channel API, native Fedora &PRODVER; Fibre Channel drivers, and the Fibre Channel capabilities of these drivers.
 	</para>
 
 	<xi:include href="OSG_reference_fc-api-etc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />	
diff --git a/en-US/OSG_reference_fc-native-drivers.xml b/en-US/OSG_reference_fc-native-drivers.xml
index a2003e6..9fc3b7f 100644
--- a/en-US/OSG_reference_fc-native-drivers.xml
+++ b/en-US/OSG_reference_fc-native-drivers.xml
@@ -27,7 +27,7 @@
 
 
 
-	<para>Fedora 13 ships with the following native fibre channel drivers:</para>
+	<para>Fedora &PRODVER; ships with the following native fibre channel drivers:</para>
 	<itemizedlist>
 		<listitem><para><filename>lpfc</filename></para></listitem>
 		<listitem><para><filename>qla2xxx</filename></para></listitem>
@@ -35,7 +35,7 @@
 		<listitem><para><filename>mptfc</filename></para></listitem>
 	</itemizedlist>	
 		
-	<para><xref linkend="fc-api-capabilities-of-native-rhel5-drivers" /> describes the different fibre-channel API capabilities of each native Fedora 13 driver. X denotes support for the capability.</para>
+	<para><xref linkend="fc-api-capabilities-of-native-rhel5-drivers" /> describes the different fibre-channel API capabilities of each native Fedora &PRODVER; driver. X denotes support for the capability.</para>
 
 
 <table id="fc-api-capabilities-of-native-rhel5-drivers">
diff --git a/en-US/OSG_task_scanning-for-new-devices.xml b/en-US/OSG_task_scanning-for-new-devices.xml
index 5a64703..23c1caf 100644
--- a/en-US/OSG_task_scanning-for-new-devices.xml
+++ b/en-US/OSG_task_scanning-for-new-devices.xml
@@ -41,7 +41,7 @@ Consult your storage array vendor documentation for possible restrictions regard
 
 
 <note>
-<para>Fedora 13 includes a <filename>rescan-scsi-bus.sh</filename> script that automatically updates the logical unit configuration of the host as needed after adding a new storage device. For more information about this script (along with its related known issues), refer to <xref linkend="rescan-scsi-bus"/>.</para>
+<para>Fedora &PRODVER; includes a <filename>rescan-scsi-bus.sh</filename> script that automatically updates the logical unit configuration of the host as needed after adding a new storage device. For more information about this script (along with its related known issues), refer to <xref linkend="rescan-scsi-bus"/>.</para>
 </note>
 
 
diff --git a/en-US/OSG_task_scanning-storage-interconnects.xml b/en-US/OSG_task_scanning-storage-interconnects.xml
index bf09c5d..87db0c5 100644
--- a/en-US/OSG_task_scanning-storage-interconnects.xml
+++ b/en-US/OSG_task_scanning-storage-interconnects.xml
@@ -36,7 +36,7 @@ The following commands can be used to scan storage interconnects.
 Bear in mind that <command>issue_lip</command> is an asynchronous operation. The command may complete before the entire scan has completed. You must monitor <filename>/var/log/messages</filename> to determine when it is done.
 </para> 
 <para>
-The <filename>lpfc</filename> and <filename>qla2xxx</filename> drivers support <command>issue_lip</command>. For more information about the API capabilities supported by each driver in Fedora 13, refer to <xref linkend="fc-api-capabilities-of-native-rhel5-drivers"/>.
+The <filename>lpfc</filename> and <filename>qla2xxx</filename> drivers support <command>issue_lip</command>. For more information about the API capabilities supported by each driver in Fedora &PRODVER;, refer to <xref linkend="fc-api-capabilities-of-native-rhel5-drivers"/>.
 </para>
 </listitem>
 </varlistentry>  
diff --git a/en-US/ch-dmultipath_virtstorage.xml b/en-US/ch-dmultipath_virtstorage.xml
index d0b1220..fdd6e72 100644
--- a/en-US/ch-dmultipath_virtstorage.xml
+++ b/en-US/ch-dmultipath_virtstorage.xml
@@ -7,7 +7,7 @@
 
 
 <para>
-Fedora 13 also supports <firstterm>DM-Multipath</firstterm> and 
+Fedora &PRODVER; also supports <firstterm>DM-Multipath</firstterm> and 
 <firstterm>virtual storage</firstterm>. Both features are documented in detail 
 in other stand-alone books also provided by Red Hat.
 </para>
@@ -18,7 +18,7 @@ in other stand-alone books also provided by Red Hat.
 <primary>virtual storage</primary>
 </indexterm>
 <para>
-Fedora 13 supports the following file systems/online storage methods for virtual storage:
+Fedora &PRODVER; supports the following file systems/online storage methods for virtual storage:
 </para>
 <remark>content for this section will be pulled from the <citetitle>Virtualization</citetitle> book.</remark>
 <itemizedlist>
@@ -29,7 +29,7 @@ Fedora 13 supports the following file systems/online storage methods for virtual
 </itemizedlist>
 
 <para>
-Virtualization in Fedora 13 uses <command>libvirt</command> to manage virtual instances. The
+Virtualization in Fedora &PRODVER; uses <command>libvirt</command> to manage virtual instances. The
 <command>libvirt</command> utility uses the concept of <firstterm>storage pools</firstterm> to manage storage 
 for virtualized guests. A storage pool is storage that can be divided up into smaller volumes or allocated 
 directly to a guest. Volumes of a storage pool can be allocated to virtualized guests. There are two categories of storage pools available:
diff --git a/en-US/ch-osrg.xml b/en-US/ch-osrg.xml
index 2728de7..005af99 100644
--- a/en-US/ch-osrg.xml
+++ b/en-US/ch-osrg.xml
@@ -32,7 +32,7 @@
 
 
 	<para>
-		It is often desirable to add, remove or re-size storage devices while the operating system is running, and without rebooting. This chapter outlines the procedures that may be used to reconfigure storage devices on Fedora 13 host systems while the system is running.  It covers iSCSI and Fibre Channel storage interconnects; other interconnect types may be added it the future.
+		It is often desirable to add, remove or re-size storage devices while the operating system is running, and without rebooting. This chapter outlines the procedures that may be used to reconfigure storage devices on Fedora &PRODVER; host systems while the system is running.  It covers iSCSI and Fibre Channel storage interconnects; other interconnect types may be added it the future.
 	</para>
 	
 	<para>This chapter focuses on adding, removing, modifying, and monitoring storage devices. It does not discuss the Fibre Channel or iSCSI protocols in detail. For more information about these protocols, refer to other documentation.</para>
diff --git a/en-US/ch-overview_main.xml b/en-US/ch-overview_main.xml
index fe44124..b205118 100644
--- a/en-US/ch-overview_main.xml
+++ b/en-US/ch-overview_main.xml
@@ -13,7 +13,7 @@
 
 <para>
 The <citetitle>Storage Administration Guide</citetitle> contains extensive information 
-on supported file systems and data storage features in Fedora 13. This
+on supported file systems and data storage features in Fedora &PRODVER;. This
 book is intended as a quick reference for administrators managing single-node (i.e. non-clustered)
 storage solutions. 
 </para>
@@ -23,7 +23,7 @@ storage solutions.
 <remark><ulink url="https://bu-platform.devel.redhat.com/PMRHEL6/rhel6/features/storage-management"/></remark>
 
 <section id="rhel6storage-whatsnew">
-<title>What's New in Fedora 13</title>
+<title>What's New in Fedora &PRODVER;</title>
 
 
 
@@ -40,7 +40,7 @@ file systems have now been added:
 </itemizedlist>
 
 <para>
-Fedora 13 also features the following file system enhancements:
+Fedora &PRODVER; also features the following file system enhancements:
 </para>
 
 <simplesect id="intro-efs">
@@ -166,7 +166,7 @@ better optimize I/O for some devices. For more information on this, refer to
 <simplesect id="intro-ext4-fullsupport">
 <title>ext4 Support</title>
 <para>
-The ext4 file system is fully supported in this release. It is now the default file system of Fedora 13, supporting an unlimited number of subdirectories. It also features more granular timestamping, extended attributes support, and quota journalling. For more information on ext4, refer to <xref linkend="newfilesys-ext4"/>. 
+The ext4 file system is fully supported in this release. It is now the default file system as of Fedora 13, supporting an unlimited number of subdirectories. It also features more granular timestamping, extended attributes support, and quota journalling. For more information on ext4, refer to <xref linkend="newfilesys-ext4"/>. 
 </para>
 
 </simplesect>
diff --git a/en-US/new-p1-installconfig.xml b/en-US/new-p1-installconfig.xml
index 971b6b4..53d5cf4 100644
--- a/en-US/new-p1-installconfig.xml
+++ b/en-US/new-p1-installconfig.xml
@@ -40,20 +40,20 @@
 Many storage device and file system settings can only be configured at install time. 
 Other settings, such as file system type, can only be modified up to a certain point without 
 requiring a reformat. As such, it is prudent that you plan your storage configuration accordingly before installing
-Fedora 13.
+Fedora &PRODVER;.
 </para>
 
 <para>
 This chapter discusses several considerations when planning a storage configuration for
 your system. For actual installation instructions (including storage configuration during
-installation), refer to the Fedora 13 <citetitle>Installation Guide</citetitle>.
+installation), refer to the Fedora &PRODVER; <citetitle>Installation Guide</citetitle>.
 </para>
 
 <section id="installconfig-updates">
 <title>Updates to Storage Configuration During Installation</title>
 
 <para>
-Installation configuration for the following settings/devices has been updated for Fedora 13:
+Installation configuration for the following settings/devices has been updated for Fedora &PRODVER;:
 </para>
 
 
@@ -217,7 +217,7 @@ occupy all remaining space in the volume group.
 </indexterm>
 
 <para>
-This section shows basic technical information on each file system supported by Fedora 13.
+This section shows basic technical information on each file system supported by Fedora &PRODVER;.
 </para>
 
 <table id="fs-tablebasicinfo">
@@ -353,8 +353,8 @@ This section shows basic technical information on each file system supported by
 
 <note>
 <para>
-Not all file systems supported by Fedora 13 are documented in this guide. In addition, 
-file systems (e.g. BTRFS) that are unsupported in &RHEL; are not documented herein either.
+Not all file systems supported by Fedora &PRODVER; are documented in this guide. In addition, 
+file systems (e.g. BTRFS) that are unsupported in Red Hat Enterprise Linux 6 are not documented herein either.
 </para>
 
 </note>
diff --git a/en-US/newfilesys-efs.xml b/en-US/newfilesys-efs.xml
index 7f1d565..da45006 100644
--- a/en-US/newfilesys-efs.xml
+++ b/en-US/newfilesys-efs.xml
@@ -19,7 +19,7 @@
 <remark><ulink url="https://bu-platform.devel.redhat.com/PMRHEL6/rhel6/features/file-system-and-storage/encrypted-file-system"/></remark>
 
 <para>
-Fedora 13 now supports <firstterm>eCryptfs</firstterm>, a "pseudo-file system" which provides data and filename encryption on a per-file basis. The term "pseudo-file system" refers to the fact that eCryptfs does not have an on-disk format; rather, it is a file system layer that resides on top of an actual file system. The eCryptfs layer provides encryption capabilities.
+Fedora &PRODVER; now supports <firstterm>eCryptfs</firstterm>, a "pseudo-file system" which provides data and filename encryption on a per-file basis. The term "pseudo-file system" refers to the fact that eCryptfs does not have an on-disk format; rather, it is a file system layer that resides on top of an actual file system. The eCryptfs layer provides encryption capabilities.
 </para>
 
 <para>
diff --git a/en-US/newfilesys-ext4.xml b/en-US/newfilesys-ext4.xml
index eb2108b..7a87f9c 100644
--- a/en-US/newfilesys-ext4.xml
+++ b/en-US/newfilesys-ext4.xml
@@ -37,11 +37,9 @@
 </indexterm>
 
 <para>
-The ext4 file system is a scalable extension of the ext3 file system, which was the default file system in previous versions of Fedora. Ext4 is now the default file system of Fedora 13, and can support files and file systems of up to 16 terabytes in size. It also supports an unlimited number of sub-directories (the ext3 file system only supports up to 32,000). Further, ext4 is backward compatible with ext3 and ext2, allowing these older versions to be mounted with the ext4 driver.
+The ext4 file system is a scalable extension of the ext3 file system, which was the default file system in previous versions of Fedora. Ext4 is the default file system of Fedora &PRODVER;, and can support files and file systems of up to 16 terabytes in size. It also supports an unlimited number of sub-directories (the ext3 file system only supports up to 32,000). Further, ext4 is backward compatible with ext3 and ext2, allowing these older versions to be mounted with the ext4 driver.
 </para>
 
-<remark>Eric: added statement that ext4 is default; default test install verifies this. i assume this will remain until GA?</remark>
-
 <variablelist>
 
 <varlistentry>
@@ -683,7 +681,7 @@ For more information about resizing an ext4 file system, refer to <command>man r
 </indexterm>
 
 <para>
-Fedora 13 also features other utilities for managing ext4 file systems:
+Fedora &PRODVER; also features other utilities for managing ext4 file systems:
 </para>
 
 <variablelist>
diff --git a/en-US/newfilesys-fscache.xml b/en-US/newfilesys-fscache.xml
index 6e936e1..0871f8e 100644
--- a/en-US/newfilesys-fscache.xml
+++ b/en-US/newfilesys-fscache.xml
@@ -198,7 +198,7 @@ satisfying read requests locally without consuming network bandwidth.
 </indexterm>
 
 <para>
-Currently, Fedora 13 only provides the <command>cachefiles</command> caching back-end. The <command>cachefilesd</command> daemon initiates and manages <command>cachefiles</command>. The <filename>/etc/cachefilesd.conf</filename> file controls how <command>cachefiles</command> provides caching services. To configure a cache back-end of this type, the <filename>cachefilesd</filename> package
+Currently, Fedora &PRODVER; only provides the <command>cachefiles</command> caching back-end. The <command>cachefilesd</command> daemon initiates and manages <command>cachefiles</command>. The <filename>/etc/cachefilesd.conf</filename> file controls how <command>cachefiles</command> provides caching services. To configure a cache back-end of this type, the <filename>cachefilesd</filename> package
 must be installed.
 </para>
 
@@ -234,7 +234,7 @@ desktop machine it would be more prudent to mount a disk partition specifically
 
 
 <para>
-File systems that support functionalities required by FS-Cache cache back-end include the Fedora 13 implementations of the following file systems:
+File systems that support functionalities required by FS-Cache cache back-end include the Fedora &PRODVER; implementations of the following file systems:
 </para>
 
 <itemizedlist>
diff --git a/en-US/newmds-ssdtuning.xml b/en-US/newmds-ssdtuning.xml
index 3f7198e..d351557 100644
--- a/en-US/newmds-ssdtuning.xml
+++ b/en-US/newmds-ssdtuning.xml
@@ -126,7 +126,7 @@ Not all solid-state devices in the market support <command>TRIM</command>.
 <para>
 Because of the internal layout and operation of SSDs, it is best to
 partition devices on an internal <firstterm>erase block boundary</firstterm>. 
-Partitioning utilities in Fedora 13 chooses sane defaults
+Partitioning utilities in Fedora &PRODVER; chooses sane defaults
 if the SSD exports topology information. This is especially true if the exported
 topology information includes alignment offsets and optimal I/O sizes.
 </para>
@@ -143,7 +143,7 @@ you should that the first partition be created at a 1MB boundary.
 
 <para>
 In addition, keep in mind that logical volumes, device-mapper targets, and <command>md</command> 
-targets do not support <command>TRIM</command>. As such, the default Fedora 13 installation will not allow the use of the <command>TRIM</command> command, since this
+targets do not support <command>TRIM</command>. As such, the default Fedora &PRODVER; installation will not allow the use of the <command>TRIM</command> command, since this
 install uses DM-linear targets.
 </para>
 
@@ -223,7 +223,7 @@ optimal configuration for a given workload.
 <para>
 When using SSDs, you should change the I/O scheduler only for benchmarking 
 particular workloads. For more information about the different types of I/O schedulers, refer to 
-the &RHEL; <citetitle>I/O Tuning Guide</citetitle>.
+the Red Hat Enterprise Linux <citetitle>I/O Tuning Guide</citetitle>.
 The following kernel document also contains instructions on how to switch between I/O schedulers:
 </para>
 
diff --git a/en-US/newstorage-disklesssystems.xml b/en-US/newstorage-disklesssystems.xml
index b0bcce2..ded66d7 100644
--- a/en-US/newstorage-disklesssystems.xml
+++ b/en-US/newstorage-disklesssystems.xml
@@ -36,7 +36,7 @@
 </indexterm>
 
 <para>
-The Network Booting Service (provided by <command>system-config-netboot</command>) is no longer available in Fedora 13. 
+The Network Booting Service (provided by <command>system-config-netboot</command>) is no longer available in Fedora &PRODVER;. 
 Deploying diskless systems is now possible in this release without the use of <command>system-config-netboot</command>.
 </para>
 
@@ -126,7 +126,7 @@ Create a <filename>pxelinux.cfg</filename> directory inside the <command>tftp</c
 You will also need to configure firewall rules properly
 to allow <command>tftp</command> traffic; as <command>tftp</command> supports TCP wrappers, you can configure host access to <command>tftp</command>
 via <filename>/etc/hosts.allow</filename>. For more information on configuring TCP wrappers and the <filename>/etc/hosts.allow</filename> 
-configuration file, refer to the <citetitle>Security Guide</citetitle> for Fedora 13 or &RHEL; &RHELVER;; <command>man hosts_access</command>
+configuration file, refer to the <citetitle>Security Guide</citetitle> for Fedora &PRODVER; or Red Hat Enterprise Linux 6; <command>man hosts_access</command>
 also provides information about <filename>/etc/hosts.allow</filename>.
 </para>
 
@@ -161,7 +161,7 @@ After configuring <command>tftp</command> for diskless clients, configure DHCP,
 </indexterm>
 
 <para>
-After configuring a <command>tftp</command> server, you need to set up a DHCP service on the same host machine. Refer to the Fedora 13 <citetitle>Deployment Guide</citetitle> for instructions on how to set up a DHCP server. In addition, you should 
+After configuring a <command>tftp</command> server, you need to set up a DHCP service on the same host machine. Refer to the Fedora &PRODVER; <citetitle>Deployment Guide</citetitle> for instructions on how to set up a DHCP server. In addition, you should 
 enable PXE booting on the DHCP server; to do this, add the following configuration to <filename>/etc/dhcp/dhcp.conf</filename>:
 </para>
 
@@ -200,7 +200,7 @@ refer to <xref linkend="s1-nfs-server-config-exports"/>.
 </para>
 
 <para>
-To accommodate completely diskless clients, the root directory should contain a complete Fedora 13 installation. You can synchronize this
+To accommodate completely diskless clients, the root directory should contain a complete Fedora &PRODVER; installation. You can synchronize this
 with a running system via <command>rsync</command>, as in:
 </para>
 
diff --git a/en-US/newstorage-iolimits.xml b/en-US/newstorage-iolimits.xml
index bb2e354..1993a09 100644
--- a/en-US/newstorage-iolimits.xml
+++ b/en-US/newstorage-iolimits.xml
@@ -34,14 +34,14 @@ I/O alignment and I/O size information, allowing storage management
 tools (<command>parted</command>, <command>lvm</command>, <command>mkfs.<replaceable>*</replaceable></command>, 
 and the like) to optimize data placement and access. If a legacy
 device does not export I/O alignment and size data, then storage management
-tools in Fedora 13 will conservatively align I/O on a 
+tools in Fedora &PRODVER; will conservatively align I/O on a 
 4k (or larger power of 2) boundary. This will ensure that 4k-sector devices 
 operate correctly even if they do not indicate any required/preferred
 I/O alignment and size.
 </para>
 
 <note><para>
-Fedora 13 supports 4k-sector devices as data disks, not as boot disks.
+Fedora &PRODVER; supports 4k-sector devices as data disks, not as boot disks.
 Boot support for 4k-sector devices is planned for a later release.
 </para></note>
 
@@ -103,7 +103,7 @@ and size:
 For example, certain 4K sector devices may use a 4K <command>physical_block_size</command>
 internally but expose a more granular 512-byte <command>logical_block_size</command> to Linux.
 This discrepancy introduces potential for misaligned I/O.
-To address this, the Fedora 13 I/O stack will attempt to start
+To address this, the Fedora &PRODVER; I/O stack will attempt to start
 all data areas on a naturally-aligned boundary (<command>physical_block_size</command>) by making
 sure it accounts for any alignment_offset if the beginning of the block device
 is offset from the underlying physical alignment.
@@ -292,7 +292,7 @@ The additional I/O hints are outside the scope of the ATA Command Set.</para>
 
 
 <para>
-I/O parameters support in Fedora 13 requires at least 
+I/O parameters support in Fedora &PRODVER; requires at least 
 <emphasis>version 3</emphasis> of the <firstterm>SCSI Primary Commands</firstterm> 
 (SPC-3) protocol. The kernel will only send an <firstterm>extended inquiry</firstterm>
 (which gains access to the <computeroutput>BLOCK LIMITS VPD</computeroutput> page) and 
@@ -411,7 +411,7 @@ relative to the stripe
 </itemizedlist>
 
 <para>
-In Fedora 13, Device Mapper and Software Raid (MD) 
+In Fedora &PRODVER;, Device Mapper and Software Raid (MD) 
 device drivers can be used to arbitrarily combine devices with 
 different I/O parameters.  The kernel's block layer will attempt 
 to reasonably combine the I/O parameters of the individual 
diff --git a/en-US/newstorage-writebarriers.xml b/en-US/newstorage-writebarriers.xml
index 2950d05..8fb4940 100644
--- a/en-US/newstorage-writebarriers.xml
+++ b/en-US/newstorage-writebarriers.xml
@@ -130,7 +130,7 @@ With barriers enabled, an <command>fsync()</command> call will also issue a stor
 
 
 <para>
-To mitigate the risk of data corruption during power loss, some storage devices use battery-backed write caches. Generally, high-end arrays and some hardware controllers use battery-backed write cached. However, because the cache's volatility is not visible to the kernel, Fedora 13 enables write barriers by default on all supported journaling file systems.
+To mitigate the risk of data corruption during power loss, some storage devices use battery-backed write caches. Generally, high-end arrays and some hardware controllers use battery-backed write cached. However, because the cache's volatility is not visible to the kernel, Fedora &PRODVER; enables write barriers by default on all supported journaling file systems.
 </para>
 
 
diff --git a/en-US/swap-extending-lvm2.xml b/en-US/swap-extending-lvm2.xml
index 842e5b1..01d9308 100644
--- a/en-US/swap-extending-lvm2.xml
+++ b/en-US/swap-extending-lvm2.xml
@@ -12,7 +12,7 @@
 				<tertiary>extending</tertiary>
 			</indexterm>
 <para>
-By default, Fedora 13 uses all available space during installation. If this is the case with your system, then you must first add a new physical volume to the volume group used by the swap space. For instructions on how to do so, refer to <xref linkend="s1-system-config-lvm-add-unallocated"/>.
+By default, Fedora &PRODVER; uses all available space during installation. If this is the case with your system, then you must first add a new physical volume to the volume group used by the swap space. For instructions on how to do so, refer to <xref linkend="s1-system-config-lvm-add-unallocated"/>.
 </para>
 
 <para>
diff --git a/en-US/xfs-XFS_Filesystem_Structure.xml b/en-US/xfs-XFS_Filesystem_Structure.xml
index 8fa5d44..9c26a52 100644
--- a/en-US/xfs-XFS_Filesystem_Structure.xml
+++ b/en-US/xfs-XFS_Filesystem_Structure.xml
@@ -35,7 +35,7 @@ designed at Silicon Graphics, Inc. It was created to support extremely large fil
 <varlistentry>
 <term>Main Features</term>
 <listitem><para>
-XFS supports <firstterm>metadata journaling</firstterm>, which facilitates quicker crash recovery. The XFS file system can also be defragmented and enlarged while mounted and active. In addition, Fedora 13 supports backup and restore utilities specific to XFS.
+XFS supports <firstterm>metadata journaling</firstterm>, which facilitates quicker crash recovery. The XFS file system can also be defragmented and enlarged while mounted and active. In addition, Fedora &PRODVER; supports backup and restore utilities specific to XFS.
 </para></listitem>
 </varlistentry>
 
@@ -886,7 +886,7 @@ For more information about freezing and unfreezing an XFS file system, refer to
 </para>
 
 <para>
-To backup or dump an XFS file system, use the <command>xfsdump</command> utility. Fedora 13 supports backups to tape drives or regular file images, and also allows multiple dumps to be written to the same tape. The <command>xfsdump</command> utility also allows a dump to span multiple tapes, although only one dump can be written to a regular file. In addition, <command>xfsdump</command> supports incremental backups, and can exclude files from a backup using size, subtree, or inode flags to filter them. 
+To backup or dump an XFS file system, use the <command>xfsdump</command> utility. Fedora &PRODVER; supports backups to tape drives or regular file images, and also allows multiple dumps to be written to the same tape. The <command>xfsdump</command> utility also allows a dump to span multiple tapes, although only one dump can be written to a regular file. In addition, <command>xfsdump</command> supports incremental backups, and can exclude files from a backup using size, subtree, or inode flags to filter them. 
 </para>
 
 
@@ -1161,7 +1161,7 @@ For more information about dumping and restoring XFS file systems, refer to <com
 
 
 <para>
-Fedora 13 also features other utilities for managing XFS file systems:
+Fedora &PRODVER; also features other utilities for managing XFS file systems:
 </para>
 
 <variablelist>


commit ed34f4f5c33c9ec7b6f6d5b42e9be15bdb71e9bb
Author: Don Domingo <ddomingo at redhat.com>
Date:   Thu Aug 19 12:27:26 2010 +1000

    fixed entities file plus RH entity in some files

diff --git a/en-US/DG_Filesys-File_System.xml b/en-US/DG_Filesys-File_System.xml
index daed06a..488eb68 100644
--- a/en-US/DG_Filesys-File_System.xml
+++ b/en-US/DG_Filesys-File_System.xml
@@ -670,7 +670,7 @@ that store data files for some programs. These subdirectories include:
 		</para>
 		
 		<para>
-			The <filename moreinfo="none">/var/cache/yum/</filename> directory contains files used by the <application moreinfo="none">Package Updater</application>, including RPM header information for the system. This location may also be used to temporarily store RPMs downloaded while updating the system. For more information about &RH; Network, refer to the documentation online at <ulink url="https://rhn.redhat.com/">https://rhn.redhat.com/</ulink>.
+			The <filename moreinfo="none">/var/cache/yum/</filename> directory contains files used by the <application moreinfo="none">Package Updater</application>, including RPM header information for the system. This location may also be used to temporarily store RPMs downloaded while updating the system. For more information about Red Hat Network, refer to the documentation online at <ulink url="https://rhn.redhat.com/">https://rhn.redhat.com/</ulink>.
 		</para>
 
 		<para>
diff --git a/en-US/DG_Filesys-Lvm.xml b/en-US/DG_Filesys-Lvm.xml
index 0854ff4..b8ea6cd 100644
--- a/en-US/DG_Filesys-Lvm.xml
+++ b/en-US/DG_Filesys-Lvm.xml
@@ -94,7 +94,7 @@
 <para>
 This chapter on LVM/LVM2 focuses on the use of the LVM GUI administration tool, i.e. <command>system-config-lvm</command>. For
 comprehensive information on the creation and configuration of LVM partitions in clustered and non-clustered storage,
-please refer to the <citetitle>Logical Volume Manager Administration</citetitle> guide also provided by &RH;.
+please refer to the <citetitle>Logical Volume Manager Administration</citetitle> guide also provided by Red Hat.
 </para>
 
 <para>
diff --git a/en-US/DG_NFS-NFS.xml b/en-US/DG_NFS-NFS.xml
index c62ccff..c890c96 100644
--- a/en-US/DG_NFS-NFS.xml
+++ b/en-US/DG_NFS-NFS.xml
@@ -285,7 +285,7 @@ The option <command>vers</command> is identical to <command>nfsvers</command>, a
 <term>noacl</term>
 <listitem>
 <para>
-Turns off all ACL processing. This may be needed when interfacing with older versions of Fedora, &RHEL;, &RH; Linux, or Solaris, since the most recent ACL technology is not compatible with older systems.
+Turns off all ACL processing. This may be needed when interfacing with older versions of Fedora, Red Hat Enterprise Linux, Red Hat Linux, or Solaris, since the most recent ACL technology is not compatible with older systems.
 </para>
 </listitem></varlistentry>
 
diff --git a/en-US/Storage_Administration_Guide.ent b/en-US/Storage_Administration_Guide.ent
index 69875b9..5c863ca 100644
--- a/en-US/Storage_Administration_Guide.ent
+++ b/en-US/Storage_Administration_Guide.ent
@@ -1,254 +1,5 @@
-<!ENTITY PRODUCT "Red_Hat_Enterprise_Linux">
-<!ENTITY BOOKID "doc-Storage_Administration_Guide">
+<!ENTITY PRODUCT "Fedora Documentation">
+<!ENTITY BOOKID "storage-administration-guide">
+<!ENTITY HOLDER "Red Hat, Inc. and others">
 <!ENTITY YEAR "2010">
-
-<!ENTITY RHSELINUXTOOL "&SEL; Administration Tool">
-<!ENTITY RH "Red Hat">
-<!ENTITY RHI "&RH; Inc.">
-<!ENTITY HOLDER "&RHI; and others">
-<!ENTITY YEAR "2007">
-<!ENTITY CCAG "&RHI; &CC; &CAG;">
-<!ENTITY CCIG "&RHI; &CC; &CIG;">
-<!ENTITY CCRN "&RHI; &CC; &RN;">
-<!ENTITY CCUG "&RHI; &CC; &UG;">
-<!ENTITY CCVER "4.0">
-<!ENTITY CLUMANAGER-386-RPM "clumanager-1.0.4-1.i386.rpm">
-<!ENTITY CRTSAG "&CRTS; &AG;">
-<!ENTITY CRTSAGG "&CRTS; &AGG;">
-<!ENTITY CRTS "Certificate System">
-<!ENTITY CRTSCLTG "&CRTS; &CLTG;">
-<!ENTITY CRTSMG "&CRTS; &MG;">
-<!ENTITY CS "Engineering Content Services">
-<!ENTITY DG "&DCAG;">
-<!ENTITY DPG "&DCAG;">
-<!ENTITY DSAG "&DS; &AG;">
-<!ENTITY DSCCFR "&DS; &CCFR;">
-<!ENTITY DSDGG "&DS; &DGG;">
-<!ENTITY DS "Directory Server">
-<!ENTITY DSC "&DS; Console">
-<!ENTITY DSDPG "&DS; &DPG;">
-<!ENTITY DSGCG "&DS; &GCG;">
-<!ENTITY DSIG "&DS; &IG;">
-<!ENTITY DSOC "&DS; &OC;">
-<!ENTITY DSPPR "&DS; &PPR;">
-<!ENTITY DSRK "&DS; &RK;">
-<!ENTITY EM64T "Intel EM64T">
-<!ENTITY FC "&FED; Core;">
-<!ENTITY FED "Fedora">
-<!ENTITY FIGUREDASH "&#x2012;">
-<!ENTITY FORMAL-RHI "&RH;, Inc.">
-<!ENTITY FORT "Fortitude">
-<!ENTITY HYPHEN "&#x2010;">
-<!ENTITY IPVS-386-RPM "ipvsadm-1.18-8.i386.rpm">
-<!ENTITY JBEAPVER "4.2">
-<!ENTITY KERNVER "2.6.x">
-<!ENTITY LEGALNOTICE-IDM SYSTEM "./boilerplate-idm.xml">
-<!ENTITY LOCALVER "7.3">
-<!ENTITY MINUS "&#x2212;">
-<!ENTITY NBHYPHEN "&#x2011;">
-<!ENTITY NES "NES">
-<!ENTITY NSS "NSS">
-<!ENTITY ORG "&RHIS;">
-<!ENTITY PG "&SELG;">
-<!ENTITY PIRANHA-386-RPM "piranha-0.7.0-1.i386.rpm">
-<!ENTITY PROD "Fedora">
-<!ENTITY PRODVER "13">
-<!ENTITY PROXYIG "&RHN; &PROXYVER; &PROXYX; &IG;">
-<!ENTITY PROXYVER "4.2.0">
-<!ENTITY QUOTEDASH "&#8213;">
-<!ENTITY RA "Registration Authority">
-<!ENTITY RHASVER "V.1.1">
-<!ENTITY RHCC "&RHI; &CC;">
-<!ENTITY RHCRTSAGG "&RHI; &CRTSAGG;">
-<!ENTITY RHCRTSAG "&RHI; &CRTSAG;">
-<!ENTITY RHCRTSCLTG "&RHI; &CRTSCLTG;">
-<!ENTITY RHCRTSMG "&RHI; &CRTSMG;">
-<!ENTITY RHCRTS "&RHI; &CRTS;">
-<!ENTITY RHCRTSVER "8.0">
-<!ENTITY RHCSG "&RHCS; &CMIAG;"> 
-<!ENTITY RHCSGS "rh-cs">
-<!ENTITY RHDSAG "&RHI; &DSAG;">
-<!ENTITY RHDSCCFR "&RHI; &DSCCFR;">
-<!ENTITY RHDSDGG "&RHI; &DSDGG;">
-<!ENTITY RHDSDPG "&RHI; &DSDPG;">
-<!ENTITY RHDSGCG "&RHI; &DSGCG;">
-<!ENTITY RHDSIG "&RHI; &DSIG;">
-<!ENTITY RHDSOC "&RHI; &DSOC;">
-<!ENTITY RHDSPPR "&RHI; &DSPPR;">
-<!ENTITY RHDS "&RHI; &DS;">
-<!ENTITY RHDSVER "8.0.0">
-<!ENTITY RHELIG "&RHEL; &IG;">
-<!ENTITY RHELIGS390S "rhel-ig-s390">
-<!ENTITY RHELIGX8664S "rhel-ig-x8664">
-<!ENTITY RHELISA "&RHEL; &ISA;">
-<!ENTITY RHELQIGS390S "rhel-qig-s390">
-<!ENTITY RHELQIGX8664S "rhel-qig-x8664">
-<!ENTITY RHELRG "&RHEL; &RG;">
-<!ENTITY RHELSAG "&RHEL; &SAG;">
-<!ENTITY RHELSBS "&RHEL; &SBS;">
-<!ENTITY RHELSG "&RHEL; &SG;">
-<!ENTITY RHELVER "6">
-<!ENTITY RHFORT "&RHI; &FORT;">
-<!ENTITY RHGFSG "&RHGFS; &GFSIAG;">
-<!ENTITY RHGFSGS "rh-gfsg">
-<!ENTITY RHGFS "&RH; GFS">
-<!ENTITY RHI "&RH;">
-<!ENTITY RHLAS "&RHELAS;">
-<!ENTITY RHLASVER "2.1">
-<!ENTITY RHLIA64ASS "rhl-ig-as-itanium">
-<!ENTITY RHLIA64ASVER "2.1">
-<!ENTITY RHLIA64AWS "rhl-ig-aw-itanium">
-<!ENTITY RHLIA64AWVER "2.1">
-<!ENTITY RHLIA64S "rhl-ig-itanium">
-<!ENTITY RHLIGIA64 "&RHL; Itanium &IG;">
-<!ENTITY RHL "&RH; Linux">
-<!ENTITY RHLS390S "rhl-ig-s390">
-<!ENTITY RHNRG "&RHN; &RG;">
-<!ENTITY RHNVER "5.0.0">
-<!ENTITY RHNX "RHN">
-<!ENTITY RH "Red Hat">
-<!ENTITY RHSELG "&RHI; &SELG;">
-<!ENTITY RHSELGS "rhel-selg">
-<!ENTITY ROOT "<systemitem class='username'>root</systemitem>">
-<!ENTITY SATIG "&RHN; &SATVER; &SATX; &IG;">
-<!ENTITY SATVER "4.2.0">
-<!ENTITY SEL "SELinux">
-<!ENTITY SHARED-SCSI-386-RPM "scsi_reserve-0.7-6.i386.rpm">
-<!ENTITY SMPM "solaris2mpm">
-<!ENTITY RHEL "Red Hat Enterprise Linux">
-<!ENTITY X8664 "x86, Itanium, AMD64, and &EM64TLONG; (&EM64T;)">
-<!ENTITY CURRENTVER "5.2">
-<!ENTITY ADS "Administration Server">
-<!ENTITY AG "Administration Guide">
-<!ENTITY AGG "Agent Guide">
-<!ENTITY AKA "Activation Key Administrator">
-<!ENTITY APACHE "Apache Web server">
-<!ENTITY BC "Update">
-<!ENTITY BIGB "<guilabel>Big Board</guilabel>">
-<!ENTITY BROKER "RHN Proxy Broker Server">
-<!ENTITY CA "certificate authority">
-<!ENTITY CACHE "HTTP Proxy Caching Server">
-<!ENTITY CAG "Check Reference Guide">
-<!ENTITY CC "Command Center">
-<!ENTITY CCFR "Configuration, Command, and File Reference">
-<!ENTITY CCMENU "<guilabel>Command Center</guilabel>">
-<!ENTITY CFA "Configuration Administrator">
-<!ENTITY CIG "Setup and Installation Guide">
-<!ENTITY CLTG "Command-Line Tools Guide">
-<!ENTITY CON "Console">
-<!ENTITY CSMENU "<guilabel>Current State</guilabel> area">
-<!ENTITY DCAG "Deployment Guide">
-<!ENTITY DG "Developer's Guide">
-<!ENTITY DGG "DSML Gateway Guide">
-<!ENTITY EM64TLONG "Intel Extended Memory 64 Technology">
-<!ENTITY EMB "Embedded Database">
-<!ENTITY ENT "Management">
-<!ENTITY FAQ "Frequently Asked Questions (FAQ)">
-<!ENTITY FP "&FED; Project">
-<!ENTITY GCG "Gateway Customization Guide">
-<!ENTITY GFSU2 "&RHGFS; &PRODVER; for &RHEL; 4 Update 2">
-<!ENTITY HTTPD "Apache HTTP Server">
-<!ENTITY IG "Installation Guide">
-<!ENTITY IGS390 "&IG; for the &S390; Architectures">
-<!ENTITY IGX8664 "&IG; for &X8664;">
-<!ENTITY ISA "Introduction to System Administration">
-<!ENTITY JBEAP "JBoss Enterprise Application Platform">
-<!ENTITY LANG "EN">
-<!ENTITY LSCAP "Scout">
-<!ENTITY LS "scout">
-<!ENTITY LSSENT "&LSCAP;">
-<!ENTITY MA "&MON; Administrator">
-<!ENTITY MG "Migration Guide">
-<!ENTITY MMENU "<guilabel>Main Menu</guilabel>">
-<!ENTITY MON "Monitoring">
-<!ENTITY NESFULL "Netscape Enterprise Server">
-<!ENTITY NG "Networking Guide">
-<!ENTITY NSSFULL "Network Security Services">
-<!ENTITY NWMAP "<guilabel>Network Map</guilabel>">
-<!ENTITY NWMENU "<guilabel>Network Status</guilabel> bar">
-<!ENTITY OA "Organization Administrator">
-<!ENTITY OC "Org Chart">
-<!ENTITY PIRANHA "Piranha Configuration Tool">
-<!ENTITY PPC "IBM POWER Architecture">
-<!ENTITY PPR "Plug-in Programmer's Guide">
-<!ENTITY PRO "Provisioning">
-<!ENTITY PROXY "RHN Proxy Server">
-<!ENTITY PROXYX "Proxy">
-<!ENTITY QIGS390 "&QIG; for the &S390; Architectures">
-<!ENTITY QIGX8664 "&QIG; for &X8664;">
-<!ENTITY REDIRECT "RHN SSL Redirect Server">
-<!ENTITY RG "Reference Guide">
-<!ENTITY RHAS "&RH; Application Stack">
-<!ENTITY RHAUTHTOOL "Authentication Configuration Tool">
-<!ENTITY RHCLUSTERSTATTOOL "Cluster Status Tool">
-<!ENTITY RHCLUSTERTOOL "Cluster Configuration Tool">
-<!ENTITY RHCM "&RH; Cluster Manager">
-<!ENTITY RHCS "&RH; Cluster Suite">
-<!ENTITY RHDATETOOL "Time and Date Properties Tool">
-<!ENTITY RHD "&RH; Desktop">
-<!ENTITY RHDSIG "&RH; &DS; Installation Guide">
-<!ENTITY RHDSRK "&RH; &DS; Resource Kit">
-<!ENTITY RHDSSR "&RH; &DS; Schema Reference">
-<!ENTITY RHELAS21 "&RHEL; AS 2.1 Update 5">
-<!ENTITY RHELAS3 "&RHEL; AS 3 Update 5">
-<!ENTITY RHELAS4 "&RHEL; AS 4">
-<!ENTITY RHELAS "&RHEL; AS">
-<!ENTITY RHEL "&RH; Enterprise Linux">
-<!ENTITY RHGFSTOOL "GFS Setup Druid">
-<!ENTITY RHKBDTOOL "Keyboard Configuration Tool">
-<!ENTITY RHLIGS390 "&RHL; for S/390 &IG;">
-<!ENTITY RHLOGTOOL "Log Viewer">
-<!ENTITY RHMAINMENU "Applications (the main menu on the panel)">
-<!ENTITY RHNAC "&RHN; Actions Control">
-<!ENTITY RHNAPPLET "&RHN; Alert Notification Tool">
-<!ENTITY RHNAUTHD "RHN Authentication Daemon">
-<!ENTITY RHNBT "RHN Bootstrap">
-<!ENTITY RHNCC "&RHN; Configuration Client">
-<!ENTITY RHNCLIENTCONF "&RHN; Client Configuration Guide">
-<!ENTITY RHNCM "&RHN; Configuration Manager">
-<!ENTITY RHNDB "RHN DB Control">
-<!ENTITY RHND "&RHN; Daemon">
-<!ENTITY RHNETWORKTOOL "Network Administration Tool">
-<!ENTITY RHNMD "&RHN; Monitoring Daemon">
-<!ENTITY RHNPM "RHN Package Manager">
-<!ENTITY RHNPUSH "RHN Push">
-<!ENTITY RHNRC "&RHN; Registration Client">
-<!ENTITY RHN "Red Hat Network">
-<!ENTITY RHNSA "RHN Satellite Activate">
-<!ENTITY RHNSE "RHN Satellite Exporter">
-<!ENTITY RHNSMT "RHN SSL Maintenance Tool">
-<!ENTITY RHNSST "RHN Satellite Synchronization Tool">
-<!ENTITY RHNTE "RHN Task Engine">
-<!ENTITY RHPRINTERTOOL "Printer Configuration Tool">
-<!ENTITY RHRPMTOOL "Package Management Tool">
-<!ENTITY RHSAMBATOOL "Samba Server Configuration Tool">
-<!ENTITY RHSECLEVELTOOL "Security Level Configuration Tool">
-<!ENTITY RHSECONDMENU "Actions (on the panel)">
-<!ENTITY RHSERVICESTOOL "Services Configuration Tool">
-<!ENTITY RHSETUPAGENT "Setup Agent">
-<!ENTITY RHTHIRDMENU "System (on the panel)">
-<!ENTITY RHUA "Red Hat Update Agent">
-<!ENTITY RHUSERTOOL "User Manager">
-<!ENTITY RHVIRTUALIZATION "Red Hat Virtualization">
-<!ENTITY RHXFREE86TOOL "X Configuration Tool">
-<!ENTITY RK "Resource Kit">
-<!ENTITY RN "Release Notes">
-<!ENTITY S390 "IBM S/390 and IBM eServer zSeries">
-<!ENTITY SAG "System Administration Guide">
-<!ENTITY SAT "RHN Satellite Server">
-<!ENTITY SATX "Satellite">
-<!ENTITY SBS "Step By Step Guide">
-<!ENTITY SELG "&SEL; Guide">
-<!ENTITY SGA "System Group Administrator">
-<!ENTITY SG "Security Guide">
-<!ENTITY SIG "&SAT; &SATVER; Installation Guide">
-<!ENTITY SR "Schema Reference">
-<!ENTITY SSM "System Set Manager">
-<!ENTITY STAN "Stand-Alone Database">
-<!ENTITY UG "User's Guide">
-<!ENTITY UNIX "UNIX Support">
-
-<!ENTITY RHEL "Red Hat Enterprise Linux">
-
-
-
+<!ENTITY PRODVER "14">
diff --git a/en-US/ch-dmultipath_virtstorage.xml b/en-US/ch-dmultipath_virtstorage.xml
index 3f79e73..d0b1220 100644
--- a/en-US/ch-dmultipath_virtstorage.xml
+++ b/en-US/ch-dmultipath_virtstorage.xml
@@ -9,7 +9,7 @@
 <para>
 Fedora 13 also supports <firstterm>DM-Multipath</firstterm> and 
 <firstterm>virtual storage</firstterm>. Both features are documented in detail 
-in other stand-alone books also provided by &RH;.
+in other stand-alone books also provided by Red Hat.
 </para>
 
 <section id="virtstorage">
@@ -51,7 +51,7 @@ directly to a guest. Volumes of a storage pool can be allocated to virtualized g
 <important><para>
 For comprehensive information on the deployment and configuration of virtual storage instances in your environment, 
 please refer to the <citetitle>Virtualization Storage</citetitle> section of the <citetitle>Virtualization</citetitle> 
-guide provided by &RH;.
+guide provided by Red Hat.
 </para></important>
 
 </section>
@@ -95,7 +95,7 @@ DM-Multipath can be configured in active/active mode, where I/O is spread over t
 
 <important><para>
 For comprehensive information on the deployment and configuration of DM-Multipath in your environment, 
-please refer to the <citetitle>Using DM-Multipath</citetitle> guide provided by &RH;.
+please refer to the <citetitle>Using DM-Multipath</citetitle> guide provided by Red Hat.
 </para></important>
 
 


