cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/master to b68cc33
Date Mon, 01 Jul 2013 10:01:49 GMT
Updated Branches:
  refs/heads/master 030403482 -> b68cc3346


CLOUDSTACK-3300: Adding patches from cloudstack-1313


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b68cc334
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b68cc334
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b68cc334

Branch: refs/heads/master
Commit: b68cc3346a8b7c4e49c20d5dbe8e973cbbd6cbce
Parents: 0304034
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Authored: Mon Feb 18 16:55:35 2013 +0530
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Mon Jul 1 12:01:39 2013 +0200

----------------------------------------------------------------------
 docs/en-US/attaching-volume.xml                 | 57 +++++++----
 docs/en-US/creating-new-volumes.xml             | 99 ++++++++++++--------
 docs/en-US/detach-move-volumes.xml              | 58 +++++++-----
 docs/en-US/storage.xml                          | 15 ++-
 docs/en-US/upload-existing-volume-to-vm.xml     | 90 +++++++++++++++++-
 docs/en-US/vm-storage-migration.xml             | 27 +++---
 .../volume-deletion-garbage-collection.xml      | 29 ++++--
 docs/en-US/working-with-volumes.xml             | 51 +++++-----
 8 files changed, 291 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attaching-volume.xml b/docs/en-US/attaching-volume.xml
index 360555e..7511ec3 100644
--- a/docs/en-US/attaching-volume.xml
+++ b/docs/en-US/attaching-volume.xml
@@ -21,24 +21,41 @@
  specific language governing permissions and limitations
  under the License.
 -->
-
 <section id="attaching-volume">
-    <title>Attaching a Volume</title>
-    <para>You can attach a volume to a guest VM to provide extra disk storage. Attach
a volume when you first create a new volume, when you are moving an existing volume from one
VM to another, or after you have migrated a volume from one storage pool to another.</para>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-            <listitem><para>In the left navigation, click Storage.</para></listitem>
-            <listitem><para>In Select View, choose Volumes.</para></listitem>
-            <listitem><para>4.    Click the volume name in the Volumes list,
then click the Attach Disk button<inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/attach-disk-icon.png" />
-                </imageobject>
-                <textobject><phrase>AttachDiskButton.png: button to attach a
volume</phrase></textobject>
-            </inlinemediaobject>
-                </para></listitem>
-            <listitem><para>In the Instance popup, choose the VM to which you
want to attach the volume. You will only see instances to which you are allowed to attach
volumes; for example, a user will see only instances created by that user, but the administrator
will have more choices.</para>
-                <!-- <para>If the VM is running in the OVM hypervisor, the VM must
be stopped before a new volume can be attached to it.</para> -->
-            </listitem> 
-            <listitem><para>When the volume has been attached, you should be
able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
-        </orderedlist>
-    </section>
+  <title>Attaching a Volume</title>
+  <para>You can attach a volume to a guest VM to provide extra disk storage. Attach
a volume when
+    you first create a new volume, when you are moving an existing volume from one VM to
another, or
+    after you have migrated a volume from one storage pool to another.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, click Storage.</para>
+    </listitem>
+    <listitem>
+      <para>In Select View, choose Volumes.</para>
+    </listitem>
+    <listitem>
+      <para>4. Click the volume name in the Volumes list, then click the Attach Disk
button<inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/attach-disk-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>AttachDiskButton.png: button to attach a volume</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
+    </listitem>
+    <listitem>
+      <para>In the Instance popup, choose the VM to which you want to attach the volume.
You will
+        only see instances to which you are allowed to attach volumes; for example, a user
will see
+        only instances created by that user, but the administrator will have more choices.</para>
+      <!-- <para>If the VM is running in the OVM hypervisor, the VM must be stopped
before a new volume can be attached to it.</para> -->
+    </listitem>
+    <listitem>
+      <para>When the volume has been attached, you should be able to see it by clicking
Instances,
+        the instance name, and View Volumes.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/creating-new-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-new-volumes.xml b/docs/en-US/creating-new-volumes.xml
index 5a12d7f..5440dc5 100644
--- a/docs/en-US/creating-new-volumes.xml
+++ b/docs/en-US/creating-new-volumes.xml
@@ -20,44 +20,65 @@
 	KIND, either express or implied.  See the License for the
 	specific language governing permissions and limitations
 	under the License.
