incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [9/31] docs: Fix indentation according to coding convention
Date Sun, 12 Aug 2012 01:28:51 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/example-response-from-listUsageRecords.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/example-response-from-listUsageRecords.xml b/docs/en-US/example-response-from-listUsageRecords.xml
index 8ed752d..e0d7924 100644
--- a/docs/en-US/example-response-from-listUsageRecords.xml
+++ b/docs/en-US/example-response-from-listUsageRecords.xml
@@ -22,35 +22,35 @@
  under the License.
 -->
 
-	<section id="example-response-from-listUsageRecords">
-		<title>Example response from listUsageRecords</title>
-		<para>
-			All &PRODUCT; API requests are submitted in the form of a HTTP GET/POST with an associated command and any parameters.  A request is composed of the following whether in HTTP or HTTPS:</para>
-		
-		<programlisting>
-			&lt;listusagerecordsresponse&gt;
-  				&lt;count>1816&lt;/count&gt;
- 		    	&lt;usagerecord&gt;
-    				&lt;account&gt;user5&lt;/account&gt;
-    				&lt;accountid&gt;10004&lt;/accountid&gt;
-    				&lt;domainid&gt;1&lt;/domainid&gt;
-    				&lt;zoneid&gt;1&lt;/zoneid&gt;
-  	  				&lt;description&gt;i-3-4-WC running time (ServiceOffering: 1) (Template: 3)&lt;/description&gt;
-    				&lt;usage&gt;2.95288 Hrs&lt;/usage&gt;
-   					&lt;usagetype&gt;1&lt;/usagetype&gt;
-    				&lt;rawusage&gt;2.95288&lt;/rawusage&gt;
-   					&lt;virtualmachineid&gt;4&lt;/virtualmachineid&gt;
-    				&lt;name&gt;i-3-4-WC&lt;/name&gt;
-   					&lt;offeringid&gt;1&lt;/offeringid&gt;
-    				&lt;templateid&gt;3&lt;/templateid&gt;
-    				&lt;usageid&gt;245554&lt;/usageid&gt;
-    				&lt;type&gt;XenServer&lt;/type&gt;
-    				&lt;startdate&gt;2009-09-15T00:00:00-0700&lt;/startdate&gt;
-    				&lt;enddate&gt;2009-09-18T16:14:26-0700&lt;/enddate&gt;
-  				&lt;/usagerecord&gt;
+    <section id="example-response-from-listUsageRecords">
+        <title>Example response from listUsageRecords</title>
+        <para>
+            All &PRODUCT; API requests are submitted in the form of a HTTP GET/POST with an associated command and any parameters.  A request is composed of the following whether in HTTP or HTTPS:</para>
+        
+        <programlisting>
+            &lt;listusagerecordsresponse&gt;
+                  &lt;count>1816&lt;/count&gt;
+                 &lt;usagerecord&gt;
+                    &lt;account&gt;user5&lt;/account&gt;
+                    &lt;accountid&gt;10004&lt;/accountid&gt;
+                    &lt;domainid&gt;1&lt;/domainid&gt;
+                    &lt;zoneid&gt;1&lt;/zoneid&gt;
+                        &lt;description&gt;i-3-4-WC running time (ServiceOffering: 1) (Template: 3)&lt;/description&gt;
+                    &lt;usage&gt;2.95288 Hrs&lt;/usage&gt;
+                       &lt;usagetype&gt;1&lt;/usagetype&gt;
+                    &lt;rawusage&gt;2.95288&lt;/rawusage&gt;
+                       &lt;virtualmachineid&gt;4&lt;/virtualmachineid&gt;
+                    &lt;name&gt;i-3-4-WC&lt;/name&gt;
+                       &lt;offeringid&gt;1&lt;/offeringid&gt;
+                    &lt;templateid&gt;3&lt;/templateid&gt;
+                    &lt;usageid&gt;245554&lt;/usageid&gt;
+                    &lt;type&gt;XenServer&lt;/type&gt;
+                    &lt;startdate&gt;2009-09-15T00:00:00-0700&lt;/startdate&gt;
+                    &lt;enddate&gt;2009-09-18T16:14:26-0700&lt;/enddate&gt;
+                  &lt;/usagerecord&gt;
 
-  			 … (1,815 more usage records)
-			&lt;/listusagerecordsresponse&gt;
-		</programlisting>
-	</section>
+               … (1,815 more usage records)
+            &lt;/listusagerecordsresponse&gt;
+        </programlisting>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/export-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/export-template.xml b/docs/en-US/export-template.xml
index 05df2c0..c225e36 100644
--- a/docs/en-US/export-template.xml
+++ b/docs/en-US/export-template.xml
@@ -23,7 +23,7 @@
 -->
 
 <section id="export-template">
-	<title>Exporting Templates</title>
-	<para>End users and Administrators may export templates from the &PRODUCT;.  Navigate to the template in the UI and choose the Download function from the Actions menu.</para>
+    <title>Exporting Templates</title>
+    <para>End users and Administrators may export templates from the &PRODUCT;.  Navigate to the template in the UI and choose the Download function from the Actions menu.</para>
 
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/feature-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/feature-overview.xml b/docs/en-US/feature-overview.xml
index 7413e43..236d78b 100644
--- a/docs/en-US/feature-overview.xml
+++ b/docs/en-US/feature-overview.xml
@@ -23,46 +23,46 @@
 -->
 
 <section id="feature-overview">
