incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [3/11] docs: Fix indentation according to coding convention
Date Sat, 11 Aug 2012 21:10:17 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/best-practices-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-templates.xml b/docs/en-US/best-practices-templates.xml
index 411ae3a..4e2992c 100644
--- a/docs/en-US/best-practices-templates.xml
+++ b/docs/en-US/best-practices-templates.xml
@@ -23,6 +23,6 @@
 -->
 
 <section id="best-practices-templates">
-	<title>Best Practices for Templates</title>
-	<para>If you plan to use large templates (100 GB or larger), be sure you have a 10-gigabit network to support the large templates. A slower network can lead to timeouts and other errors when large templates are used.</para>
+    <title>Best Practices for Templates</title>
+    <para>If you plan to use large templates (100 GB or larger), be sure you have a 10-gigabit network to support the large templates. A slower network can lead to timeouts and other errors when large templates are used.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/change-network-offering-on-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-network-offering-on-guest-network.xml b/docs/en-US/change-network-offering-on-guest-network.xml
index 7a9482c..98f1b63 100644
--- a/docs/en-US/change-network-offering-on-guest-network.xml
+++ b/docs/en-US/change-network-offering-on-guest-network.xml
@@ -23,22 +23,22 @@
 -->
 
 <section id="change-network-offering-on-guest-network">
-	<title>Changing the Network Offering on a Guest Network</title>
-	<para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
-	<itemizedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-		<listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
-		<listitem><para>In the left navigation, choose Network</para></listitem>
-		<listitem><para>Click the name of the network you want to modify <inlinemediaobject>
-			<imageobject>
-				<imagedata fileref="./images/edit-icon.png" />
-			</imageobject>
-			<textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
-		</inlinemediaobject>.</para></listitem>
-		<listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
-		<listitem><para>A prompt appears asking whether you want to keep the existing CIDR. This is to let you know that if you change the network offering, the CIDR will be affected. Choose No to proceed with the change.</para></listitem>
-		<listitem><para>Wait for the update to complete. Don’t try to restart VMs until after the network change is complete.</para></listitem>
-		<listitem><para>If you stopped any VMs in step 2, restart them.</para></listitem>
-	</itemizedlist>
+    <title>Changing the Network Offering on a Guest Network</title>
+    <para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
+    <itemizedlist>
+        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+        <listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
+        <listitem><para>In the left navigation, choose Network</para></listitem>
+        <listitem><para>Click the name of the network you want to modify <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="./images/edit-icon.png" />
+            </imageobject>
+            <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+        </inlinemediaobject>.</para></listitem>
+        <listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
+        <listitem><para>A prompt appears asking whether you want to keep the existing CIDR. This is to let you know that if you change the network offering, the CIDR will be affected. Choose No to proceed with the change.</para></listitem>
+        <listitem><para>Wait for the update to complete. Don’t try to restart VMs until after the network change is complete.</para></listitem>
+        <listitem><para>If you stopped any VMs in step 2, restart them.</para></listitem>
+    </itemizedlist>
 
-	</section>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/change-to-behavior-of-list-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-to-behavior-of-list-commands.xml b/docs/en-US/change-to-behavior-of-list-commands.xml
index aa5f965..4e53590 100644
--- a/docs/en-US/change-to-behavior-of-list-commands.xml
+++ b/docs/en-US/change-to-behavior-of-list-commands.xml
@@ -23,67 +23,67 @@
 -->
 
 <section id="change-to-behavior-of-list-commands">
-		<title>Change to Behavior of List Commands</title>
-		<para>There was a major change in how our List* API commands work in CloudStack 3.0 compared to 2.2.x. The rules below apply only for managed resources – those that belong to an account, domain, or project. They are irrelevant for the List* commands displaying unmanaged (system) resources, such as hosts, clusters, and external network resources.</para>
-		<para>When no parameters are passed in to the call, the caller sees only resources owned by the caller (even when the caller is the administrator). Previously, the administrator saw everyone else's resources by default.</para>
-		<para>When accountName and domainId are passed in:</para>
-		<itemizedlist>
-			<listitem><para>The caller sees the resources dedicated to the account specified.</para></listitem>
-			<listitem><para>If the call is executed by a regular user, the user is authorized to specify only the user's own account and domainId.</para></listitem>
-			<listitem><para>If the caller is a domain administrator, CloudStack performs an authorization check to see whether the caller is permitted to view resources for the given account and domainId.</para></listitem>
-		</itemizedlist>
-		<para>When projectId is passed in, only resources belonging to that project are listed.</para>
-		<para>When domainId is passed in, the call returns only resources belonging to the domain specified. To see the resources of subdomains, use the parameter isRecursive=true. Again, the regular user can see only resources owned by that user, the root administrator can list anything, and a domain administrator is authorized to see only resources of the administrator's own domain and subdomains.</para>
-		<para>To see all resources the caller is authorized to see, except for Project resources, use the parameter listAll=true.</para>
-		<para>To see all Project resources the caller is authorized to see, use the parameter projectId=-1.</para>
-		<para>There is one API command that doesn't fall under the rules above completely: the listTemplates command. This command has its own flags defining the list rules:</para>
-		<informaltable frame="all">
-			<tgroup cols="2" align="left" colsep="1" rowsep="1">
-				<colspec colname="c1" />
-				<colspec colname="c2" />
-				<thead>
-					<row>
-						<entry><para>listTemplates Flag</para></entry>
-						<entry><para>Description</para></entry>
-					</row>
-				</thead>
-				<tbody>
-					<row>
-						<entry><para>featured</para></entry>
-						<entry><para>Returns templates that have been marked as featured and public.</para></entry>
-					</row>
+        <title>Change to Behavior of List Commands</title>
+        <para>There was a major change in how our List* API commands work in CloudStack 3.0 compared to 2.2.x. The rules below apply only for managed resources – those that belong to an account, domain, or project. They are irrelevant for the List* commands displaying unmanaged (system) resources, such as hosts, clusters, and external network resources.</para>
+        <para>When no parameters are passed in to the call, the caller sees only resources owned by the caller (even when the caller is the administrator). Previously, the administrator saw everyone else's resources by default.</para>
+        <para>When accountName and domainId are passed in:</para>
+        <itemizedlist>
+            <listitem><para>The caller sees the resources dedicated to the account specified.</para></listitem>
+            <listitem><para>If the call is executed by a regular user, the user is authorized to specify only the user's own account and domainId.</para></listitem>
+            <listitem><para>If the caller is a domain administrator, CloudStack performs an authorization check to see whether the caller is permitted to view resources for the given account and domainId.</para></listitem>
+        </itemizedlist>
+        <para>When projectId is passed in, only resources belonging to that project are listed.</para>
+        <para>When domainId is passed in, the call returns only resources belonging to the domain specified. To see the resources of subdomains, use the parameter isRecursive=true. Again, the regular user can see only resources owned by that user, the root administrator can list anything, and a domain administrator is authorized to see only resources of the administrator's own domain and subdomains.</para>
+        <para>To see all resources the caller is authorized to see, except for Project resources, use the parameter listAll=true.</para>
+        <para>To see all Project resources the caller is authorized to see, use the parameter projectId=-1.</para>
+        <para>There is one API command that doesn't fall under the rules above completely: the listTemplates command. This command has its own flags defining the list rules:</para>
+        <informaltable frame="all">
+            <tgroup cols="2" align="left" colsep="1" rowsep="1">
+                <colspec colname="c1" />
+                <colspec colname="c2" />
+                <thead>
+                    <row>
+                        <entry><para>listTemplates Flag</para></entry>
+                        <entry><para>Description</para></entry>
+                    </row>
+                </thead>
+                <tbody>
+                    <row>
+                        <entry><para>featured</para></entry>
+                        <entry><para>Returns templates that have been marked as featured and public.</para></entry>
+                    </row>
 