--->	
+-->
 <section id="creating-new-volumes">
-	<title>Creating a New Volume</title>
-	<para>You can add more data disk volumes to a guest VM at any time, up to the limits
of your storage capacity. Both &PRODUCT; administrators and users can add volumes to VM
instances. When you create a new volume, it is stored as an entity in &PRODUCT;, but the
actual storage resources are not allocated on the physical storage device until you attach
the volume. This optimization allows the &PRODUCT; to provision the volume nearest to
the guest that will use it when the first attachment is made.</para>
-	<section id="local-storage-data-volumes">
-		<title>Using Local Storage for Data Volumes</title>
-	    <para>You can  create data volumes on local storage (supported with XenServer,
KVM, and VMware).
-		    The data volume is placed on the same
-			host as the VM instance that is attached to the data volume. These
-			local data volumes can be attached to virtual machines, detached, re-attached,
-			and deleted just as with the other types of data volume.</para>
-		<para>Local storage is ideal for scenarios where persistence of data volumes and
HA
-			is not required. Some of the benefits include reduced disk I/O latency and cost
-			reduction from using inexpensive local disks.</para>
-		<para>In order for local volumes to be used, the feature must be enabled for the
-			zone.</para>
-		<para>You can create a data disk offering for local storage. When a user creates
a
-			new VM, they can select this disk offering in order to cause the data disk
-			volume to be placed in local storage.</para>
-		<para>You can not migrate a VM that has a volume in local storage to a different
-			host, nor migrate the volume itself away to a different host. If you want to put
-			a host into maintenance mode, you must first stop any VMs with local data
-			volumes on that host.</para>
-	</section>
-	<section id="creating-new-volume-steps">
-		<title>To Create a New Volume</title>
-				<orderedlist>
-				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-				<listitem><para>In the left navigation bar, click Storage.</para></listitem>
-				<listitem><para>In Select View, choose Volumes.</para></listitem>
-				<listitem><para>To create a new volume, click Add Volume, provide the following
details, and click OK.</para>
-				<itemizedlist>
-					<listitem><para>Name. Give the volume a unique name so you can find it later.</para></listitem>
-					<listitem><para>Availability Zone. Where do you want the storage to reside?
This should be close to the VM that will use the volume.</para></listitem>
-					<listitem><para>Disk Offering. Choose the characteristics of the storage.</para></listitem>
-				</itemizedlist>
-				<para>The new volume appears in the list of volumes with the state “Allocated.”
The volume data is stored in &PRODUCT;, but the volume is not yet ready for use</para></listitem>
-				<listitem><para>To start using the volume, continue to Attaching a Volume
</para></listitem>
-			</orderedlist>
-	</section>
+  <title>Creating a New Volume</title>
+  <para>You can add more data disk volumes to a guest VM at any time, up to the limits
of your
+    storage capacity. Both &PRODUCT; administrators and users can add volumes to VM instances.
When
+    you create a new volume, it is stored as an entity in &PRODUCT;, but the actual storage
+    resources are not allocated on the physical storage device until you attach the volume.
This
+    optimization allows the &PRODUCT; to provision the volume nearest to the guest that
will use it
+    when the first attachment is made.</para>
+  <section id="local-storage-data-volumes">
+    <title>Using Local Storage for Data Volumes</title>
+    <para>You can create data volumes on local storage (supported with XenServer, KVM,
and VMware).
+      The data volume is placed on the same host as the VM instance that is attached to the
data
+      volume. These local data volumes can be attached to virtual machines, detached, re-attached,
+      and deleted just as with the other types of data volume.</para>
+    <para>Local storage is ideal for scenarios where persistence of data volumes and
HA is not
+      required. Some of the benefits include reduced disk I/O latency and cost reduction
from using
+      inexpensive local disks.</para>
+    <para>In order for local volumes to be used, the feature must be enabled for the
zone.</para>
+    <para>You can create a data disk offering for local storage. When a user creates
a new VM, they
+      can select this disk offering in order to cause the data disk volume to be placed in
local
+      storage.</para>
+    <para>You can not migrate a VM that has a volume in local storage to a different
host, nor
+      migrate the volume itself away to a different host. If you want to put a host into
maintenance
+      mode, you must first stop any VMs with local data volumes on that host.</para>
+  </section>
+  <section id="creating-new-volume-steps">
+    <title>To Create a New Volume</title>
+    <orderedlist>
+      <listitem>
+        <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+      </listitem>
+      <listitem>
+        <para>In the left navigation bar, click Storage.</para>
+      </listitem>
+      <listitem>
+        <para>In Select View, choose Volumes.</para>
+      </listitem>
+      <listitem>
+        <para>To create a new volume, click Add Volume, provide the following details,
and click
+          OK.</para>
+        <itemizedlist>
+          <listitem>
+            <para>Name. Give the volume a unique name so you can find it later.</para>
+          </listitem>
+          <listitem>
+            <para>Availability Zone. Where do you want the storage to reside? This
should be close
+              to the VM that will use the volume.</para>
+          </listitem>
+          <listitem>
+            <para>Disk Offering. Choose the characteristics of the storage.</para>
+          </listitem>
+        </itemizedlist>
+        <para>The new volume appears in the list of volumes with the state “Allocated.”
The volume
+          data is stored in &PRODUCT;, but the volume is not yet ready for use</para>
+      </listitem>
+      <listitem>
+        <para>To start using the volume, continue to Attaching a Volume </para>
+      </listitem>
+    </orderedlist>
+  </section>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/detach-move-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
index fda6e66..7103c30 100644
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.xml
@@ -22,25 +22,39 @@
 	under the License.
 -->
 <section id="detach-move-volumes">