-	<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.
-	</para>
-	<para>
-		&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.x.)
-	</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 <ulink url="http://docs.cloudstack.org/Apache_CloudStack_Documentation">http://docs.cloudstack.org/Apache_CloudStack_Documentation</ulink>.
-	</para>
-	<para>
-		The &PRODUCT; pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (<ulink url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide">http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
-	</para>
-	<para>
-		<emphasis role="bold">High Availability</emphasis>
-	</para>
-	<para>&PRODUCT; 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, &PRODUCT; supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
-	</para>
+    <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.
+    </para>
+    <para>
+        &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.x.)
+    </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 <ulink url="http://docs.cloudstack.org/Apache_CloudStack_Documentation">http://docs.cloudstack.org/Apache_CloudStack_Documentation</ulink>.
+    </para>
+    <para>
+        The &PRODUCT; pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (<ulink url="http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide">http://docs.cloudstack.org/CloudStack_Documentation/Allocator_Implementation_Guide</ulink>).
+    </para>
+    <para>
+        <emphasis role="bold">High Availability</emphasis>
+    </para>
+    <para>&PRODUCT; 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, &PRODUCT; 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/firewall-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/firewall-rules.xml b/docs/en-US/firewall-rules.xml
index 5923151..388bf7e 100644
--- a/docs/en-US/firewall-rules.xml
+++ b/docs/en-US/firewall-rules.xml
@@ -23,34 +23,34 @@
 -->
 
 <section id="firewall-rules">
-	<title>Firewall Rules</title>
-	<para>By default, all incoming traffic to the public IP address is rejected by the firewall. To allow external traffic, you can open firewall ports by specifying firewall rules.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses.</para>
-	<para>You cannot use firewall rules to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See <xref linkend="add-security-group"/>.</para>
-	<para>Firewall rules can be created using the Firewall tab in the Management Server UI. This tab is not displayed by default when &PRODUCT; is installed. To display the Firewall tab, the &PRODUCT; administrator must set the global configuration parameter firewall.rule.ui.enabled to "true."</para>
-	<para>To create a firewall rule:</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-		<listitem><para>In the left navigation, choose Network.</para></listitem>
-		<listitem><para>Click the name of the network where you want to work with.</para></listitem>
-		<listitem><para>Click View IP Addresses.</para></listitem>
-		<listitem><para>Click the IP address you want to work with.</para>
-		</listitem>
-		<listitem><para>Click the Configuration tab and fill in the following values.</para>
-		<itemizedlist>
-			<listitem><para><emphasis role="bold">Source CIDR</emphasis>. (Optional) To accept only traffic from IP
-						addresses within a particular address block, enter a CIDR or a
-						comma-separated list of CIDRs. Example: 192.168.0.0/22. Leave empty to allow
-						all CIDRs.</para></listitem>
-			<listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use on the opened
-						port(s).</para></listitem>
-			<listitem><para><emphasis role="bold">Start Port and End Port</emphasis>. The port(s) you want to open on the
-						firewall. If you are opening a single port, use the same number in both
-						fields</para></listitem>
-			<listitem><para><emphasis role="bold">ICMP Type and ICMP Code</emphasis>. Used only if Protocol is set to
-						ICMP. Provide the type and code required by the ICMP protocol to fill out
-						the ICMP header. Refer to ICMP documentation for more details if you are not
-						sure what to enter</para></listitem>
-		</itemizedlist></listitem>
-		<listitem><para>Click Add</para></listitem>		
-	</orderedlist>
+    <title>Firewall Rules</title>
+    <para>By default, all incoming traffic to the public IP address is rejected by the firewall. To allow external traffic, you can open firewall ports by specifying firewall rules.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses.</para>
+    <para>You cannot use firewall rules to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See <xref linkend="add-security-group"/>.</para>
+    <para>Firewall rules can be created using the Firewall tab in the Management Server UI. This tab is not displayed by default when &PRODUCT; is installed. To display the Firewall tab, the &PRODUCT; administrator must set the global configuration parameter firewall.rule.ui.enabled to "true."</para>
+    <para>To create a firewall rule:</para>
+    <orderedlist>
+        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+        <listitem><para>In the left navigation, choose Network.</para></listitem>
+        <listitem><para>Click the name of the network where you want to work with.</para></listitem>
+        <listitem><para>Click View IP Addresses.</para></listitem>
+        <listitem><para>Click the IP address you want to work with.</para>
+        </listitem>
+        <listitem><para>Click the Configuration tab and fill in the following values.</para>
+        <itemizedlist>
+            <listitem><para><emphasis role="bold">Source CIDR</emphasis>. (Optional) To accept only traffic from IP
+                        addresses within a particular address block, enter a CIDR or a
+                        comma-separated list of CIDRs. Example: 192.168.0.0/22. Leave empty to allow
+                        all CIDRs.</para></listitem>
+            <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use on the opened
+                        port(s).</para></listitem>
+            <listitem><para><emphasis role="bold">Start Port and End Port</emphasis>. The port(s) you want to open on the
+                        firewall. If you are opening a single port, use the same number in both
+                        fields</para></listitem>
+            <listitem><para><emphasis role="bold">ICMP Type and ICMP Code</emphasis>. Used only if Protocol is set to
+                        ICMP. Provide the type and code required by the ICMP protocol to fill out
+                        the ICMP header. Refer to ICMP documentation for more details if you are not
+                        sure what to enter</para></listitem>
+        </itemizedlist></listitem>
+        <listitem><para>Click Add</para></listitem>        
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/first_ms_node_install.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/first_ms_node_install.xml b/docs/en-US/first_ms_node_install.xml
index ea9c2f3..fcb4a86 100644
--- a/docs/en-US/first_ms_node_install.xml
+++ b/docs/en-US/first_ms_node_install.xml
@@ -22,37 +22,37 @@
  under the License.
 -->
 
-	<section id="first_ms_node_install">
-		<title>Install the First Management Server</title>
-			<orderedlist>
-				<listitem><para>Download the &PRODUCT; Management Server onto the host where it will run from one of the following links. If your operating system is CentOS, use the download file for RHEL.</para>
-					<itemizedlist>
-						<listitem><para>Open-source community: <ulink url="http://sourceforge.net/projects/cloudstack/files/CloudStack Acton/">http://sourceforge.net/projects/cloudstack/files/CloudStack Acton/</ulink></para></listitem>
-						<listitem><para>Commercial customers: <ulink url="https://www.citrix.com/English/ss/downloads/">https://www.citrix.com/English/ss/downloads/</ulink>.
-							Commercial customers will need a <ulink url="http://www.citrix.com/lang/English/publicindex.asp?destURL=%2FEnglish%2FmyCitrix%2Findex.asp%3F">MyCitrix account</ulink>.</para>
-						</listitem>
-					</itemizedlist>
-				</listitem>
-				<listitem><para>Install the &PRODUCT; packages. You should have a file in the form of “CloudStack-VERSION-N-OSVERSION.tar.gz”. Untar the file and then run the install.sh script inside it. Replace the file and directory names below with those you are using:</para>
-					<programlisting># tar xzf CloudStack-VERSION-N-OSVERSION.tar.gz
+    <section id="first_ms_node_install">
+        <title>Install the First Management Server</title>
+            <orderedlist>
+                <listitem><para>Download the &PRODUCT; Management Server onto the host where it will run from one of the following links. If your operating system is CentOS, use the download file for RHEL.</para>
+                    <itemizedlist>
+                        <listitem><para>Open-source community: <ulink url="http://sourceforge.net/projects/cloudstack/files/CloudStack Acton/">http://sourceforge.net/projects/cloudstack/files/CloudStack Acton/</ulink></para></listitem>
+                        <listitem><para>Commercial customers: <ulink url="https://www.citrix.com/English/ss/downloads/">https://www.citrix.com/English/ss/downloads/</ulink>.
+                            Commercial customers will need a <ulink url="http://www.citrix.com/lang/English/publicindex.asp?destURL=%2FEnglish%2FmyCitrix%2Findex.asp%3F">MyCitrix account</ulink>.</para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+                <listitem><para>Install the &PRODUCT; packages. You should have a file in the form of “CloudStack-VERSION-N-OSVERSION.tar.gz”. Untar the file and then run the install.sh script inside it. Replace the file and directory names below with those you are using:</para>
+                    <programlisting># tar xzf CloudStack-VERSION-N-OSVERSION.tar.gz
 # cd CloudStack-VERSION-N-OSVERSION
 # ./install.sh
 </programlisting>
-					<para>You should see a few messages as the installer prepares, followed by a list of choices.</para>
-				</listitem>
-				<listitem><para>Choose M to install the Management Server software.</para>
-					<programlisting>  > M</programlisting>
-				</listitem>
-				<listitem><para>Wait for a message like “Complete! Done,” which indicates that the software was installed successfully.</para>
-				</listitem>
-				<listitem><para>(RHEL or CentOS) When the installation is finished, run the following commands to start essential services  (the commands might be different depending on your OS):</para>
-					<programlisting># service rpcbind start
+                    <para>You should see a few messages as the installer prepares, followed by a list of choices.</para>
+                </listitem>
+                <listitem><para>Choose M to install the Management Server software.</para>
+                    <programlisting>  > M</programlisting>
+                </listitem>
+                <listitem><para>Wait for a message like “Complete! Done,” which indicates that the software was installed successfully.</para>
+                </listitem>
+                <listitem><para>(RHEL or CentOS) When the installation is finished, run the following commands to start essential services  (the commands might be different depending on your OS):</para>
+                    <programlisting># service rpcbind start
 # service nfs start
 # chkconfig nfs on
 # chkconfig rpcbind on
-							</programlisting>
-				</listitem>
-				<listitem><para>Continue to Install and Configure the Database.</para>
-				</listitem>
-			</orderedlist>
-	</section>
+                            </programlisting>
+                </listitem>
+                <listitem><para>Continue to Install and Configure the Database.</para>
+                </listitem>
+            </orderedlist>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/globally-configured-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/globally-configured-limit.xml b/docs/en-US/globally-configured-limit.xml
index 95d8895..ac71112 100644
--- a/docs/en-US/globally-configured-limit.xml
+++ b/docs/en-US/globally-configured-limit.xml
@@ -23,78 +23,78 @@
 -->
 
 <section id="globally-configured-limits">
-	<title>Globally Configured Limits</title>
-	<para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
-	<para>The following table lists limits set in the Global Configuration:</para>
-	<informaltable>
-		<tgroup cols="2">
-			<thead>
-				<row>
-					<entry><para>Parameter Name</para></entry>
-					<entry><para>Definition</para></entry>
-					
-				</row>
-			</thead>
-			<tbody>
-				<row>
-					<entry><para>max.account.public.ips</para></entry>
-					<entry><para>Number of public IP addresses that can be owned by an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.snapshots</para></entry>
-					<entry><para>Number of snapshots that can exist for an account</para></entry>
-					
-				</row>
-				
-				<row>
-					<entry><para>max.account.templates</para></entry>
-					<entry><para>Number of templates that can exist for an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.user.vms</para></entry>
-					<entry><para>Number of virtual machine instances that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.account.volumes</para></entry>
-					<entry><para>Number of disk volumes that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.template.iso.size</para></entry>
-					<entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.volume.size.gb</para></entry>
-					<entry><para>Maximum size for a volume in GB</para></entry>
-				</row>
-				<row>
-					<entry><para>network.throttling.rate</para></entry>
-					<entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.hourly</para></entry>
-					<entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.daily</para></entry>
-					<entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.weekly</para></entry>
-					<entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.monthly</para></entry>
-					<entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
-			    </row>		
-			</tbody>
-		</tgroup>
-	</informaltable>
-	<para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
+    <title>Globally Configured Limits</title>
+    <para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
+    <para>The following table lists limits set in the Global Configuration:</para>
+    <informaltable>
+        <tgroup cols="2">
+            <thead>
+                <row>
+                    <entry><para>Parameter Name</para></entry>
+                    <entry><para>Definition</para></entry>
+                    
+                </row>
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para>max.account.public.ips</para></entry>
+                    <entry><para>Number of public IP addresses that can be owned by an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.snapshots</para></entry>
+                    <entry><para>Number of snapshots that can exist for an account</para></entry>
+                    
+                </row>
+                
+                <row>
+                    <entry><para>max.account.templates</para></entry>
+                    <entry><para>Number of templates that can exist for an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.user.vms</para></entry>
+                    <entry><para>Number of virtual machine instances that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.account.volumes</para></entry>
+                    <entry><para>Number of disk volumes that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.template.iso.size</para></entry>
+                    <entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.volume.size.gb</para></entry>
+                    <entry><para>Maximum size for a volume in GB</para></entry>
+                </row>
+                <row>
+                    <entry><para>network.throttling.rate</para></entry>
+                    <entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.hourly</para></entry>
+                    <entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.daily</para></entry>
+                    <entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.weekly</para></entry>
+                    <entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.monthly</para></entry>
+                    <entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
+                </row>        
+            </tbody>
+        </tgroup>
+    </informaltable>
+    <para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/globally-configured-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/globally-configured-limits.xml b/docs/en-US/globally-configured-limits.xml
index 95d8895..ac71112 100644
--- a/docs/en-US/globally-configured-limits.xml
+++ b/docs/en-US/globally-configured-limits.xml
@@ -23,78 +23,78 @@
 -->
 
 <section id="globally-configured-limits">
-	<title>Globally Configured Limits</title>
-	<para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
-	<para>The following table lists limits set in the Global Configuration:</para>
-	<informaltable>
-		<tgroup cols="2">
-			<thead>
-				<row>
-					<entry><para>Parameter Name</para></entry>
-					<entry><para>Definition</para></entry>
-					
-				</row>
-			</thead>
-			<tbody>
-				<row>
-					<entry><para>max.account.public.ips</para></entry>
-					<entry><para>Number of public IP addresses that can be owned by an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.snapshots</para></entry>
-					<entry><para>Number of snapshots that can exist for an account</para></entry>
-					
-				</row>
-				
-				<row>
-					<entry><para>max.account.templates</para></entry>
-					<entry><para>Number of templates that can exist for an account</para></entry>
-					
-				</row>
-				<row>
-					<entry><para>max.account.user.vms</para></entry>
-					<entry><para>Number of virtual machine instances that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.account.volumes</para></entry>
-					<entry><para>Number of disk volumes that can exist for an account</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.template.iso.size</para></entry>
-					<entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>max.volume.size.gb</para></entry>
-					<entry><para>Maximum size for a volume in GB</para></entry>
-				</row>
-				<row>
-					<entry><para>network.throttling.rate</para></entry>
-					<entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.hourly</para></entry>
-					<entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.daily</para></entry>
-					<entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
-				</row>
-				<row>
-					<entry><para>snapshot.max.weekly</para></entry>
-					<entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
-				</row>
-				
-				<row>
-					<entry><para>snapshot.max.monthly</para></entry>
-					<entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
-			    </row>		
-			</tbody>
-		</tgroup>
-	</informaltable>
-	<para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
+    <title>Globally Configured Limits</title>
+    <para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits the guest virtual network to 254 running instances. It can be adjusted as needed, but this must be done before any instances are created in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses.</para>
+    <para>The following table lists limits set in the Global Configuration:</para>
+    <informaltable>
+        <tgroup cols="2">
+            <thead>
+                <row>
+                    <entry><para>Parameter Name</para></entry>
+                    <entry><para>Definition</para></entry>
+                    
+                </row>
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para>max.account.public.ips</para></entry>
+                    <entry><para>Number of public IP addresses that can be owned by an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.snapshots</para></entry>
+                    <entry><para>Number of snapshots that can exist for an account</para></entry>
+                    
+                </row>
+                
+                <row>
+                    <entry><para>max.account.templates</para></entry>
+                    <entry><para>Number of templates that can exist for an account</para></entry>
+                    
+                </row>
+                <row>
+                    <entry><para>max.account.user.vms</para></entry>
+                    <entry><para>Number of virtual machine instances that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.account.volumes</para></entry>
+                    <entry><para>Number of disk volumes that can exist for an account</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.template.iso.size</para></entry>
+                    <entry><para>Maximum size for a downloaded template or ISO in GB</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>max.volume.size.gb</para></entry>
+                    <entry><para>Maximum size for a volume in GB</para></entry>
+                </row>
+                <row>
+                    <entry><para>network.throttling.rate</para></entry>
+                    <entry><para>Default data transfer rate in megabits per second allowed per user (supported on XenServer)</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.hourly</para></entry>
+                    <entry><para>Maximum recurring hourly snapshots to be retained for a volume. If the limit is reached, early snapshots from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring hourly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.daily</para></entry>
+                    <entry><para>Maximum recurring daily snapshots to be retained for a volume. If the limit is reached, snapshots from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring daily snapshots can not be scheduled</para></entry>
+                </row>
+                <row>
+                    <entry><para>snapshot.max.weekly</para></entry>
+                    <entry><para>Maximum recurring weekly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring weekly snapshots can not be scheduled</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para>snapshot.max.monthly</para></entry>
+                    <entry><para>Maximum recurring monthly snapshots to be retained for a volume. If the limit is reached, snapshots from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual snapshots. If set to 0, recurring monthly snapshots can not be scheduled.</para></entry>
+                </row>        
+            </tbody>
+        </tgroup>
+    </informaltable>
+    <para>To modify global configuration parameters, use the global configuration screen in the &PRODUCT; UI. See Setting Global Configuration Parameters </para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/guest-ip-ranges.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-ip-ranges.xml b/docs/en-US/guest-ip-ranges.xml
index 08267a8..1f8c8a1 100644
--- a/docs/en-US/guest-ip-ranges.xml
+++ b/docs/en-US/guest-ip-ranges.xml
@@ -23,6 +23,6 @@
 -->
 
 <section id="guest-ip-ranges">
-	<title>Guest IP Ranges</title>
-	<para>The IP ranges for guest network traffic are set on a per-account basis by the user.  This allows the users to configure their network in a fashion that will enable VPN linking between their guest network and their clients.</para>
+    <title>Guest IP Ranges</title>
+    <para>The IP ranges for guest network traffic are set on a per-account basis by the user.  This allows the users to configure their network in a fashion that will enable VPN linking between their guest network and their clients.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-network.xml b/docs/en-US/guest-network.xml
index c9dee80..692eb29 100644
--- a/docs/en-US/guest-network.xml
+++ b/docs/en-US/guest-network.xml
@@ -23,7 +23,7 @@
 -->
 
 <section id="guest-network">
-	<title>Guest Network</title>
-	<para>In a &PRODUCT; cloud, guest VMs can communicate with each other using shared infrastructure with the security and user perception that the guests have a private LAN.</para>
-	<para>The &PRODUCT; virtual router is the main component providing networking features for guest traffic.</para>	
+    <title>Guest Network</title>
+    <para>In a &PRODUCT; cloud, guest VMs can communicate with each other using shared infrastructure with the security and user perception that the guests have a private LAN.</para>
+    <para>The &PRODUCT; virtual router is the main component providing networking features for guest traffic.</para>    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/guest-traffic.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-traffic.xml b/docs/en-US/guest-traffic.xml
index b5c50cc..96f9c06 100644
--- a/docs/en-US/guest-traffic.xml
+++ b/docs/en-US/guest-traffic.xml
@@ -23,16 +23,16 @@
 -->
 
 <section id="guest-traffic">
-	<title>Guest Traffic</title>
-	<para>A network can carry guest traffic only between VMs within one zone. Virtual machines in different zones cannot communicate with each other using their IP addresses; they must communicate with each other by routing through a public IP address.</para>
-	<para>Figure 1 illustrates a typical guest traffic setup:</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/basic-deployment.png" />
-		</imageobject>
-		<textobject><phrase>guesttraffic.png: Depicts a guest traffic setup</phrase></textobject>
-	</mediaobject>
-	<para>The Management Server automatically creates a virtual router for each network. A virtual router is a special virtual machine that runs on the hosts. Each virtual router has three network interfaces. Its eth0 interface serves as the gateway for the guest traffic and has the IP address of 10.1.1.1. Its eth1 interface is used by the system to configure the virtual router. Its eth2 interface is assigned a public IP address for public traffic.</para>
-	<para>The virtual router provides DHCP and will automatically assign an IP address for each guest VM within the IP range assigned for the network. The user can manually reconfigure guest VMs to assume different IP addresses.</para>
-	<para>Source NAT is automatically configured in the virtual router to forward outbound traffic for all guest VMs</para>
+    <title>Guest Traffic</title>
+    <para>A network can carry guest traffic only between VMs within one zone. Virtual machines in different zones cannot communicate with each other using their IP addresses; they must communicate with each other by routing through a public IP address.</para>
+    <para>Figure 1 illustrates a typical guest traffic setup:</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/basic-deployment.png" />
+        </imageobject>
+        <textobject><phrase>guesttraffic.png: Depicts a guest traffic setup</phrase></textobject>
+    </mediaobject>
+    <para>The Management Server automatically creates a virtual router for each network. A virtual router is a special virtual machine that runs on the hosts. Each virtual router has three network interfaces. Its eth0 interface serves as the gateway for the guest traffic and has the IP address of 10.1.1.1. Its eth1 interface is used by the system to configure the virtual router. Its eth2 interface is assigned a public IP address for public traffic.</para>
+    <para>The virtual router provides DHCP and will automatically assign an IP address for each guest VM within the IP range assigned for the network. The user can manually reconfigure guest VMs to assume different IP addresses.</para>
+    <para>Source NAT is automatically configured in the virtual router to forward outbound traffic for all guest VMs</para>
 </section>

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/hypervisor-support-for-primarystorage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml
index 7c547a6..ca266a4 100644
--- a/docs/en-US/hypervisor-support-for-primarystorage.xml
+++ b/docs/en-US/hypervisor-support-for-primarystorage.xml
@@ -23,80 +23,80 @@
 -->
 
 <section id="hypervisor-support-for-primarystorage">
-	<title>Hypervisor Support for Primary Storage</title>
-	<para>The following table shows storage options and parameters for different hypervisors.</para>
-	<informaltable>
-		<tgroup cols="5">
-			<colspec colname="c1" colnum="1" colwidth="4.0cm"/>
-			<colspec colname="c2" colnum="2" colwidth="4cm" />
-			<colspec colname="c3" colnum="3" colwidth="5cm" />
-			<colspec colname="c4" colnum="2" colwidth="5.9cm"/>
-			<colspec colname="c5" colnum="3" colwidth="5.0cm"/>
-			<colspec colnum="4" colname="c4" colwidth="120.75pt"/>
-			<colspec colnum="5" colname="c5" colwidth="80.25pt"/>
-			<thead>
-				<row>
-					<entry></entry>
-					<entry><para>VMware vSphere</para></entry>
-					<entry><para>Citrix XenServer</para></entry>
-					<entry><para>KVM</para></entry>
-					<entry><para>Oracle VM</para></entry>
-				</row>
-			</thead>
-			<tbody>
-				<row>
-					<entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and
-									Snapshots</emphasis></emphasis></para></entry>
-					<entry><para>VMDK</para></entry>
-					<entry><para>VHD</para></entry>
-					<entry><para>QCOW2</para></entry>
-					<entry><para>RAW</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry>
-					<entry><para>VMFS</para></entry>
-					<entry><para>Clustered LVM</para></entry>
-					<entry><para>Yes, via Shared Mountpoint</para></entry>
-					<entry><para>Yes, via OCFS2M</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry>
-					<entry><para>VMFS</para></entry>
-					<entry><para>Yes, via Existing SR</para></entry>
-					<entry><para>Yes, via Shared Mountpoint</para></entry>
-					<entry><para>No</para></entry>
-				</row>
-				<row>
-					<entry><para><emphasis role="bold">NFS support</emphasis></para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-				</row>
-				
-				<row>
-					<entry><para><emphasis role="bold">Local storage support</emphasis></para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>Y</para></entry>
-				</row>
-				
-				<row>
-					<entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry>
-					<entry><para>NFS and iSCSI</para></entry>
-					<entry><para>NFS</para></entry>
-					<entry><para>NFS</para></entry>
-					<entry><para>No</para></entry>
-				</row>
-					
-			</tbody>
-		</tgroup>
-	</informaltable>
-	<para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning.  As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes.</para>
-	<para>KVM supports "Shared Mountpoint" storage.  A shared mountpoint is a file system path local to each server in a given cluster.  The path must be the same across all Hosts in the cluster, for example /mnt/primary1.  This shared mountpoint is assumed to be a clustered filesystem such as OCFS2.  In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS.  The &PRODUCT; requires that the administrator insure that the storage is available</para>
-	<para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para>
-	<para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type.</para>
-	<para>Local storage is an option for primary storage for vSphere, XenServer, Oracle VM, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration.</para>
-	<para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity.</para>
-	</section>
+    <title>Hypervisor Support for Primary Storage</title>
+    <para>The following table shows storage options and parameters for different hypervisors.</para>
+    <informaltable>
+        <tgroup cols="5">
+            <colspec colname="c1" colnum="1" colwidth="4.0cm"/>
+            <colspec colname="c2" colnum="2" colwidth="4cm" />
+            <colspec colname="c3" colnum="3" colwidth="5cm" />
+            <colspec colname="c4" colnum="2" colwidth="5.9cm"/>
+            <colspec colname="c5" colnum="3" colwidth="5.0cm"/>
+            <colspec colnum="4" colname="c4" colwidth="120.75pt"/>
+            <colspec colnum="5" colname="c5" colwidth="80.25pt"/>
+            <thead>
+                <row>
+                    <entry></entry>
+                    <entry><para>VMware vSphere</para></entry>
+                    <entry><para>Citrix XenServer</para></entry>
+                    <entry><para>KVM</para></entry>
+                    <entry><para>Oracle VM</para></entry>
+                </row>
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and
+                                    Snapshots</emphasis></emphasis></para></entry>
+                    <entry><para>VMDK</para></entry>
+                    <entry><para>VHD</para></entry>
+                    <entry><para>QCOW2</para></entry>
+                    <entry><para>RAW</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry>
+                    <entry><para>VMFS</para></entry>
+                    <entry><para>Clustered LVM</para></entry>
+                    <entry><para>Yes, via Shared Mountpoint</para></entry>
+                    <entry><para>Yes, via OCFS2M</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry>
+                    <entry><para>VMFS</para></entry>
+                    <entry><para>Yes, via Existing SR</para></entry>
+                    <entry><para>Yes, via Shared Mountpoint</para></entry>
+                    <entry><para>No</para></entry>
+                </row>
+                <row>
+                    <entry><para><emphasis role="bold">NFS support</emphasis></para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para><emphasis role="bold">Local storage support</emphasis></para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>Y</para></entry>
+                </row>
+                
+                <row>
+                    <entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry>
+                    <entry><para>NFS and iSCSI</para></entry>
+                    <entry><para>NFS</para></entry>
+                    <entry><para>NFS</para></entry>
+                    <entry><para>No</para></entry>
+                </row>
+                    
+            </tbody>
+        </tgroup>
+    </informaltable>
+    <para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning.  As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes.</para>
+    <para>KVM supports "Shared Mountpoint" storage.  A shared mountpoint is a file system path local to each server in a given cluster.  The path must be the same across all Hosts in the cluster, for example /mnt/primary1.  This shared mountpoint is assumed to be a clustered filesystem such as OCFS2.  In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS.  The &PRODUCT; requires that the administrator insure that the storage is available</para>
+    <para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para>
+    <para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type.</para>
+    <para>Local storage is an option for primary storage for vSphere, XenServer, Oracle VM, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration.</para>
+    <para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity.</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/import-ami.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/import-ami.xml b/docs/en-US/import-ami.xml
index a79eb83..2f093b1 100644
--- a/docs/en-US/import-ami.xml
+++ b/docs/en-US/import-ami.xml
@@ -23,31 +23,31 @@
 -->
 
 <section id="import-ami">
-	<title>Importing Amazon Machine Images</title>
-	<para>The following procedures describe how to import an Amazon Machine Image (AMI) into &PRODUCT; when using the XenServer hypervisor.</para>
-	<para>Assume you have an AMI file and this file is called CentOS_6.2_x64. Assume further that you are working on a CentOS host. If the AMI is a Fedora image, you need to be working on a Fedora host initially.</para>
-	<para>You need to have a XenServer host with a file-based storage repository (either a local ext3 SR or an NFS SR) to convert to a VHD once the image file has been customized on the Centos/Fedora host.</para>
-	<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>
-	<orderedlist>
-		<listitem><para>Set up loopback on image file:</para><programlisting># mkdir -p /mnt/loop/centos62
+    <title>Importing Amazon Machine Images</title>
+    <para>The following procedures describe how to import an Amazon Machine Image (AMI) into &PRODUCT; when using the XenServer hypervisor.</para>
+    <para>Assume you have an AMI file and this file is called CentOS_6.2_x64. Assume further that you are working on a CentOS host. If the AMI is a Fedora image, you need to be working on a Fedora host initially.</para>
+    <para>You need to have a XenServer host with a file-based storage repository (either a local ext3 SR or an NFS SR) to convert to a VHD once the image file has been customized on the Centos/Fedora host.</para>
+    <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>
+    <orderedlist>
+        <listitem><para>Set up loopback on image file:</para><programlisting># mkdir -p /mnt/loop/centos62
 # mount -o loop  CentOS_6.2_x64 /mnt/loop/centos54
 </programlisting></listitem>
-		<listitem><para>Install the kernel-xen package into the image. This downloads the PV kernel and ramdisk to the image.</para><programlisting># yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen</programlisting></listitem>
-		<listitem><para>Create a grub entry in /boot/grub/grub.conf.</para><programlisting># mkdir -p /mnt/loop/centos62/boot/grub
+        <listitem><para>Install the kernel-xen package into the image. This downloads the PV kernel and ramdisk to the image.</para><programlisting># yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen</programlisting></listitem>
+        <listitem><para>Create a grub entry in /boot/grub/grub.conf.</para><programlisting># mkdir -p /mnt/loop/centos62/boot/grub
 # touch /mnt/loop/centos62/boot/grub/grub.conf
 # echo "" &gt; /mnt/loop/centos62/boot/grub/grub.conf
 </programlisting></listitem>
-		<listitem><para>Determine the name of the PV kernel that has been installed into the image.</para>
-			<programlisting># cd /mnt/loop/centos62
+        <listitem><para>Determine the name of the PV kernel that has been installed into the image.</para>
+            <programlisting># cd /mnt/loop/centos62
 # ls lib/modules/
 2.6.16.33-xenU  2.6.16-xenU  2.6.18-164.15.1.el5xen  2.6.18-164.6.1.el5.centos.plus  2.6.18-xenU-ec2-v1.0  2.6.21.7-2.fc8xen  2.6.31-302-ec2
 # ls boot/initrd*
 boot/initrd-2.6.18-164.6.1.el5.centos.plus.img boot/initrd-2.6.18-164.15.1.el5xen.img
 # ls boot/vmlinuz*
 boot/vmlinuz-2.6.18-164.15.1.el5xen  boot/vmlinuz-2.6.18-164.6.1.el5.centos.plus  boot/vmlinuz-2.6.18-xenU-ec2-v1.0  boot/vmlinuz-2.6.21-2952.fc8xen
-			</programlisting>
-			<para>Xen kernels/ramdisk always end with "xen". For the kernel version you choose, there has to be an entry for that version under lib/modules, there has to be an initrd and vmlinuz corresponding to that. Above, the only kernel that satisfies this condition is 2.6.18-164.15.1.el5xen.</para></listitem>
-		<listitem><para>Based on your findings, create an entry in the grub.conf file. Below is an example entry.</para><programlisting>default=0
+            </programlisting>
+            <para>Xen kernels/ramdisk always end with "xen". For the kernel version you choose, there has to be an entry for that version under lib/modules, there has to be an initrd and vmlinuz corresponding to that. Above, the only kernel that satisfies this condition is 2.6.18-164.15.1.el5xen.</para></listitem>
+        <listitem><para>Based on your findings, create an entry in the grub.conf file. Below is an example entry.</para><programlisting>default=0
 timeout=5
 hiddenmenu
 title CentOS (2.6.18-164.15.1.el5xen)
@@ -55,58 +55,58 @@ title CentOS (2.6.18-164.15.1.el5xen)
         kernel /boot/vmlinuz-2.6.18-164.15.1.el5xen ro root=/dev/xvda 
         initrd /boot/initrd-2.6.18-164.15.1.el5xen.img
 </programlisting></listitem>
-		<listitem><para>Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to “xvdb”.</para>
-		<programlisting># cat etc/fstab
+        <listitem><para>Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to “xvdb”.</para>
+        <programlisting># cat etc/fstab
 /dev/xvda  /         ext3    defaults        1 1
 /dev/xvdb  /mnt      ext3    defaults        0 0
 none       /dev/pts  devpts  gid=5,mode=620  0 0
 none       /proc     proc    defaults        0 0
 none       /sys      sysfs   defaults        0 0
 </programlisting></listitem>
-		<listitem><para>Enable login via the console. The default console device in a XenServer system is xvc0.  Ensure that etc/inittab and etc/securetty have the following lines respectively:</para>
-		<programlisting># grep xvc0 etc/inittab 
+        <listitem><para>Enable login via the console. The default console device in a XenServer system is xvc0.  Ensure that etc/inittab and etc/securetty have the following lines respectively:</para>
+        <programlisting># grep xvc0 etc/inittab 
 co:2345:respawn:/sbin/agetty xvc0 9600 vt100-nav
 # grep xvc0 etc/securetty 
 xvc0
 </programlisting></listitem>
-		<listitem><para>Ensure the ramdisk supports PV disk and PV network. Customize this for the kernel version you have determined above.</para>
-		<programlisting># chroot /mnt/loop/centos54
+        <listitem><para>Ensure the ramdisk supports PV disk and PV network. Customize this for the kernel version you have determined above.</para>
+        <programlisting># chroot /mnt/loop/centos54
 # cd /boot/
 # mv initrd-2.6.18-164.15.1.el5xen.img initrd-2.6.18-164.15.1.el5xen.img.bak
 # mkinitrd -f /boot/initrd-2.6.18-164.15.1.el5xen.img --with=xennet --preload=xenblk --omit-scsi-modules 2.6.18-164.15.1.el5xen
 </programlisting></listitem>
-		<listitem><para>Change the password.</para>
-			<programlisting># passwd
+        <listitem><para>Change the password.</para>
+            <programlisting># passwd
 Changing password for user root.
 New UNIX password: 
 Retype new UNIX password: 
 passwd: all authentication tokens updated successfully.
 </programlisting></listitem>
-		<listitem><para>Exit out of chroot.</para><programlisting># exit</programlisting></listitem>
-		<listitem><para>Check etc/ssh/sshd_config for lines allowing ssh login using a password.</para>
-		<programlisting># egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
+        <listitem><para>Exit out of chroot.</para><programlisting># exit</programlisting></listitem>
+        <listitem><para>Check etc/ssh/sshd_config for lines allowing ssh login using a password.</para>
+        <programlisting># egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
 PermitRootLogin yes
 PasswordAuthentication yes
 </programlisting></listitem>
-		<listitem><para>If you need the template to be enabled to reset passwords from the &PRODUCT; UI or API,
+        <listitem><para>If you need the template to be enabled to reset passwords from the &PRODUCT; UI or API,
                                 install the password change script into the image at this point. See
-		        <xref linkend="add-password-management-to-templates"/>.</para></listitem>
-		<listitem><para>Unmount and delete loopback mount.</para><programlisting># umount /mnt/loop/centos54
+                <xref linkend="add-password-management-to-templates"/>.</para></listitem>
+        <listitem><para>Unmount and delete loopback mount.</para><programlisting># umount /mnt/loop/centos54
 # losetup -d /dev/loop0
 </programlisting></listitem>
-		<listitem><para>Copy the image file to your XenServer host's file-based storage repository. In the example below, the Xenserver is "xenhost". This XenServer has an NFS repository whose uuid is a9c5b8c8-536b-a193-a6dc-51af3e5ff799.</para>
-		<programlisting># scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/</programlisting></listitem>
-		<listitem><para>Log in to the Xenserver and create a VDI the same size as the image.</para>
-		<programlisting>[root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
+        <listitem><para>Copy the image file to your XenServer host's file-based storage repository. In the example below, the Xenserver is "xenhost". This XenServer has an NFS repository whose uuid is a9c5b8c8-536b-a193-a6dc-51af3e5ff799.</para>
+        <programlisting># scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/</programlisting></listitem>
+        <listitem><para>Log in to the Xenserver and create a VDI the same size as the image.</para>
+        <programlisting>[root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]#  ls -lh CentOS_6.2_x64
 -rw-r--r-- 1 root root 10G Mar 16 16:49 CentOS_6.2_x64
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-create virtual-size=10GiB sr-uuid=a9c5b8c8-536b-a193-a6dc-51af3e5ff799 type=user name-label="Centos 6.2 x86_64"
 cad7317c-258b-4ef7-b207-cdf0283a7923
 </programlisting></listitem>
-		<listitem><para>Import the image file into the VDI. This may take 10–20 minutes.</para><programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923</programlisting></listitem>
-		<listitem><para>Locate a the VHD file.  This is the file with the VDI’s UUID as its name. Compress it and upload it to your web server.</para>
-		<programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
+        <listitem><para>Import the image file into the VDI. This may take 10–20 minutes.</para><programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923</programlisting></listitem>
+        <listitem><para>Locate a the VHD file.  This is the file with the VDI’s UUID as its name. Compress it and upload it to your web server.</para>
+        <programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# scp CentOS_6.2_x64.vhd.bz2 webserver:/var/www/html/templates/
 </programlisting></listitem>
-	</orderedlist>
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/incremental-snapshots-backup.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/incremental-snapshots-backup.xml b/docs/en-US/incremental-snapshots-backup.xml
index 6c7d820..ade00c9 100644
--- a/docs/en-US/incremental-snapshots-backup.xml
+++ b/docs/en-US/incremental-snapshots-backup.xml
@@ -23,29 +23,29 @@
 -->
 
 <section id="incremental-snapshots-backup">
-	<title>Incremental Snapshots and Backup </title>
-	<para>Snapshots are created on primary storage where a disk resides. After a snapshot is created, it is immediately backed up to secondary storage and removed from primary storage for optimal utilization of space on primary storage.</para>
-	<para>&PRODUCT; does incremental backups for some hypervisors. When incremental backups are supported, every N backup is a full backup.</para>
-	<informaltable>
-		<tgroup cols="4" align="left" colsep="1" rowsep="1">
-			
-			<thead>
-				<row>
-					<entry></entry>
-					<entry><para>VMware vSphere</para></entry>
-					<entry><para>Citrix XenServer</para></entry>
-					<entry><para>KVM</para></entry>
-				</row>									
-			</thead>
-			<tbody>
-				<row>
-					<entry><para>Support incremental backup</para></entry>
-					<entry><para>N</para></entry>
-					<entry><para>Y</para></entry>
-					<entry><para>N</para></entry>
-				</row>
-			</tbody>
-		</tgroup>
-	</informaltable>
-	
-	</section>
+    <title>Incremental Snapshots and Backup </title>
+    <para>Snapshots are created on primary storage where a disk resides. After a snapshot is created, it is immediately backed up to secondary storage and removed from primary storage for optimal utilization of space on primary storage.</para>
+    <para>&PRODUCT; does incremental backups for some hypervisors. When incremental backups are supported, every N backup is a full backup.</para>
+    <informaltable>
+        <tgroup cols="4" align="left" colsep="1" rowsep="1">
+            
+            <thead>
+                <row>
+                    <entry></entry>
+                    <entry><para>VMware vSphere</para></entry>
+                    <entry><para>Citrix XenServer</para></entry>
+                    <entry><para>KVM</para></entry>
+                </row>                                    
+            </thead>
+            <tbody>
+                <row>
+                    <entry><para>Support incremental backup</para></entry>
+                    <entry><para>N</para></entry>
+                    <entry><para>Y</para></entry>
+                    <entry><para>N</para></entry>
+                </row>
+            </tbody>
+        </tgroup>
+    </informaltable>
+    
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/initial-setup-of-external-firewalls-loadbalancers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/initial-setup-of-external-firewalls-loadbalancers.xml b/docs/en-US/initial-setup-of-external-firewalls-loadbalancers.xml
index a2d8db2..332afa0 100644
--- a/docs/en-US/initial-setup-of-external-firewalls-loadbalancers.xml
+++ b/docs/en-US/initial-setup-of-external-firewalls-loadbalancers.xml
@@ -34,5 +34,5 @@
     <itemizedlist>        
         <listitem><para>A new VLAN that matches the account's provisioned Zone VLAN</para></listitem>
         <listitem><para>A self IP for the VLAN. This is always the second IP of the account's private subnet (e.g. 10.1.1.2).</para></listitem>
-      </itemizedlist>   				
-	</section>
+      </itemizedlist>                   
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/initialize-and-test.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/initialize-and-test.xml b/docs/en-US/initialize-and-test.xml
index 1c66c40..e5a57d8 100644
--- a/docs/en-US/initialize-and-test.xml
+++ b/docs/en-US/initialize-and-test.xml
@@ -23,6 +23,6 @@
 -->
 
 <section id="initialize-and-test">
-	<title>Initialize and Test</title>
-	<para>TODO</para>
+    <title>Initialize and Test</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/install-database-on-management-server-node.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/install-database-on-management-server-node.xml b/docs/en-US/install-database-on-management-server-node.xml
index 2369e7c..238f9de 100644
--- a/docs/en-US/install-database-on-management-server-node.xml
+++ b/docs/en-US/install-database-on-management-server-node.xml
@@ -23,76 +23,76 @@
 -->
 
 <section id="install-database-on-management-server-node">
-	<title>Install the Database on the Management Server Node</title>
-	<para>This section describes how to install MySQL on the same machine with the Management Server. This technique is intended for a simple deployment that has a single Management Server node. If you have a multi-node Management Server deployment, you will typically use a separate node for MySQL. See <xref linkend="install-database-on-separate-node" />.
-	</para>
-	<orderedlist>
-		<listitem><para>If you already have a version of MySQL installed on the Management Server node, make one of the following choices, depending on what version of MySQL it is. The most recent version tested is 5.1.58.</para>
-			<itemizedlist>
-				<listitem><para>If you already have installed MySQL version 5.1.58 or later, skip to step 4.</para>
-				</listitem>
-				<listitem><para>If you have installed a version of MySQL earlier than 5.1.58, you can either skip to step 4 or uninstall MySQL and proceed to step 2 to install a more recent version.</para></listitem>
-			</itemizedlist>
-			<warning><para>It is important that you choose the right database version. Never downgrade a MySQL installation.</para></warning>
-		</listitem>
-		<listitem><para>On the same computer where you installed the Management Server, re-run install.sh.</para>
-			<programlisting># ./install.sh</programlisting>
-			<para>You should see a few messages as the installer prepares, followed by a list of choices.</para>
-		</listitem>
-		<listitem><para>Choose D to install the MySQL server from the distribution’s repo.</para>
-			<programlisting>  > D</programlisting>
-			<para>Troubleshooting: If you do not see the D option, you already have MySQL installed. Please go back to step 1.</para>
-		</listitem>
-		<listitem><para>Edit the MySQL configuration (/etc/my.cnf or /etc/mysql/my.cnf, depending on your OS) and insert the following lines in the [mysqld] section. You can put these lines below the datadir line. The max_connections parameter should be set to 350 multiplied by the number of Management Servers you are deploying. This example assumes one Management Server.</para>
-			<programlisting>
+    <title>Install the Database on the Management Server Node</title>
+    <para>This section describes how to install MySQL on the same machine with the Management Server. This technique is intended for a simple deployment that has a single Management Server node. If you have a multi-node Management Server deployment, you will typically use a separate node for MySQL. See <xref linkend="install-database-on-separate-node" />.
+    </para>
+    <orderedlist>
+        <listitem><para>If you already have a version of MySQL installed on the Management Server node, make one of the following choices, depending on what version of MySQL it is. The most recent version tested is 5.1.58.</para>
+            <itemizedlist>
+                <listitem><para>If you already have installed MySQL version 5.1.58 or later, skip to step 4.</para>
+                </listitem>
+                <listitem><para>If you have installed a version of MySQL earlier than 5.1.58, you can either skip to step 4 or uninstall MySQL and proceed to step 2 to install a more recent version.</para></listitem>
+            </itemizedlist>
+            <warning><para>It is important that you choose the right database version. Never downgrade a MySQL installation.</para></warning>
+        </listitem>
+        <listitem><para>On the same computer where you installed the Management Server, re-run install.sh.</para>
+            <programlisting># ./install.sh</programlisting>
+            <para>You should see a few messages as the installer prepares, followed by a list of choices.</para>
+        </listitem>
+        <listitem><para>Choose D to install the MySQL server from the distribution’s repo.</para>
+            <programlisting>  > D</programlisting>
+            <para>Troubleshooting: If you do not see the D option, you already have MySQL installed. Please go back to step 1.</para>
+        </listitem>
+        <listitem><para>Edit the MySQL configuration (/etc/my.cnf or /etc/mysql/my.cnf, depending on your OS) and insert the following lines in the [mysqld] section. You can put these lines below the datadir line. The max_connections parameter should be set to 350 multiplied by the number of Management Servers you are deploying. This example assumes one Management Server.</para>
+            <programlisting>
 innodb_rollback_on_timeout=1
 innodb_lock_wait_timeout=600
 max_connections=350
 log-bin=mysql-bin
 binlog-format = 'ROW'
-			</programlisting>
-			<note><para>The binlog-format variable is supported in MySQL versions 5.1 and greater. It is not supported in MySQL 5.0. In some versions of MySQL, an underscore character is used in place of the hyphen in the variable name. For the exact syntax and spelling of each variable, consult the documentation for your version of MySQL.</para></note>
-		</listitem>
-		<listitem><para>Restart the MySQL service, then invoke MySQL as the root user.</para>
-			<programlisting>
+            </programlisting>
+            <note><para>The binlog-format variable is supported in MySQL versions 5.1 and greater. It is not supported in MySQL 5.0. In some versions of MySQL, an underscore character is used in place of the hyphen in the variable name. For the exact syntax and spelling of each variable, consult the documentation for your version of MySQL.</para></note>
+        </listitem>
+        <listitem><para>Restart the MySQL service, then invoke MySQL as the root user.</para>
+            <programlisting>
 # service mysqld restart
 # mysql -u root
-			</programlisting>
-		</listitem>
-		<listitem><para>Best Practice: On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution. Run the following commands, and substitute your own desired root password.</para>
-		<programlisting>mysql> SET PASSWORD = PASSWORD('password');</programlisting>
-			<para>From now on, start MySQL with mysql -p so it will prompt you for the password.</para>
-		</listitem>
-		<listitem><para>To grant access privileges to remote users, perform the following steps.</para>
-			<orderedlist numeration="loweralpha">
-				<listitem><para>Run the following commands from the mysql prompt:</para>
-					<programlisting>
+            </programlisting>
+        </listitem>
+        <listitem><para>Best Practice: On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly recommended that you set a root password as a security precaution. Run the following commands, and substitute your own desired root password.</para>
+        <programlisting>mysql> SET PASSWORD = PASSWORD('password');</programlisting>
+            <para>From now on, start MySQL with mysql -p so it will prompt you for the password.</para>
+        </listitem>
+        <listitem><para>To grant access privileges to remote users, perform the following steps.</para>
+            <orderedlist numeration="loweralpha">
+                <listitem><para>Run the following commands from the mysql prompt:</para>
+                    <programlisting>
 mysql> GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; 
 mysql> exit
-					</programlisting>
-				</listitem>
-				<listitem><para>Restart the MySQL service.</para>
-					<programlisting># service mysqld restart</programlisting></listitem>
-				<listitem><para>Open the MySQL server port (3306) in the firewall to allow remote clients to connect.</para>
-					<programlisting># iptables -I INPUT -p tcp --dport 3306 -j ACCEPT</programlisting></listitem>
-				<listitem><para>Edit the /etc/sysconfig/iptables file and add the following line at the beginning of the INPUT chain.</para>
-					<programlisting> -A INPUT -p tcp --dport 3306 -j ACCEPT</programlisting></listitem>
-			</orderedlist>
-		</listitem>
-		<listitem><para>Set up the database. The following command creates the cloud user on the database.</para>
-			<itemizedlist>
-				<listitem><para>In dbpassword, specify the password to be assigned to the cloud user. You can choose to provide no password.</para></listitem>
-				<listitem><para>In deploy-as, specify the username and password of the user deploying the database. In the following command, it is assumed the root user is deploying the database and creating the cloud user.</para></listitem>
-				<listitem><para>(Optional) For encryption_type, use file or web to indicate the technique used to pass in the database encryption password. Default: file. See About Password and Key Encryption.</para></listitem>
-				<listitem><para>(Optional) For management_server_key, substitute the default key that is used to encrypt confidential parameters in the &PRODUCT; properties file. Default: password. It is highly recommended that you replace this with a more secure value. See About Password and Key Encryption.</para></listitem>
-				<listitem><para>(Optional) For database_key, substitute the default key that is used to encrypt confidential parameters in the &PRODUCT; database. Default: password. It is highly recommended that you replace this with a more secure value. See About Password and Key Encryption.</para></listitem>
-			</itemizedlist>
-			<programlisting># cloud-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt;</programlisting>
-			<para>When this script is finished, you should see a message like “Successfully initialized the database.”</para>
-		</listitem>
-		<listitem><para>Now that the database is set up, you can finish configuring the OS for the Management Server. This command will set up iptables, sudoers, and start the Management Server.</para>
-			<programlisting># cloud-setup-management</programlisting>
-			<para>You should see the message “Management Server setup is done.”</para>
-		</listitem>
-	</orderedlist>
+                    </programlisting>
+                </listitem>
+                <listitem><para>Restart the MySQL service.</para>
+                    <programlisting># service mysqld restart</programlisting></listitem>
+                <listitem><para>Open the MySQL server port (3306) in the firewall to allow remote clients to connect.</para>
+                    <programlisting># iptables -I INPUT -p tcp --dport 3306 -j ACCEPT</programlisting></listitem>
+                <listitem><para>Edit the /etc/sysconfig/iptables file and add the following line at the beginning of the INPUT chain.</para>
+                    <programlisting> -A INPUT -p tcp --dport 3306 -j ACCEPT</programlisting></listitem>
+            </orderedlist>
+        </listitem>
+        <listitem><para>Set up the database. The following command creates the cloud user on the database.</para>
+            <itemizedlist>
+                <listitem><para>In dbpassword, specify the password to be assigned to the cloud user. You can choose to provide no password.</para></listitem>
+                <listitem><para>In deploy-as, specify the username and password of the user deploying the database. In the following command, it is assumed the root user is deploying the database and creating the cloud user.</para></listitem>
+                <listitem><para>(Optional) For encryption_type, use file or web to indicate the technique used to pass in the database encryption password. Default: file. See About Password and Key Encryption.</para></listitem>
+                <listitem><para>(Optional) For management_server_key, substitute the default key that is used to encrypt confidential parameters in the &PRODUCT; properties file. Default: password. It is highly recommended that you replace this with a more secure value. See About Password and Key Encryption.</para></listitem>
+                <listitem><para>(Optional) For database_key, substitute the default key that is used to encrypt confidential parameters in the &PRODUCT; database. Default: password. It is highly recommended that you replace this with a more secure value. See About Password and Key Encryption.</para></listitem>
+            </itemizedlist>
+            <programlisting># cloud-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt;</programlisting>
+            <para>When this script is finished, you should see a message like “Successfully initialized the database.”</para>
+        </listitem>
+        <listitem><para>Now that the database is set up, you can finish configuring the OS for the Management Server. This command will set up iptables, sudoers, and start the Management Server.</para>
+            <programlisting># cloud-setup-management</programlisting>
+            <para>You should see the message “Management Server setup is done.”</para>
+        </listitem>
+    </orderedlist>
 </section>


Mime
View raw message