[virtualization-guide] massive numbers of edits, I've broken parts of the book too and I can't find the error

[Chris Curran]

commit 840344d20de562b548ce5d9ee494f6fa8084b1dd
Author: Chris Curran <ccurran(a)redhat.com&gt;
Date:   Thu Jun 24 17:16:25 2010 +1000

    massive numbers of edits, I've broken parts of the book too and I can't find
the error

 en-US/Storage_Concepts.xml             |  233 +++++++++++++++++--------------
 en-US/Storage_Pools_Dedicated_Disk.xml |    2 +-
 en-US/Storage_Pools_GFS2.xml           |    2 +-
 en-US/Storage_Pools_GlusterFS.xml      |    2 +-
 en-US/Storage_Pools_LVM.xml            |    2 +-
 en-US/Storage_Pools_NFS.xml            |   69 +++++++++-
 en-US/Storage_Pools_SRP.xml            |    2 +-
 en-US/Storage_Pools_iSCSI.xml          |    2 +-
 8 files changed, 199 insertions(+), 115 deletions(-)
---
diff --git a/en-US/Storage_Concepts.xml b/en-US/Storage_Concepts.xml
index 21674bb..6792541 100644
--- a/en-US/Storage_Concepts.xml
+++ b/en-US/Storage_Concepts.xml
@@ -9,7 +9,7 @@
              + Running vs stopped storage pools
              + What auto-starting does for a storage pool
 -->
-	
+	<para>This chapter introduces the concepts used for describing managing storage
devices.</para>
 	<section id="sect-Virtualization-Storage_Concepts-Storage_Pools">
 		<title>Storage pools</title>
 		<para>
@@ -18,27 +18,50 @@
 		
 		<!--TODO Image request -->
 		
-<!--
+		
 		<para>
 			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 virtualised guests. 
There are two categories of storage pool available:
 		</para>
-		<itemizedlist>
-		   <listitem>
-			   <formalpara>
-				   <title>Local storage pools</title>
-				   <para>Local storage covers any storage device directedly attached to a host
server. Local storage includes local directories, directly attached disks, and most LVM
Volume Groups.
-				   Local storage is generally considered useful for development and testing purposes,
but as unsuitable for most Production environments as it doesn't allow for live host
migration.</para>
-			   </formalpara>
-		   </listitem>
-		   <listitem>
-			   <formalpara>
-				  <title>Networked (shared) storage pools</title>
-				   <para>Networked storage covers storage devices shared over a network using
standard protocols. Networked storage includes shared storage devices using Fibre Channel,
iSCSI, NFS, GFS2, GlusterFS, and SCSI RDMA protocols. Networked storage is a requirement
for migrating guest virtualized guests between hosts.
+		
+		<formalpara>
+			<title>Local storage pools</title>
+			<para>Local storage pools are directedly attached to the host server. Local
storage pools include local directories, directly attached disks, and LVM volume groups on
local devices.
+				   </para>
+		</formalpara>
+		<para>Local storage pools are useful for development, testing and small
deployments that do not require migration or large numbers of virtualized guests. Local
storage pools are not suitable for many production environments as local storage pools
cannot support live migration.</para>
+		
+		<formalpara>
+			<title>Networked (shared) storage pools</title>
+			<para>Networked storage pools covers storage devices shared over a network using
standard protocols. 
 				</para>
-			  </formalpara>
-		  </listitem>
+		</formalpara>
+		<para>Supported protocols for networked storage pools:</para>
+		
+		<itemizedlist>
+			<listitem>
+				<para>Fibre Channel-based LUNs</para>
+			</listitem>
+			<listitem>
+				<para> iSCSI</para>
+			</listitem>
+			<listitem>
+				<para> NFS</para>
+			</listitem>
+			<listitem>
+				<para> GFS2</para>
+			</listitem>
+			<listitem>
+				<para>SCSI RDMA protocols (SCSI RCP), the block export protocol used in
Infiniband and 10GbE iWARP adapters.</para>
+			</listitem>
+			  <!-- What about RHEL TODO-->
+			<listitem>
+				<para> GlusterFS</para>
+			</listitem>
 		</itemizedlist>
--->
+		
+		<para>Networked storage is a requirement for migrating guest virtualized guests
between hosts. Networked storage pools are managed by libvirt.</para>
+	
+	
 	</section>
 	
 	<section id="sect-Virtualization-Storage_Concepts-Volumes">
@@ -48,29 +71,27 @@
 		<para>
 			Storage pools are divided into storage volumes. Storage volumes are an abstraction of