-	<title>Detaching and Moving Volumes</title>
-		<note><para>This procedure is different from moving disk volumes from one storage
pool to another. See VM Storage Migration </para></note>
-		<para>A volume can be detached from a guest VM and attached to another guest. Both
&PRODUCT; administrators and users can detach volumes from VMs and move them to other
VMs.</para>
-		<para>If the two VMs are in different clusters, and the volume is large, it may take
several minutes for the volume to be moved to the new VM.</para>
-        <!-- <para>If the destination VM is running in the OVM hypervisor, the VM
must be stopped before a new volume can be attached to it.</para> -->
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation bar, click Storage, and choose Volumes
in Select View. Alternatively, if you know which VM the volume is attached to, you can click
Instances, click the VM name, and click View Volumes.</para></listitem>
-			<listitem><para>Click the name of the volume you want to detach, then click
the Detach Disk button. <inlinemediaobject>
-					<imageobject>
-						<imagedata fileref="./images/detach-disk-icon.png"/>
-					</imageobject>
-					<textobject>
-						<phrase>DetachDiskButton.png: button to detach a volume</phrase>
-					</textobject>
-				</inlinemediaobject>
-			</para></listitem>
-			<listitem><para>To move the volume to another VM, follow the steps in <xref
linkend="attaching-volume"
-				/>.</para></listitem>
-		</orderedlist>
-	</section>
-
+  <title>Detaching and Moving Volumes</title>
+  <note>
+    <para>This procedure is different from moving disk volumes from one storage pool
to another. See
+      VM Storage Migration </para>
+  </note>
+  <para>A volume can be detached from a guest VM and attached to another guest. Both
&PRODUCT;
+    administrators and users can detach volumes from VMs and move them to other VMs.</para>
+  <para>If the two VMs are in different clusters, and the volume is large, it may take
several
+    minutes for the volume to be moved to the new VM.</para>
+  <!-- <para>If the destination VM is running in the OVM hypervisor, the VM must
be stopped before a new volume can be attached to it.</para> -->
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation bar, click Storage, and choose Volumes in Select
View.
+        Alternatively, if you know which VM the volume is attached to, you can click Instances,
+        click the VM name, and click View Volumes.</para>
+    </listitem>
+    <listitem>
+      <para>Click the name of the volume you want to detach, then click the Detach
Disk button. <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/detach-disk-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>DetachDiskButton.png: button to detach a volume</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
+    </listitem>
+    <listitem>
+      <para>To move the volume to another VM, follow the steps in <xref linkend="attaching-volume"
+        />.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/storage.xml b/docs/en-US/storage.xml
index 580fe59..3ef7324 100644
--- a/docs/en-US/storage.xml
+++ b/docs/en-US/storage.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
@@ -21,12 +21,11 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <chapter id="storage">
-	<title>Working With Storage</title>
-    <xi:include href="storage-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-    <xi:include href="primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-    <xi:include href="secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-    <xi:include href="working-with-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-    <xi:include href="working-with-snapshots.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
+  <title>Working With Storage</title>
+  <xi:include href="storage-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="working-with-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="working-with-snapshots.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/upload-existing-volume-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml
index d2b6571..6be43f8 100644
--- a/docs/en-US/upload-existing-volume-to-vm.xml
+++ b/docs/en-US/upload-existing-volume-to-vm.xml
@@ -21,8 +21,8 @@
  specific language governing permissions and limitations
  under the License.
 -->