-						<row>
-							<entry><para>self</para></entry>
-							<entry><para>Returns templates that have been registered or created by the calling user.</para></entry>
-						</row>
+                        <row>
+                            <entry><para>self</para></entry>
+                            <entry><para>Returns templates that have been registered or created by the calling user.</para></entry>
+                        </row>
 
-						<row>
-							<entry><para>selfexecutable</para></entry>
-							<entry><para>Same as self, but only returns templates that are ready to be deployed with.</para></entry>
-						</row>
+                        <row>
+                            <entry><para>selfexecutable</para></entry>
+                            <entry><para>Same as self, but only returns templates that are ready to be deployed with.</para></entry>
+                        </row>
 
-						<row>
-							<entry><para>sharedexecutable</para></entry>
-							<entry><para>Ready templates that have been granted to the calling user by another user.</para></entry>
-						</row>
+                        <row>
+                            <entry><para>sharedexecutable</para></entry>
+                            <entry><para>Ready templates that have been granted to the calling user by another user.</para></entry>
+                        </row>
 
-					<row>
-						<entry><para>executable</para></entry>
-						<entry><para>Templates that are owned by the calling user, or public templates, that can be used to deploy a new VM.</para></entry>
-					</row>
+                    <row>
+                        <entry><para>executable</para></entry>
+                        <entry><para>Templates that are owned by the calling user, or public templates, that can be used to deploy a new VM.</para></entry>
+                    </row>
 
-						<row>
-							<entry><para>community</para></entry>
-							<entry><para>Returns templates that have been marked as public but not featured.</para></entry>
-						</row>
+                        <row>
+                            <entry><para>community</para></entry>
+                            <entry><para>Returns templates that have been marked as public but not featured.</para></entry>
+                        </row>
 
-					<row>
-						<entry><para>all</para></entry>
-						<entry><para>Returns all templates (only usable by admins).</para></entry>
-					</row>
-				</tbody>
-				</tgroup>
-		</informaltable>	
-		<para>The &PRODUCT; UI on a general view will display all resources that the logged-in user is authorized to see, except for project resources. To see the project resources, select the project view.</para>
-	</section>
+                    <row>
+                        <entry><para>all</para></entry>
+                        <entry><para>Returns all templates (only usable by admins).</para></entry>
+                    </row>
+                </tbody>
+                </tgroup>
+        </informaltable>    
+        <para>The &PRODUCT; UI on a general view will display all resources that the logged-in user is authorized to see, except for project resources. To see the project resources, select the project view.</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-root-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-root-password.xml b/docs/en-US/changing-root-password.xml
index 0b8ad0f..0d2333a 100644
--- a/docs/en-US/changing-root-password.xml
+++ b/docs/en-US/changing-root-password.xml
@@ -23,7 +23,7 @@
 -->
 
 <section id="changing-root-password">
-	<title>Changing the Root Password</title>
+    <title>Changing the Root Password</title>
     <para>During installation and ongoing cloud administration, you will need to log in to the UI as the root administrator.
         The root administrator account manages the &PRODUCT; deployment, including physical infrastructure.
         The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-secondary-storage-ip.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-ip.xml b/docs/en-US/changing-secondary-storage-ip.xml
index e39a68e..7e146de 100644
--- a/docs/en-US/changing-secondary-storage-ip.xml
+++ b/docs/en-US/changing-secondary-storage-ip.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE section 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;
-]>	
+]>    
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -23,22 +23,22 @@
 -->
 
 <section id="changing-secondary-storage-ip">
-		<title>Making API Requests</title>
-		<para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
-		<programlisting>
-		# mysql -p
-		mysql> use cloud;
-		mysql> select id from host where type = 'SecondaryStorage';
-		mysql> update host_details set value = 'nfs://192.168.160.20/export/mike-ss1'
-  		where host_id = HOSTID and name = 'orig.url';
-		mysql> update host set name = 'nfs://192.168.160.20/export/mike-ss1' where type
-  		= 'SecondaryStorage' and id = #;
-		mysql> update host set url = 'nfs://192.168.160.20/export/mike-ss1' where type
- 		 = 'SecondaryStorage' and id = #;
-		mysql> update host set guid = 'nfs://192.168.160.20/export/mike-ss1' where type
-  		= 'SecondaryStorage' and id = #;
-		</programlisting>
-		<note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
-		<para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
-			
-	</section>
+        <title>Making API Requests</title>
+        <para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
+        <programlisting>
+        # mysql -p
+        mysql> use cloud;
+        mysql> select id from host where type = 'SecondaryStorage';
+        mysql> update host_details set value = 'nfs://192.168.160.20/export/mike-ss1'
+          where host_id = HOSTID and name = 'orig.url';
+        mysql> update host set name = 'nfs://192.168.160.20/export/mike-ss1' where type
+          = 'SecondaryStorage' and id = #;
+        mysql> update host set url = 'nfs://192.168.160.20/export/mike-ss1' where type
+          = 'SecondaryStorage' and id = #;
+        mysql> update host set guid = 'nfs://192.168.160.20/export/mike-ss1' where type
+          = 'SecondaryStorage' and id = #;
+        </programlisting>
+        <note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
+        <para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
+            
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-secondary-storage-servers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml
index 2ab8836..62ad650 100644
--- a/docs/en-US/changing-secondary-storage-servers.xml
+++ b/docs/en-US/changing-secondary-storage-servers.xml
@@ -23,14 +23,14 @@
 -->
 
 <section id="changing-secondary-storage-serversp">