physical partitions, LVM logical volumes, file-based disk images and other storage types
handled by libvirt. Storage volumes are presented to virtualized guests as local storage
devices regardless of the underlying hardware.
 		</para>
-		<section>
-			<title>
-				Referencing volumes
-			</title>
+		<formalpara>
+			<title>	Referencing volumes</title>
 			<para>
 				To reference a specific volume, three approaches are possible:
 			</para>
-			<itemizedlist>
+		</formalpara>
+		<variablelist>
+			<varlistentry>
+				<term>The name of the volume and the storage pool					</term>
 				<listitem>
-					<formalpara>
-						<title>
-							The name of the volume, paired with the pool the volume belongs to
-						</title>
-						<para>
+					<para>
 							A volume may be referred to by name, along with an identifier for the storage pool
it belongs in. On the virsh command line, this takes the form
<parameter>--pool</parameter>
-							<replaceable>storage_pool</replaceable>
-							<replaceable>volume_name</replaceable>.
+						<replaceable>storage_pool</replaceable>
+						<replaceable>volume_name</replaceable>.
 						</para>
-					</formalpara>
+						
 					<para>
 						For example, a volume named <replaceable>firstimage</replaceable> in
the <replaceable>guest_images</replaceable> pool.
 					</para>
-					<screen>virsh # vol-info --pool
<replaceable>guest_images</replaceable>
<replaceable>firstimage</replaceable>
+					<screen>virsh # vol-info --pool
<replaceable>guest_images</replaceable>
+						<replaceable>firstimage</replaceable>
 Name:           <replaceable>firstimage</replaceable>
 Type:           block
 Capacity:       20.00 GB
@@ -78,117 +99,119 @@ Allocation:     20.00 GB
 
 virsh #</screen>
 				</listitem>
-				<listitem>
-					<formalpara>
-						<title>
+			</varlistentry>
+			<varlistentry>
+						
+					
+				<term>
 					   		The full path to the storage on the host system
-					   	</title>
-						<para>
+					   	</term>
+				<listitem>
+					<para>
 					   		A volume may also be referred to by its full path on the file system. When
using this approach, a pool identifier does not need to be included.
 					   	</para>
-					</formalpara>
+						
 					<para>
 						For example, a volume named <replaceable>secondimage.img</replaceable>,
visible to the host system as
<replaceable>/images/secondimage.img</replaceable>. This can be refered to as
<replaceable>/images/secondimage.img</replaceable>.
 					</para>
-					<screen>virsh # vol-info
<replaceable>/images/secondimage.img</replaceable>
+					<screen># virsh vol-info
<replaceable>/images/secondimage.img</replaceable>
 Name:           <replaceable>secondimage.img</replaceable>
 Type:           file
 Capacity:       20.00 GB
 Allocation:     136.00 KB
-
-virsh #</screen>
+</screen>
 				</listitem>
-				<listitem>
-					<formalpara>
-						<title>
+				</varlistentry>
+					<varlistentry>
+						<term>
 					   		The unique volume key
-					   	</title>
-						<para>
+					   	</term>
+						<listitem>
+							<para>
 					   		When a volume is first created in the virtualization system, a unique
identifier is generated and assigned to it.  The unique identifier is termed the
<firstterm>volume key</firstterm>. The format of this volume key varies upon
the storage used.
 					   	</para>
-					</formalpara>
-					<para>
+								
+							<para>
 				   		When used with block based storage such as LVM, the volume key may follow this
format:
 				   	</para>
-					<screen>c3pKz4-qPVc-Xf7M-7WNM-WJc8-qSiz-mtvpGn</screen>
-					<para>
+							<screen>c3pKz4-qPVc-Xf7M-7WNM-WJc8-qSiz-mtvpGn</screen>
+							<para>
 				   		When used with file based storage, the volume key may instead be a copy of the
full path to the volume storage.
 				   	</para>
-					<screen>/images/secondimage.img</screen>
-					<para>
+							<screen>/images/secondimage.img</screen>
+							<para>
 				   		For example, a volume with the volume key of
<replaceable>Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr</replaceable>: 
 				   	</para>
-					<screen>virsh # vol-info Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
+							<screen># virsh vol-info Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
 Name:           <replaceable>firstimage</replaceable>
 Type:           block
 Capacity:       20.00 GB
 Allocation:     20.00 GB
-
-virsh #</screen>
-				</listitem>
-			</itemizedlist>
-			<para>
+</screen>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<para>
 				Virsh provides commands for converting between a volume name, volume path, or volume
key:
 			</para>
-			<itemizedlist>
-				<listitem>
-					<formalpara>
-						<title>
+				<variablelist>
+						
+								
+					<varlistentry>
+						<term>
 							vol-name