-
 <section id="upload-existing-volume-to-vm">
+<<<<<<< HEAD
     <title>Uploading an Existing Volume to a Virtual Machine</title>
         <para>Existing data can be made accessible to a virtual machine. This is called
uploading a volume to the VM. For example, this is useful to upload data from a local file
system and attach it to a VM. Root administrators, domain administrators, and end users can
all upload existing volumes to VMs.</para>
         <para>The upload is performed using HTTP. The uploaded volume is placed in
the zone's secondary storage</para>
@@ -73,4 +73,92 @@
         </listitem>
         <listitem><para>Wait until the status of the volume shows that the upload
is complete. Click Instances - Volumes, find the name you specified in step <xref linkend="optional-hash"/>,
and make sure the status is Uploaded.</para></listitem>
     </orderedlist>
+=======
+  <title>Uploading an Existing Volume to a Virtual Machine</title>
+  <para>Existing data can be made accessible to a virtual machine. This is called uploading
a volume
+    to the VM. For example, this is useful to upload data from a local file system and attach
it to
+    a VM. Root administrators, domain administrators, and end users can all upload existing
volumes
+    to VMs.</para>
+  <para>The upload is performed using HTTP. The uploaded volume is placed in the zone's
secondary
+    storage</para>
+  <para>You cannot upload a volume if the preconfigured volume limit has already been
reached. The
+    default limit for the cloud is set in the global configuration parameter max.account.volumes,
+    but administrators can also set per-domain limits that are different from the global
default.
+    See Setting Usage Limits </para>
+  <para>To upload a volume:</para>
+  <orderedlist>
+    <listitem>
+      <para>(Optional) Create an MD5 hash (checksum) of the disk image file that you
are going to
+        upload. After uploading the data disk, &PRODUCT; will use this value to verify
that no data
+        corruption has occurred.</para>
+    </listitem>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or user</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation bar, click Storage.</para>
+    </listitem>
+    <listitem>
+      <para>Click Upload Volume.</para>
+    </listitem>
+    <listitem>
+      <para>Provide the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Name and Description. Any desired name and a brief description that
can be shown in
+            the UI.</para>
+        </listitem>
+        <listitem>
+          <para>Availability Zone. Choose the zone where you want to store the volume.
VMs running
+            on hosts in this zone can attach the volume.</para>
+        </listitem>
+        <listitem>
+          <para>Format. Choose one of the following to indicate the disk image format
of the
+            volume.</para>
+          <informaltable>
+            <tgroup cols="2" align="left" colsep="1" rowsep="1">
+              <thead>
+                <row>
+                  <entry><para>Hypervisor</para></entry>
+                  <entry><para>Disk Image Format</para></entry>
+                </row>
+              </thead>
+              <tbody>
+                <row>
+                  <entry><para>XenServer</para></entry>
+                  <entry><para>VHD</para></entry>
+                </row>
+                <row>
+                  <entry><para>VMware</para></entry>
+                  <entry><para>OVA</para></entry>
+                </row>
+                <row>
+                  <entry><para>KVM</para></entry>
+                  <entry><para>QCOW2</para></entry>
+                </row>
+                <!--                        <row>
+                            <entry><para>OVM</para></entry>
+                            <entry><para>RAW</para></entry>
+                        </row> -->
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+        <listitem>
+          <para>URL. The secure HTTP or HTTPS URL that &PRODUCT; can use to access
your disk. The
+            type of file at the URL must match the value chosen in Format. For example, if
Format is
+            VHD, the URL might look like the following:</para>
+          <para>http://yourFileServerIP/userdata/myDataDisk.vhd</para>
+        </listitem>
+        <listitem>
+          <para>MD5 checksum. (Optional) Use the hash that you created in step 1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Wait until the status of the volume shows that the upload is complete.
Click Instances -
+        Volumes, find the name you specified in step 5, and make sure the status is Uploaded.</para>
+    </listitem>
+  </orderedlist>
+>>>>>>> 9cb9f45... CLOUDSTACK-1313
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/vm-storage-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vm-storage-migration.xml b/docs/en-US/vm-storage-migration.xml
index 7c3824b..e0dad57 100644
--- a/docs/en-US/vm-storage-migration.xml
+++ b/docs/en-US/vm-storage-migration.xml
@@ -22,14 +22,19 @@
     under the License.
 -->
 <section id="vm-storage-migration">