-	<title>Changing Secondary Storage Servers</title>
-	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
-		<orderedlist>
-			<listitem><para>Stop all running Management Servers.</para></listitem>
-			<listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
-			<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
-			<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
-			<listitem><para>Start the Management Server.</para></listitem>
-		</orderedlist>
-	</section>
+    <title>Changing Secondary Storage Servers</title>
+    <para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
+        <orderedlist>
+            <listitem><para>Stop all running Management Servers.</para></listitem>
+            <listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
+            <listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
+            <listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
+            <listitem><para>Start the Management Server.</para></listitem>
+        </orderedlist>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-secondary-storage-serversp.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml
index 2ab8836..62ad650 100644
--- a/docs/en-US/changing-secondary-storage-serversp.xml
+++ b/docs/en-US/changing-secondary-storage-serversp.xml
@@ -23,14 +23,14 @@
 -->
 
 <section id="changing-secondary-storage-serversp">
-	<title>Changing Secondary Storage Servers</title>
-	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
-		<orderedlist>
-			<listitem><para>Stop all running Management Servers.</para></listitem>
-			<listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
-			<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
-			<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
-			<listitem><para>Start the Management Server.</para></listitem>
-		</orderedlist>
-	</section>
+    <title>Changing Secondary Storage Servers</title>
+    <para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
+        <orderedlist>
+            <listitem><para>Stop all running Management Servers.</para></listitem>
+            <listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
+            <listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
+            <listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
+            <listitem><para>Start the Management Server.</para></listitem>
+        </orderedlist>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-service-offering-for-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-service-offering-for-vm.xml b/docs/en-US/changing-service-offering-for-vm.xml
index 7448b4d..5a42912 100644
--- a/docs/en-US/changing-service-offering-for-vm.xml
+++ b/docs/en-US/changing-service-offering-for-vm.xml
@@ -23,27 +23,27 @@
 -->
 
 <section id="changing-service-offering-for-vm">
-	<title>Changing the Service Offering for a VM</title>
-		<para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</para>
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation, click Instances.</para></listitem>
-			<listitem><para>Choose the VM that you want to work with.</para></listitem>
-			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/stop-instance-icon.png" />
-				</imageobject>
-				<textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
-			</inlinemediaobject>
-				</para></listitem>
-			<listitem><para>Click the Change Service button <inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/change-service-icon.png" />
-				</imageobject>
-				<textobject><phrase>ChangeServiceButton.png: button to change the service of a VM</phrase></textobject>
-			</inlinemediaobject>. The Change service dialog box is displayed.</para></listitem>
-			<listitem><para>Select the offering you want.</para></listitem>
-			<listitem><para>Click OK.</para></listitem>
-		</orderedlist>
-	</section>
+    <title>Changing the Service Offering for a VM</title>
+        <para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</para>
+        <orderedlist>
+            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+            <listitem><para>In the left navigation, click Instances.</para></listitem>
+            <listitem><para>Choose the VM that you want to work with.</para></listitem>
+            <listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/stop-instance-icon.png" />
+                </imageobject>
+                <textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
+            </inlinemediaobject>
+                </para></listitem>
+            <listitem><para>Click the Change Service button <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/change-service-icon.png" />
+                </imageobject>
+                <textobject><phrase>ChangeServiceButton.png: button to change the service of a VM</phrase></textobject>
+            </inlinemediaobject>. The Change service dialog box is displayed.</para></listitem>
+            <listitem><para>Select the offering you want.</para></listitem>
+            <listitem><para>Click OK.</para></listitem>
+        </orderedlist>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/changing-vm-name-os-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-vm-name-os-group.xml b/docs/en-US/changing-vm-name-os-group.xml
index 88b982c..f16ffda 100644
--- a/docs/en-US/changing-vm-name-os-group.xml
+++ b/docs/en-US/changing-vm-name-os-group.xml
@@ -23,32 +23,32 @@
 -->
 
 <section id="changing-vm-name-os-group">
-	<title>Changing the VM Name, OS, or Group</title>
-	<para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
-	<para>To access a VM through the &PRODUCT; UI:</para>
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation, click Instances.</para></listitem>
-			<listitem><para>Select the VM that you want to modify.</para></listitem>
-			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/stop-instance-icon.png" />
-				</imageobject>
-				<textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
-			</inlinemediaobject>
-				</para></listitem>
-			<listitem><para>Click Edit <inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/edit-icon.png" />
-				</imageobject>
-				<textobject><phrase>StopButton.png: button to edit the properties of a VM</phrase></textobject>
-			</inlinemediaobject>.</para></listitem>
-			<listitem><para>Make the desired changes to the following:</para></listitem>
-			
-				<listitem><para>Display name: Enter a new display name if you want to change the name of the VM.</para></listitem>
-				<listitem><para>OS Type: Select the desired operating system.</para></listitem>
-				<listitem><para>Group: Enter the group name for the VM.</para></listitem>	
-			
-			<listitem><para>Click Apply.</para></listitem>
-		</orderedlist>
-	</section>
+    <title>Changing the VM Name, OS, or Group</title>
+    <para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
+    <para>To access a VM through the &PRODUCT; UI:</para>
+        <orderedlist>
+            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+            <listitem><para>In the left navigation, click Instances.</para></listitem>
+            <listitem><para>Select the VM that you want to modify.</para></listitem>
+            <listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/stop-instance-icon.png" />
+                </imageobject>
+                <textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
+            </inlinemediaobject>
+                </para></listitem>
+            <listitem><para>Click Edit <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/edit-icon.png" />
+                </imageobject>
+                <textobject><phrase>StopButton.png: button to edit the properties of a VM</phrase></textobject>
+            </inlinemediaobject>.</para></listitem>
+            <listitem><para>Make the desired changes to the following:</para></listitem>
+            
+                <listitem><para>Display name: Enter a new display name if you want to change the name of the VM.</para></listitem>
+                <listitem><para>OS Type: Select the desired operating system.</para></listitem>
+                <listitem><para>Group: Enter the group name for the VM.</para></listitem>    
+            
+            <listitem><para>Click Apply.</para></listitem>
+        </orderedlist>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloud-infrastructure-concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml
index 1070cb8..40ceff8 100644
--- a/docs/en-US/cloud-infrastructure-concepts.xml
+++ b/docs/en-US/cloud-infrastructure-concepts.xml
@@ -23,7 +23,7 @@
 -->
 
 <section id="cloud-infrastructure-concepts">
-	<title>Cloud Infrastructure Concepts</title>
+    <title>Cloud Infrastructure Concepts</title>
   <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloud-infrastructure-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-overview.xml b/docs/en-US/cloud-infrastructure-overview.xml
index b379bd3..5b467a3 100644
--- a/docs/en-US/cloud-infrastructure-overview.xml
+++ b/docs/en-US/cloud-infrastructure-overview.xml
@@ -23,24 +23,24 @@
 -->
 
 <section id="cloud-infrastructure-overview">