-						</title>
-						<para>
+						</term>
+						<listitem>
+							<para>
 							Returns the volume name when provided with a volume path or volume key.
 						</para>
-					</formalpara>
-					<screen>virsh # vol-name
/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
-<replaceable>firstimage</replaceable>
-
-virsh # vol-name
<replaceable>Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr</replaceable>
-<replaceable>firstimage</replaceable>
-
-virsh #</screen>
-				</listitem>
-				<listitem>
-					<formalpara>
-						<title>vol-path</title>
+										
+<screen># virsh vol-name
/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
<replaceable>firstimage</replaceable>
+# virsh vol-name
<replaceable>Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr</replaceable>
+</screen>
+						</listitem>
+					</varlistentry>
+						
+								
+					<varlistentry>
+						<term>vol-path</term>
+						<listitem>
 						<para>
 							Returns the volume path when provided with a volume key, or a storage pool
identifier and volume name.
 						</para>
-					</formalpara>
-					<screen># virsh vol-path Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
+										
+<screen># virsh vol-path Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr

/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
-
 # virsh vol-path --pool <replaceable>guest_images</replaceable>
<replaceable>firstimage</replaceable>

/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
-
-virsh #</screen>
-				</listitem>
-				<listitem>
-					<formalpara>
-						<title>The vol-key command</title>
-						<para>
+</screen>
+						</listitem>
+					</varlistentry>
+					<varlistentry>
+						<term>The vol-key command</term>
+						<listitem>
+						
+										
+							<para>
 							Returns the volume key when provided with a volume path, or a storage pool
identifier and volume name.
 						</para>
-					</formalpara>
-					<screen># virsh vol-key
/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
-Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
-
-virsh # vol-key --pool <replaceable>guest_images</replaceable>
<replaceable>firstimage</replaceable>
+										
+							<screen># virsh vol-key
/dev/<replaceable>guest_images</replaceable>/<replaceable>firstimage</replaceable>
 Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
-
-virsh #</screen>
-				</listitem>
-			</itemizedlist>
-		</section>
-	</section>
+# virsh vol-key --pool <replaceable>guest_images</replaceable>
<replaceable>firstimage</replaceable> Wlvnf7-a4a3-Tlje-lJDa-9eak-PZBv-LoZuUr
+</screen>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+					
+			</section>
 	
-	<section
id="sect-Virtualization-Storage_Concepts-Not_Using_Storage_Pools">
-		<title>Not using storage pools or volumes</title>
-		<para>This would probably cover adding things to the default
directory?</para>
-		<para>
-			Placeholder
-		</para>
-	</section>
-
-</chapter>
+					
+<section id="sect-Virtualization-Storage_Concepts-Not_Using_Storage_Pools"
>
+	<title>Using other storage methods<title>
+	<para>Placeholder</para>
+<!--This would probably cover adding things to the default directory-->
+</section>
+						
+				</chapter>
 
diff --git a/en-US/Storage_Pools_Dedicated_Disk.xml
b/en-US/Storage_Pools_Dedicated_Disk.xml
index 85b5a8d..43b0dba 100644
--- a/en-US/Storage_Pools_Dedicated_Disk.xml
+++ b/en-US/Storage_Pools_Dedicated_Disk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section
id="sect-Virtualization-Storage_Pools-Creating-Dedicated_Disk_Devices">
-	<title>Dedicated storage devices</title>
+	<title>Dedicated storage device-based storage pools</title>
 	<para>
 		This section covers dedicating storage devices to virtualized guests.
 	</para>
diff --git a/en-US/Storage_Pools_GFS2.xml b/en-US/Storage_Pools_GFS2.xml
index c0bac3a..8d36af0 100644
--- a/en-US/Storage_Pools_GFS2.xml
+++ b/en-US/Storage_Pools_GFS2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-GFS2">
-	<title>Using GFS2 for storing virtual disk images</title>
+	<title>GFS2-based storage pools</title>
 	<para>
 		This chapter covers using the Global File System 2 (GFS2) to store virtualized guests.
 	</para>
diff --git a/en-US/Storage_Pools_GlusterFS.xml b/en-US/Storage_Pools_GlusterFS.xml
index dabaed3..c64bec8 100644
--- a/en-US/Storage_Pools_GlusterFS.xml
+++ b/en-US/Storage_Pools_GlusterFS.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-GlusterFS">
-	<title>Using GlusterFS for storing virtual disk images</title>
+	<title>GlusterFS-based storage pools</title>
 	<para>
 		This section covers using GlusterFS to store virtualized guests.
 	</para>