-    <title>VM Storage Migration</title>
-	<para>Supported in XenServer, KVM, and VMware.</para>
-    <note><para>This procedure is different from moving disk volumes from one
VM to another. See Detaching and Moving Volumes <xref linkend="detach-move-volumes" />.</para>
-        </note>
-    <para></para>
-	<para>You can migrate a virtual machine’s root disk volume or any additional data
disk volume from one storage pool to another in the same zone.</para>
-	<para>You can use the storage migration feature to achieve some commonly desired administration
goals, such as balancing the load on storage pools and increasing the reliability of virtual
machines by moving them away from any storage  pool that is experiencing  issues.</para>
-    <xi:include href="migrate-datadisk-volume-new-storage-pool.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-    <xi:include href="migrate-vm-rootvolume-volume-new-storage-pool.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-	</section>
-
+  <title>VM Storage Migration</title>
+  <para>Supported in XenServer, KVM, and VMware.</para>
+  <note>
+    <para>This procedure is different from moving disk volumes from one VM to another.
See Detaching
+      and Moving Volumes <xref linkend="detach-move-volumes"/>.</para>
+  </note>
+  <para>You can migrate a virtual machine’s root disk volume or any additional data
disk volume from
+    one storage pool to another in the same zone.</para>
+  <para>You can use the storage migration feature to achieve some commonly desired
administration
+    goals, such as balancing the load on storage pools and increasing the reliability of
virtual
+    machines by moving them away from any storage pool that is experiencing issues.</para>
+  <xi:include href="migrate-datadisk-volume-new-storage-pool.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="migrate-vm-rootvolume-volume-new-storage-pool.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/volume-deletion-garbage-collection.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/volume-deletion-garbage-collection.xml b/docs/en-US/volume-deletion-garbage-collection.xml
index d162d84..4186438 100644
--- a/docs/en-US/volume-deletion-garbage-collection.xml
+++ b/docs/en-US/volume-deletion-garbage-collection.xml
@@ -21,15 +21,24 @@
  specific language governing permissions and limitations
  under the License.
 -->
-
 <section id="volume-deletion-garbage-collection">