-	<title>Cloud Infrastructure Overview</title>
-	<para>
-		The Management Server manages one or more zones (typically, datacenters) containing host computers where guest virtual machines will run. The cloud infrastructure is organized as follows:
-	</para>
-	<itemizedlist>
-		<listitem><para>Zone: Typically, a zone is equivalent to a single datacenter. A zone consists of one or more pods and secondary storage.</para></listitem>
-		<listitem><para>Pod: A pod is usually one rack of hardware that includes a layer-2 switch and one or more clusters.</para></listitem>
-		<listitem><para>Cluster: A cluster consists of one or more hosts and primary storage.</para></listitem>
-		<listitem><para>Host: A single compute node within a cluster. The hosts are where the actual cloud services run in the form of guest virtual machines.</para></listitem>
-		<listitem><para>Primary storage is associated with a cluster, and it stores the disk volumes for all the VMs running on hosts in that cluster.</para></listitem>
-		<listitem><para>Secondary storage is associated with a zone, and it stores templates, ISO images, and disk volume snapshots.</para></listitem>
-	</itemizedlist>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/infrastructure-overview.png" />
-		</imageobject>
-		<textobject><phrase>infrastructure_overview.png: Nested organization of a zone</phrase></textobject>
-	</mediaobject>
-	<para><emphasis role="bold">More Information</emphasis></para>
-	<para>For more information, see <xref linkend="cloud-infrastructure-concepts" />.</para>
+    <title>Cloud Infrastructure Overview</title>
+    <para>
+        The Management Server manages one or more zones (typically, datacenters) containing host computers where guest virtual machines will run. The cloud infrastructure is organized as follows:
+    </para>
+    <itemizedlist>
+        <listitem><para>Zone: Typically, a zone is equivalent to a single datacenter. A zone consists of one or more pods and secondary storage.</para></listitem>
+        <listitem><para>Pod: A pod is usually one rack of hardware that includes a layer-2 switch and one or more clusters.</para></listitem>
+        <listitem><para>Cluster: A cluster consists of one or more hosts and primary storage.</para></listitem>
+        <listitem><para>Host: A single compute node within a cluster. The hosts are where the actual cloud services run in the form of guest virtual machines.</para></listitem>
+        <listitem><para>Primary storage is associated with a cluster, and it stores the disk volumes for all the VMs running on hosts in that cluster.</para></listitem>
+        <listitem><para>Secondary storage is associated with a zone, and it stores templates, ISO images, and disk volume snapshots.</para></listitem>
+    </itemizedlist>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/infrastructure-overview.png" />
+        </imageobject>
+        <textobject><phrase>infrastructure_overview.png: Nested organization of a zone</phrase></textobject>
+    </mediaobject>
+    <para><emphasis role="bold">More Information</emphasis></para>
+    <para>For more information, see <xref linkend="cloud-infrastructure-concepts" />.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack-admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack-admin.xml b/docs/en-US/cloudstack-admin.xml
index cfdfcf0..c153763 100644
--- a/docs/en-US/cloudstack-admin.xml
+++ b/docs/en-US/cloudstack-admin.xml
@@ -23,8 +23,8 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml
index 459a3ac..c18bc19 100644
--- a/docs/en-US/cloudstack.xml
+++ b/docs/en-US/cloudstack.xml
@@ -23,7 +23,7 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_admin.xml b/docs/en-US/cloudstack_admin.xml
index e6c3923..c80c94f 100644
--- a/docs/en-US/cloudstack_admin.xml
+++ b/docs/en-US/cloudstack_admin.xml
@@ -23,9 +23,9 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_developers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_developers.xml b/docs/en-US/cloudstack_developers.xml
index 39817ab..e847f6a 100644
--- a/docs/en-US/cloudstack_developers.xml
+++ b/docs/en-US/cloudstack_developers.xml
@@ -23,9 +23,9 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="developer-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_features.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_features.xml b/docs/en-US/cloudstack_features.xml
index 4d29e43..95825aa 100644
--- a/docs/en-US/cloudstack_features.xml
+++ b/docs/en-US/cloudstack_features.xml
@@ -22,45 +22,45 @@
  under the License.
 -->
 