diff --git a/en-US/Storage_Pools_LVM.xml b/en-US/Storage_Pools_LVM.xml
index 2ec6d88..1649d8f 100644
--- a/en-US/Storage_Pools_LVM.xml
+++ b/en-US/Storage_Pools_LVM.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-LVM">
-	<title>LVM Volume Groups</title>
+	<title>LVM-based storage pools</title>
 	<para>
 		This chapter covers using LVM volume groups as storage pools.
 	</para>
diff --git a/en-US/Storage_Pools_NFS.xml b/en-US/Storage_Pools_NFS.xml
index 9d955d4..43ed039 100644
--- a/en-US/Storage_Pools_NFS.xml
+++ b/en-US/Storage_Pools_NFS.xml
@@ -2,9 +2,70 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-NFS">
-	<title>Using NFS for storing virtual disk images</title>
-	<para>
-		This section covers using NFS to store virtualized guests.
-	</para>
+	<title>NFS-based storage pools</title>
+	<para>This procedure covers creating a storage pool with a NFS mount point in
<command>virt-manager</command>.</para>
+			<!--reusable--><procedure>
+				<title>Creating a NFS-based storage pool with virt-manager</title>
+				<step> 
+					<title>Open the host storage tab</title>
+					<para>Open the <guilabel>Storage</guilabel> tab in the
<guilabel>Host Details</guilabel> window.</para>
+					<substeps>
+						<step>
+							<para>Open <command>virt-manager</command>.</para>
+						</step>
+						<step>
+							<para>Select a host from the main
<command>virt-manager</command> window.</para>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="images/virt-manager_select_host.png"
format="PNG" scalefit="1" />
+								</imageobject>
+							</mediaobject>
+						</step>
+						<step>
+							<para>Open the Edit menu and select Host Details.</para>
+						</step>
+						<step>
+							<para>Click on the Storage tab of the Host Details window.</para>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="images/virt-manager_host_details_storage.png"
format="PNG" scalefit="1" />
+								</imageobject>
+							</mediaobject>
+						</step>
+					</substeps>
+				</step>
+				<step>
+					<title>Create a new pool (part 1)</title>
+					<para>Press the <guilabel>+</guilabel> button (the add pool
button). The <guilabel>Add a New Storage Pool</guilabel> wizard
appears.</para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/virt-manager_add_nfs_step1.png"
format="PNG" scalefit="1" />
+						</imageobject>
+					</mediaobject>
+					<para>Choose a name for the storage pool and press
<guibutton>Forward</guibutton> to continue.</para>
+				</step>
+				
+				<step>
+					<title>Create a new pool (part 2)</title>
+					<para>Enter the target path for the device, the hostname and the NFS share
path. Set the <guilabel>Format</guilabel> option to
<guilabel>NFS</guilabel> or <guilabel>auto</guilabel> (to detect
the type). The target path must be identical on all hosts for migration.
+					</para>				<para>Enter the hostname or IP address of the NFS server.
This example uses <computeroutput>server1.example.com</computeroutput>.
+					</para>
+						<para>Enter the NFS path. This example uses
<computeroutput>/nfstrial</computeroutput>.
+					</para>
+						
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/virt-manager_add_nfs_step2.png"
format="PNG" scalefit="1" />
+							</imageobject>
+						</mediaobject>
+						<para>Press <guibutton>Finish</guibutton> to create the new
storage pool.</para>
+					</step>
+				</procedure>
+		
+		<section>
+				<title>Creating NFS-based storage pools with libvirt</title>
+				<para>Placeholder</para>
+			</section>
+		</section>
 </section>
 
diff --git a/en-US/Storage_Pools_SRP.xml b/en-US/Storage_Pools_SRP.xml
index a3cbb49..d0b6dd3 100644
--- a/en-US/Storage_Pools_SRP.xml
+++ b/en-US/Storage_Pools_SRP.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-SRP">
-	<title>SCSI RDMA Protocol</title>
+	<title>SCSI RDMA protocol-based storage pools</title>
 	<para>
 		This chapter covers using <firstterm>SCSI RDMA Protocol</firstterm> (SRP)
to store virtualized guests.
 	</para>
diff --git a/en-US/Storage_Pools_iSCSI.xml b/en-US/Storage_Pools_iSCSI.xml
index 970f5f0..2b5e765 100644
--- a/en-US/Storage_Pools_iSCSI.xml
+++ b/en-US/Storage_Pools_iSCSI.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 <section id="sect-Virtualization-Storage_Pools-Creating-iSCSI">
-	<title>Using iSCSI for storing virtual disk images</title>
+	<title>iSCSI-based storage pools</title>
 	<para>
 		This section covers using iSCSI-based devices to store virtualized guests.
 	</para>