-    <title>Volume Deletion and Garbage Collection</title>
-    <para>The deletion of a volume does not delete the snapshots that have been created
from the volume</para>
-    <para>When a VM is destroyed, data disk volumes that are attached to the VM are
not deleted.</para>
-    <para>Volumes are permanently destroyed using a garbage collection process.  The
global configuration variables expunge.delay and expunge.interval determine when the physical
deletion of volumes will occur.</para>
-    <itemizedlist>
-        <listitem><para>expunge.delay: determines how old the volume must be
before it is destroyed, in seconds</para></listitem>
-        <listitem><para>expunge.interval: determines how often to run the garbage
collection check</para></listitem>
-    </itemizedlist>
-    <para>Administrators should adjust these values depending on site policies around
data retention.</para>
+  <title>Volume Deletion and Garbage Collection</title>
+  <para>The deletion of a volume does not delete the snapshots that have been created
from the
+    volume</para>
+  <para>When a VM is destroyed, data disk volumes that are attached to the VM are not
+    deleted.</para>
+  <para>Volumes are permanently destroyed using a garbage collection process. The global
+    configuration variables expunge.delay and expunge.interval determine when the physical
deletion
+    of volumes will occur.</para>
+  <itemizedlist>
+    <listitem>
+      <para>expunge.delay: determines how old the volume must be before it is destroyed,
in
+        seconds</para>
+    </listitem>
+    <listitem>
+      <para>expunge.interval: determines how often to run the garbage collection check</para>
+    </listitem>
+  </itemizedlist>
+  <para>Administrators should adjust these values depending on site policies around
data
+    retention.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b68cc334/docs/en-US/working-with-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-volumes.xml b/docs/en-US/working-with-volumes.xml
index ab567d2..6832cff 100644
--- a/docs/en-US/working-with-volumes.xml
+++ b/docs/en-US/working-with-volumes.xml
@@ -21,29 +21,32 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <section id="working-with-volumes">
-    <title>Using Swift for Secondary Storage</title>
-    <para>A volume provides storage to a guest VM.  The volume can provide for
-      a root disk or an additional data disk.  &PRODUCT; supports additional
-      volumes for guest VMs.
-    </para>
-    <para>Volumes are created for a specific hypervisor type. A volume that has
-      been attached to guest using one hypervisor type (e.g, XenServer) may not
-      be attached to a guest that is using another hypervisor type (e.g. 
-      vSphere, KVM).  This is because the different hypervisors use
-      different disk image formats.
-    </para>
-    <para>&PRODUCT; defines a volume as a unit of storage available to a guest
-      VM. Volumes are either root disks or data disks. The root disk has "/"
-      in the file system and is usually the boot device. Data disks provide
-      for additional storage (e.g. As "/opt" or "D:"). Every guest VM has a root
-      disk, and VMs can also optionally have a data disk. End users can mount
-      multiple data disks to guest VMs. Users choose data disks from the disk
-      offerings created by administrators. The user can create a template from
-      a volume as well; this is the standard procedure for private template
-      creation. Volumes are hypervisor-specific: a volume from one hypervisor
-      type may not be used on a guest of another hypervisor type.
-    </para>    
+  <title>Working With Volumes</title>
+  <para>A volume provides storage to a guest VM. The volume can provide for a root
disk or an
+    additional data disk. &PRODUCT; supports additional volumes for guest VMs. </para>
+  <para>Volumes are created for a specific hypervisor type. A volume that has been
attached to guest
+    using one hypervisor type (e.g, XenServer) may not be attached to a guest that is using
another
+    hypervisor type, for example:vSphere, KVM. This is because the different hypervisors
use different
+    disk image formats. </para>
+  <para>&PRODUCT; defines a volume as a unit of storage available to a guest VM.
Volumes are either
+    root disks or data disks. The root disk has "/" in the file system and is usually the
boot
+    device. Data disks provide for additional storage, for example: "/opt" or "D:". Every
guest VM
+    has a root disk, and VMs can also optionally have a data disk. End users can mount multiple
data
+    disks to guest VMs. Users choose data disks from the disk offerings created by administrators.
+    The user can create a template from a volume as well; this is the standard procedure
for private
+    template creation. Volumes are hypervisor-specific: a volume from one hypervisor type
may not be
+    used on a guest of another hypervisor type. </para>
+  <note>
+    <para>&PRODUCT; supports attaching up to 13 data disks to a VM on XenServer
hypervisor versions
+      6.0 and above. For the VMs on other hypervisor types, the data disk limit is 6.</para>
+  </note>
+  <xi:include href="creating-new-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="upload-existing-volume-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="attaching-volume.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="detach-move-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="vm-storage-migration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="resizing-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="volume-deletion-garbage-collection.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>
-


Mime
View raw message