-	<section id="cloudstack_features">
-		<title>What Can &PRODUCT; Do?</title>
-		
-		<para>
-			<emphasis role="bold">Multiple Hypervisor Support</emphasis>
-		</para>
-		<para>
-			&PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload. &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in &PRODUCT; 3.0.x0.)
-		</para>
-		<para>
-			<emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
-		</para>
-		<para>
-			&PRODUCT; can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
-		</para>
-		<para>
-			<emphasis role="bold">Automatic Configuration Management</emphasis>
-		</para>
-		<para>&PRODUCT; automatically configures each guest virtual machine’s networking and storage settings.
-		</para>
-		<para>&PRODUCT; internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
-		</para>
-		<para>
-			<emphasis role="bold">Graphical User Interface</emphasis>
-		</para>
-		<para>&PRODUCT; offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
-		</para>
-		<para>
-			<emphasis role="bold">API and Extensibility</emphasis>
-		</para>
-		<para>
-			&PRODUCT; provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at http://docs.cloud.com/CloudStack_Documentation.
-		</para>
-		<para>
-			The &PRODUCT; platform pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (http://docs.cloud.com/CloudStack_Documentation/Allocator_Implementation_Guide).
-		</para>
-		<para>
-			<emphasis role="bold">High Availability</emphasis>
-		</para>
-		<para>The &PRODUCT; platform has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the Hosts, the &PRODUCT; platform supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
-		</para>
-	</section>
+    <section id="cloudstack_features">
+        <title>What Can &PRODUCT; Do?</title>
+        
+        <para>
+            <emphasis role="bold">Multiple Hypervisor Support</emphasis>
+        </para>
+        <para>
+            &PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload. &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in &PRODUCT; 3.0.x0.)
+        </para>
+        <para>
+            <emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
+        </para>
+        <para>
+            &PRODUCT; can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
+        </para>
+        <para>
+            <emphasis role="bold">Automatic Configuration Management</emphasis>
+        </para>
+        <para>&PRODUCT; automatically configures each guest virtual machine’s networking and storage settings.
+        </para>
+        <para>&PRODUCT; internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
+        </para>
+        <para>
+            <emphasis role="bold">Graphical User Interface</emphasis>
+        </para>
+        <para>&PRODUCT; offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
+        </para>
+        <para>
+            <emphasis role="bold">API and Extensibility</emphasis>
+        </para>
+        <para>
+            &PRODUCT; provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at http://docs.cloud.com/CloudStack_Documentation.
+        </para>
+        <para>
+            The &PRODUCT; platform pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (http://docs.cloud.com/CloudStack_Documentation/Allocator_Implementation_Guide).
+        </para>
+        <para>
+            <emphasis role="bold">High Availability</emphasis>
+        </para>
+        <para>The &PRODUCT; platform has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the Hosts, the &PRODUCT; platform supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
+        </para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_installation.xml b/docs/en-US/cloudstack_installation.xml
index 7e06dfd..f6ef3cf 100644
--- a/docs/en-US/cloudstack_installation.xml
+++ b/docs/en-US/cloudstack_installation.xml
@@ -23,8 +23,8 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_system_requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_system_requirements.xml b/docs/en-US/cloudstack_system_requirements.xml
index 665e23d..8b5d709 100644
--- a/docs/en-US/cloudstack_system_requirements.xml
+++ b/docs/en-US/cloudstack_system_requirements.xml
@@ -22,47 +22,47 @@
  under the License.
 -->
 
-	<section id="cloudstack_system_requirements">
-		<title>Minimum System Requirements</title>
-		<para>
-			The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.
-		</para>
-		<itemizedlist>
-			<listitem><para>Operating system:</para>
-				<itemizedlist>
-					<listitem><para>Commercial users: Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/). Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
-					<listitem><para>Open-source community users: RHEL 5.4-5.x 64-bit or 6.2+ 64-bit; CentOS 5.4-5.x 64-bit or 6.2+ 64-bit; Ubuntu 10.04 LTS</para></listitem>
-				</itemizedlist>
-			</listitem>
-			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
-			<listitem><para>4 GB of memory</para></listitem>
-			<listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
-			<listitem><para>At least 1 NIC</para></listitem>
-			<listitem><para>Statically allocated IP address</para></listitem>
-			<listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
-		</itemizedlist>
-		<para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
-		<itemizedlist>
-			<listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
-			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
-			<listitem><para>Hardware virtualization support required</para></listitem>
-			<listitem><para>4 GB of memory</para></listitem>
-			<listitem><para>36 GB of local disk</para></listitem>
-			<listitem><para>At least 1 NIC</para></listitem>
-			<listitem><para>Statically allocated IP Address</para></listitem>
-			<listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
-			<listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
-		</itemizedlist>
-		<para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
-		<itemizedlist>
-			<listitem><para>Citrix XenServer Installation for &PRODUCT;</para></listitem>
-			<listitem><para>VMware vSphere Installation and Configuration</para></listitem>
-			<listitem><para>KVM Installation and Configuration</para></listitem>
-			<listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
-		</itemizedlist>
-		<warning>
-			<para>
-				Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with &PRODUCT;. For example, the requirements for XenServer are listed under Citrix XenServer Installation for &PRODUCT;.
-			</para>
-		</warning>
-	</section>
+    <section id="cloudstack_system_requirements">
+        <title>Minimum System Requirements</title>
+        <para>
+            The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.
+        </para>
+        <itemizedlist>
+            <listitem><para>Operating system:</para>
+                <itemizedlist>
+                    <listitem><para>Commercial users: Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/). Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
+                    <listitem><para>Open-source community users: RHEL 5.4-5.x 64-bit or 6.2+ 64-bit; CentOS 5.4-5.x 64-bit or 6.2+ 64-bit; Ubuntu 10.04 LTS</para></listitem>
+                </itemizedlist>
+            </listitem>
+            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+            <listitem><para>4 GB of memory</para></listitem>
+            <listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
+            <listitem><para>At least 1 NIC</para></listitem>
+            <listitem><para>Statically allocated IP address</para></listitem>
+            <listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
+        </itemizedlist>
+        <para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
+        <itemizedlist>
+            <listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
+            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+            <listitem><para>Hardware virtualization support required</para></listitem>
+            <listitem><para>4 GB of memory</para></listitem>
+            <listitem><para>36 GB of local disk</para></listitem>
+            <listitem><para>At least 1 NIC</para></listitem>
+            <listitem><para>Statically allocated IP Address</para></listitem>
+            <listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
+            <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
+        </itemizedlist>
+        <para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
+        <itemizedlist>
+            <listitem><para>Citrix XenServer Installation for &PRODUCT;</para></listitem>
+            <listitem><para>VMware vSphere Installation and Configuration</para></listitem>
+            <listitem><para>KVM Installation and Configuration</para></listitem>
+            <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
+        </itemizedlist>
+        <warning>
+            <para>
+                Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with &PRODUCT;. For example, the requirements for XenServer are listed under Citrix XenServer Installation for &PRODUCT;.
+            </para>
+        </warning>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_trial_installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_trial_installation.xml b/docs/en-US/cloudstack_trial_installation.xml
index e3cb0c6..24a1699 100644
--- a/docs/en-US/cloudstack_trial_installation.xml
+++ b/docs/en-US/cloudstack_trial_installation.xml
@@ -23,8 +23,8 @@
 -->
 
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="trial-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cloudstack_whatis.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_whatis.xml b/docs/en-US/cloudstack_whatis.xml
index b8cf1e2..5fea7d4 100644
--- a/docs/en-US/cloudstack_whatis.xml
+++ b/docs/en-US/cloudstack_whatis.xml
@@ -23,17 +23,17 @@
  under the License.
 -->
 
-	<section id="cloudstack_whatis">
-		<title>What Is &PRODUCT;?</title>
-		<para>Who Should Read This</para>
-		<para>If you are new to &PRODUCT; or you want to learn more about concepts before installing and running &PRODUCT;, read this overview. If you just want to get started, you can skip to Overview of Installation Steps.</para>
-		<para>&PRODUCT; is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. &PRODUCT; manages the network, storage, and compute nodes that make up a cloud infrastructure. Use &PRODUCT; to deploy, manage, and configure cloud computing environments. Typical users are service providers and enterprises. With &PRODUCT;, you can:
-			<itemizedlist>
-				<listitem>
-			<para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.</para></listitem>
-				<listitem>
-				<para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with &PRODUCT; an enterprise can offer self-service virtual machines to users without involving IT departments.
-				</para></listitem>
-			</itemizedlist>
-		</para>
-	</section>
+    <section id="cloudstack_whatis">
+        <title>What Is &PRODUCT;?</title>
+        <para>Who Should Read This</para>
+        <para>If you are new to &PRODUCT; or you want to learn more about concepts before installing and running &PRODUCT;, read this overview. If you just want to get started, you can skip to Overview of Installation Steps.</para>
+        <para>&PRODUCT; is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. &PRODUCT; manages the network, storage, and compute nodes that make up a cloud infrastructure. Use &PRODUCT; to deploy, manage, and configure cloud computing environments. Typical users are service providers and enterprises. With &PRODUCT;, you can:
+            <itemizedlist>
+                <listitem>
+            <para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.</para></listitem>
+                <listitem>
+                <para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with &PRODUCT; an enterprise can offer self-service virtual machines to users without involving IT departments.
+                </para></listitem>
+            </itemizedlist>
+        </para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml
index d1ba308..5210bd8 100644
--- a/docs/en-US/cluster-add.xml
+++ b/docs/en-US/cluster-add.xml
@@ -23,6 +23,6 @@
 -->
 
 <section id="cluster-add">
-	<title>Adding a Cluster</title>
-	<para>TODO</para>
+    <title>Adding a Cluster</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/compatibility-matrix.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compatibility-matrix.xml b/docs/en-US/compatibility-matrix.xml
index ac8e838..8576f71 100644
--- a/docs/en-US/compatibility-matrix.xml
+++ b/docs/en-US/compatibility-matrix.xml
@@ -23,94 +23,94 @@
 -->
 
 <section id="compatibility-matrix">
-	<title>Compatibility Matrix</title>
-			<informaltable>
-					<tgroup cols="7" align="left" colsep="1" rowsep="1">
-						<thead>
-							<row>
-								<entry><para>Hypervisor</para></entry>
-								<entry><para>CloudStack 2.1.x</para></entry>
-								<entry><para>CloudStack 2.2.x</para></entry>
-								<entry><para>CloudStack 3.0.0</para></entry>
-								<entry><para>CloudStack 3.0.1</para></entry>
-								<entry><para>CloudStack 3.0.2</para></entry>
-								<entry><para>CloudStack 3.0.3</para></entry>
-							</row>
-						</thead>
-						<tbody>
-							<row>
-								<entry><para>XenServer 5.6</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-							</row>
-							<row>
-								<entry><para>XenServer 5.6 FP1</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>	
-							</row>
-							<row>
-										<entry><para>XenServer 5.6 SP2</para></entry>
-										<entry><para>Yes</para></entry>
-										<entry><para>Yes</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>Yes</para></entry>
-										<entry><para>Yes</para></entry>
-									</row>
-									<row>
-										<entry><para>XenServer 6.0.0</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>No</para></entry>
-										<entry><para>Yes</para></entry>
-									</row>
-								<row>
-									<entry><para>XenServer 6.0.2</para></entry>
-									<entry><para>No</para></entry>
-									<entry><para>No</para></entry>
-									<entry><para>Yes</para></entry>
-									<entry><para>Yes</para></entry>
-									<entry><para>Yes</para></entry>
-									<entry><para>Yes</para></entry>
-								</row>
-							<row>
-								<entry><para>XenServer 6.1</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-								<entry><para>No</para></entry>
-							</row>
-							<row>
-								<entry><para>KVM (RHEL 6.0 or 6.1)</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-							</row>
-							<row>
-								<entry><para>VMware (vSphere and vCenter, both version 4.1)</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-								<entry><para>Yes</para></entry>
-							</row>
-								</tbody>
-							</tgroup>
-						</informaltable>
+    <title>Compatibility Matrix</title>
+            <informaltable>
+                    <tgroup cols="7" align="left" colsep="1" rowsep="1">
+                        <thead>
+                            <row>
+                                <entry><para>Hypervisor</para></entry>
+                                <entry><para>CloudStack 2.1.x</para></entry>
+                                <entry><para>CloudStack 2.2.x</para></entry>
+                                <entry><para>CloudStack 3.0.0</para></entry>
+                                <entry><para>CloudStack 3.0.1</para></entry>
+                                <entry><para>CloudStack 3.0.2</para></entry>
+                                <entry><para>CloudStack 3.0.3</para></entry>
+                            </row>
+                        </thead>
+                        <tbody>
+                            <row>
+                                <entry><para>XenServer 5.6</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                            </row>
+                            <row>
+                                <entry><para>XenServer 5.6 FP1</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>    
+                            </row>
+                            <row>
+                                        <entry><para>XenServer 5.6 SP2</para></entry>
+                                        <entry><para>Yes</para></entry>
+                                        <entry><para>Yes</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>Yes</para></entry>
+                                        <entry><para>Yes</para></entry>
+                                    </row>
+                                    <row>
+                                        <entry><para>XenServer 6.0.0</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>No</para></entry>
+                                        <entry><para>Yes</para></entry>
+                                    </row>
+                                <row>
+                                    <entry><para>XenServer 6.0.2</para></entry>
+                                    <entry><para>No</para></entry>
+                                    <entry><para>No</para></entry>
+                                    <entry><para>Yes</para></entry>
+                                    <entry><para>Yes</para></entry>
+                                    <entry><para>Yes</para></entry>
+                                    <entry><para>Yes</para></entry>
+                                </row>
+                            <row>
+                                <entry><para>XenServer 6.1</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                                <entry><para>No</para></entry>
+                            </row>
+                            <row>
+                                <entry><para>KVM (RHEL 6.0 or 6.1)</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                            </row>
+                            <row>
+                                <entry><para>VMware (vSphere and vCenter, both version 4.1)</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                                <entry><para>Yes</para></entry>
+                            </row>
+                                </tbody>
+                            </tgroup>
+                        </informaltable>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/concepts.xml b/docs/en-US/concepts.xml
index f49fc3e..1912c23 100644
--- a/docs/en-US/concepts.xml
+++ b/docs/en-US/concepts.xml
@@ -23,8 +23,8 @@
 -->
 
 <chapter id="concepts">
-	<title>Concepts</title>
-		<xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		<xi:include href="feature-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		<xi:include href="deployment-architecture-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <title>Concepts</title>
+        <xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="feature-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="deployment-architecture-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
index af7c21b..95df473 100644
--- a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
+++ b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
@@ -23,28 +23,28 @@
 -->
 
 <section id="configure-guest-traffic-in-advanced-zone">
-	<title>Configure Guest Traffic in an Advanced Zone</title>
-	<para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
-	<orderedlist>
-		<listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
-		<listitem><para>Click the Network tab.</para></listitem>
-		<listitem><para>Click Add network.</para></listitem>
-		<listitem><para>Provide the following information:</para>
-		<itemizedlist>
-			<listitem><para>Name. The name of the network.  This will be user-visible</para></listitem>
-			<listitem><para>Description: The description of the network.  This will be user-visible</para></listitem>
-			<listitem><para>VLAN ID: Enter an administrator-configured VLAN ID so you can create different networks for use by different VM users in the zone</para></listitem>
-			<listitem><para>Scope: Choose account-specific or domain-specific if you would like to make the network accessible to only a single account or domain.  Choose zone-wide if all accounts with access to the zone should be able to access the network.</para></listitem>
-			<listitem><para>Domain/Account: If Scope is account-specific, enter the domain and account name for the account</para></listitem>
-			<listitem><para>Network offering: If the administrator has configured multiple network offerings, select the one you want to use for this network</para></listitem>
-			<listitem><para>Gateway: The gateway that the guests should use</para></listitem>
-			<listitem><para>Netmask: The netmask in use on the subnet the guests will use</para></listitem>
-			<listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.  If multiple NICs are used, they may be in a different subnet.</para></listitem>
-			<listitem><para>Network Domain: (Optional) If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
-		</itemizedlist>
-		</listitem>
-		<listitem><para>Click OK.</para></listitem>
-	</orderedlist>
-	
-	
-	</section>
+    <title>Configure Guest Traffic in an Advanced Zone</title>
+    <para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
+    <orderedlist>
+        <listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
+        <listitem><para>Click the Network tab.</para></listitem>
+        <listitem><para>Click Add network.</para></listitem>
+        <listitem><para>Provide the following information:</para>
+        <itemizedlist>
+            <listitem><para>Name. The name of the network.  This will be user-visible</para></listitem>
+            <listitem><para>Description: The description of the network.  This will be user-visible</para></listitem>
+            <listitem><para>VLAN ID: Enter an administrator-configured VLAN ID so you can create different networks for use by different VM users in the zone</para></listitem>
+            <listitem><para>Scope: Choose account-specific or domain-specific if you would like to make the network accessible to only a single account or domain.  Choose zone-wide if all accounts with access to the zone should be able to access the network.</para></listitem>
+            <listitem><para>Domain/Account: If Scope is account-specific, enter the domain and account name for the account</para></listitem>
+            <listitem><para>Network offering: If the administrator has configured multiple network offerings, select the one you want to use for this network</para></listitem>
+            <listitem><para>Gateway: The gateway that the guests should use</para></listitem>
+            <listitem><para>Netmask: The netmask in use on the subnet the guests will use</para></listitem>
+            <listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.  If multiple NICs are used, they may be in a different subnet.</para></listitem>
+            <listitem><para>Network Domain: (Optional) If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
+        </itemizedlist>
+        </listitem>
+        <listitem><para>Click OK.</para></listitem>
+    </orderedlist>
+    
+    
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/configure-usage-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-usage-server.xml b/docs/en-US/configure-usage-server.xml
index 55d3908..d167a49 100644
--- a/docs/en-US/configure-usage-server.xml
+++ b/docs/en-US/configure-usage-server.xml
@@ -54,7 +54,7 @@
                 <row>
                     <entry><para>usage.aggregation.timezone</para></entry>
                     <entry><para>Time zone of usage records. Set this if the usage records and daily job execution are in different time zones. For example, with the following settings, the usage job will run at PST 00:15 and generate usage records for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:</para>
-                    <programlisting>usage.stats.job.exec.time = 00:15	
+                    <programlisting>usage.stats.job.exec.time = 00:15    
 usage.execution.timezone = PST
 usage.aggregation.timezone = GMT
                         </programlisting>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml
index 0ab3ef5..9e059f7 100644
--- a/docs/en-US/configure-vpn.xml
+++ b/docs/en-US/configure-vpn.xml
@@ -23,30 +23,30 @@
 -->
 
 <section id="configure-vpn">
-	<title>Configuring VPN</title>
-	<para>To set up VPN for the cloud:</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-		<listitem><para>In the left navigation, click Global Settings.</para></listitem>
-		<listitem><para>Set the following global configuration parameters.</para>
-		<itemizedlist>
-			<listitem><para>remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.</para></listitem>
-			<listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
-			<listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users per account.</para></listitem>
-		</itemizedlist></listitem></orderedlist>
-		<para>To enable VPN for a particular network:</para>	
-		<orderedlist>
-			<listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>			
-			<listitem><para>In the left navigation, click Network.</para></listitem>
-			<listitem><para>Click the name of the network you want to work with.</para></listitem>
-			<listitem><para>Click View IP Addresses.</para></listitem>
-			<listitem><para>Click one of the displayed IP address names.</para></listitem>
-			<listitem><para>Click the Enable VPN button <inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/vpn-icon.png" />
-				</imageobject>
-				<textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
-			</inlinemediaobject>.</para>
-				<para>The IPsec key is displayed in a popup window.</para></listitem>
-		</orderedlist>	
+    <title>Configuring VPN</title>
+    <para>To set up VPN for the cloud:</para>
+    <orderedlist>
+        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+        <listitem><para>In the left navigation, click Global Settings.</para></listitem>
+        <listitem><para>Set the following global configuration parameters.</para>
+        <itemizedlist>
+            <listitem><para>remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.</para></listitem>
+            <listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
+            <listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users per account.</para></listitem>
+        </itemizedlist></listitem></orderedlist>
+        <para>To enable VPN for a particular network:</para>    
+        <orderedlist>
+            <listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>            
+            <listitem><para>In the left navigation, click Network.</para></listitem>
+            <listitem><para>Click the name of the network you want to work with.</para></listitem>
+            <listitem><para>Click View IP Addresses.</para></listitem>
+            <listitem><para>Click one of the displayed IP address names.</para></listitem>
+            <listitem><para>Click the Enable VPN button <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/vpn-icon.png" />
+                </imageobject>
+                <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+            </inlinemediaobject>.</para>
+                <para>The IPsec key is displayed in a popup window.</para></listitem>
+        </orderedlist>    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/convert-hyperv-vm-to-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/convert-hyperv-vm-to-template.xml b/docs/en-US/convert-hyperv-vm-to-template.xml
index 1ceaa75..c6294d4 100644
--- a/docs/en-US/convert-hyperv-vm-to-template.xml
+++ b/docs/en-US/convert-hyperv-vm-to-template.xml
@@ -23,46 +23,46 @@
 -->
 
 <section id="convert-hyperv-vm-to-template">
-	<title>Converting a Hyper-V VM to a Template</title>
-	<para>To convert a Hyper-V VM to a XenServer-compatible &PRODUCT; template, you will need a standalone XenServer host with an attached NFS VHD SR.  Use whatever XenServer version you are using with &PRODUCT;, but use XenCenter 5.6 FP1 or SP2 (it is backwards compatible to 5.6).  Additionally, it may help to have an attached NFS ISO SR.</para>
-	<para>For Linux VMs, you may need to do some preparation in Hyper-V before trying to get the VM to work in XenServer.  Clone the VM and work on the clone if you still want to use the VM in Hyper-V.  Uninstall Hyper-V Integration Components and check for any references to device names in /etc/fstab:</para>
-	<orderedlist>
-		<listitem><para>From the linux_ic/drivers/dist directory, run make uninstall (where "linux_ic" is the path to the copied Hyper-V Integration Components files).</para></listitem>
-		<listitem><para>Restore the original initrd from backup in /boot/ (the backup is named *.backup0).</para></listitem>
-		<listitem><para>Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.</para></listitem>
-		<listitem><para>Check /etc/fstab for any partitions mounted by device name.  Change those entries (if any) to mount by LABEL or UUID (get that information with the "blkid" command)..</para></listitem>
-	</orderedlist>
-	<para>The next step is make sure the VM is not running in Hyper-V, then get the VHD into XenServer.  There are two options for doing this.</para>
-	<para>Option one:</para>
-	<orderedlist>
-	<listitem><para>Import the VHD using XenCenter.  In XenCenter, go to Tools&gt;Virtual Appliance Tools&gt;Disk Image Import.</para></listitem>		
-		<listitem><para>Choose the VHD, then click Next.</para></listitem>
-		<listitem><para>Name the VM, choose the NFS VHD SR under Storage, enable "Run Operating System Fixups" and choose the NFS ISO SR.</para></listitem>
-		<listitem><para>Click Next, then Finish.  A VM should be created.</para></listitem>
-	</orderedlist>
-	<para>Option two</para>
-	<orderedlist>
-		<listitem><para>Run XenConvert, under From choose VHD, under To choose XenServer. Click Next.</para></listitem>
-		<listitem><para>Choose the VHD, then click Next.</para></listitem>		
-		<listitem><para>Input the XenServer host info, then click Next.</para></listitem>
-		<listitem><para>Name the VM, then click Next, then Convert.  A VM should be created</para></listitem>
-	</orderedlist>
-	<para>Once you have a VM created from the Hyper-V VHD, prepare it using the following steps:</para>
-	<orderedlist>
-		<listitem><para>Boot the VM, uninstall Hyper-V Integration Services, and reboot.</para></listitem>
-		<listitem><para>Install XenServer Tools, then reboot.</para></listitem>		
-		<listitem><para>Prepare the VM as desired. For example, run sysprep on Windows VMs. See <xref linkend="create-windows-template"/></para></listitem>
-	</orderedlist>
-	<para>Either option above will create a VM in HVM mode.  This is fine for Windows VMs, but Linux VMs may not perform optimally.  Converting a Linux VM to PV mode will require additional steps and will vary by distribution.</para>
-	<orderedlist>
-		<listitem><para>Shut down the VM and copy the VHD from the NFS storage to a web server; for example, mount the NFS share on the web server and copy it, or from the XenServer host use sftp or scp to upload it to the web server.</para></listitem>
-		<listitem><para>In &PRODUCT;, create a new template using the following values:</para>
-		<itemizedlist>
-			<listitem><para>URL. Give the URL for the VHD</para></listitem>
-			<listitem><para>OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServer.</para></listitem>
-			<listitem><para>Hypervisor. XenServer</para></listitem>
-			<listitem><para>Format. VHD</para></listitem>
-		</itemizedlist></listitem>
-	</orderedlist>
-	<para>The template will be created, and you can create instances from it.</para>
+    <title>Converting a Hyper-V VM to a Template</title>
+    <para>To convert a Hyper-V VM to a XenServer-compatible &PRODUCT; template, you will need a standalone XenServer host with an attached NFS VHD SR.  Use whatever XenServer version you are using with &PRODUCT;, but use XenCenter 5.6 FP1 or SP2 (it is backwards compatible to 5.6).  Additionally, it may help to have an attached NFS ISO SR.</para>
+    <para>For Linux VMs, you may need to do some preparation in Hyper-V before trying to get the VM to work in XenServer.  Clone the VM and work on the clone if you still want to use the VM in Hyper-V.  Uninstall Hyper-V Integration Components and check for any references to device names in /etc/fstab:</para>
+    <orderedlist>
+        <listitem><para>From the linux_ic/drivers/dist directory, run make uninstall (where "linux_ic" is the path to the copied Hyper-V Integration Components files).</para></listitem>
+        <listitem><para>Restore the original initrd from backup in /boot/ (the backup is named *.backup0).</para></listitem>
+        <listitem><para>Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.</para></listitem>
+        <listitem><para>Check /etc/fstab for any partitions mounted by device name.  Change those entries (if any) to mount by LABEL or UUID (get that information with the "blkid" command)..</para></listitem>
+    </orderedlist>
+    <para>The next step is make sure the VM is not running in Hyper-V, then get the VHD into XenServer.  There are two options for doing this.</para>
+    <para>Option one:</para>
+    <orderedlist>
+    <listitem><para>Import the VHD using XenCenter.  In XenCenter, go to Tools&gt;Virtual Appliance Tools&gt;Disk Image Import.</para></listitem>        
+        <listitem><para>Choose the VHD, then click Next.</para></listitem>
+        <listitem><para>Name the VM, choose the NFS VHD SR under Storage, enable "Run Operating System Fixups" and choose the NFS ISO SR.</para></listitem>
+        <listitem><para>Click Next, then Finish.  A VM should be created.</para></listitem>
+    </orderedlist>
+    <para>Option two</para>
+    <orderedlist>
+        <listitem><para>Run XenConvert, under From choose VHD, under To choose XenServer. Click Next.</para></listitem>
+        <listitem><para>Choose the VHD, then click Next.</para></listitem>        
+        <listitem><para>Input the XenServer host info, then click Next.</para></listitem>
+        <listitem><para>Name the VM, then click Next, then Convert.  A VM should be created</para></listitem>
+    </orderedlist>
+    <para>Once you have a VM created from the Hyper-V VHD, prepare it using the following steps:</para>
+    <orderedlist>
+        <listitem><para>Boot the VM, uninstall Hyper-V Integration Services, and reboot.</para></listitem>
+        <listitem><para>Install XenServer Tools, then reboot.</para></listitem>        
+        <listitem><para>Prepare the VM as desired. For example, run sysprep on Windows VMs. See <xref linkend="create-windows-template"/></para></listitem>
+    </orderedlist>
+    <para>Either option above will create a VM in HVM mode.  This is fine for Windows VMs, but Linux VMs may not perform optimally.  Converting a Linux VM to PV mode will require additional steps and will vary by distribution.</para>
+    <orderedlist>
+        <listitem><para>Shut down the VM and copy the VHD from the NFS storage to a web server; for example, mount the NFS share on the web server and copy it, or from the XenServer host use sftp or scp to upload it to the web server.</para></listitem>
+        <listitem><para>In &PRODUCT;, create a new template using the following values:</para>
+        <itemizedlist>
+            <listitem><para>URL. Give the URL for the VHD</para></listitem>
+            <listitem><para>OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServer.</para></listitem>
+            <listitem><para>Hypervisor. XenServer</para></listitem>
+            <listitem><para>Format. VHD</para></listitem>
+        </itemizedlist></listitem>
+    </orderedlist>
+    <para>The template will be created, and you can create instances from it.</para>
 </section>


Mime
View raw message