incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [2/9] Feature Documentation for s2svpn interVlan and Autoscale
Date Tue, 11 Sep 2012 08:55:33 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/add-security-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-security-group.xml b/docs/en-US/add-security-group.xml
index e4c8b3c..7d86c9b 100644
--- a/docs/en-US/add-security-group.xml
+++ b/docs/en-US/add-security-group.xml
@@ -5,35 +5,35 @@
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 
 <section id="add-security-group">
-    <title>Adding a Security Group</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>In the left navigation, choose Network</para></listitem>
-        <listitem><para>In Select view, choose Security Groups.</para></listitem>
-        <listitem><para>Click Add Security Group.</para></listitem>
-        <listitem><para>Provide a name and description.</para></listitem>
-        <listitem><para>Click OK.</para>
-        <para>The new security group appears in the Security Groups Details tab.</para></listitem>
-        <listitem><para>To make the security group useful, continue to Adding Ingress and Egress Rules to a Security Group.</para></listitem>
-    </itemizedlist>
+	<title>Adding a Security Group</title>
+	<para>A user or administrator can define a new security group.</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>In Select view, choose Security Groups.</para></listitem>
+		<listitem><para>Click Add Security Group.</para></listitem>
+		<listitem><para>Provide a name and description.</para></listitem>
+		<listitem><para>Click OK.</para>
+		<para>The new security group appears in the Security Groups Details tab.</para></listitem>
+		<listitem><para>To make the security group useful, continue to Adding Ingress and Egress Rules to a Security Group.</para></listitem>
+	</orderedlist>
 </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml
index 85909e3..5186bc5 100644
--- a/docs/en-US/advanced-zone-configuration.xml
+++ b/docs/en-US/advanced-zone-configuration.xml
@@ -1,182 +1,277 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="advanced-zone-configuration">
-    <title>Advanced Zone Configuration</title>
+	<title>Advanced Zone Configuration</title>
     <orderedlist>
-	<listitem><para>After you select Advanced in the Add Zone wizard and click Next, you will be asked to enter the following details. Then click Next.</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Name.</emphasis> A name for the zone.</para></listitem>
-		<listitem><para><emphasis role="bold">DNS 1 and 2.</emphasis> These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.</para></listitem>
-		<listitem><para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis> These are DNS servers for use by system VMs in the zone(these are VMs used by &PRODUCT; itself, such as virtual routers, console proxies,and Secondary Storage VMs.) These DNS servers will be accessed via the management traffic network interface of the System VMs. The private IP address you provide for the pods must have a route to the internal DNS server named here.</para></listitem>
-		<listitem><para><emphasis role="bold">Network Domain.</emphasis> (Optional) If you want to assign a special domain name to the guest VM network, specify the DNS suffix.</para></listitem>
-		<listitem><para><emphasis role="bold">Guest CIDR.</emphasis> This is the CIDR that describes the IP addresses in use in the guest virtual networks in this zone. For example, 10.1.1.0/24. As a matter of good practice you should set different CIDRs for different zones. This will make it easier to set up VPNs between networks in different zones.</para></listitem>
-		<listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Introduced in version 3.0.1) Choose the hypervisor for the first cluster in the zone. You can add clusters with different hypervisors later, after you finish adding the zone.</para></listitem>
-		<listitem><para><emphasis role="bold">Public.</emphasis> A public zone is available to all users. A zone that is not public will be assigned to a particular domain.  Only users in that domain will be allowed to create guest VMs in this zone.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>Choose which traffic types will be carried by the physical network.</para>
-	    <para>The traffic types are management, public, guest, and storage traffic. For more information about the types, roll over the icons to display their tool tips, or see <xref linkend="advanced-zone-network-traffic-types" />. This screen starts out with one network already configured. If you have multiple physical networks, you need to add more. Drag and drop traffic types onto a greyed-out network and it will become active. You can move the traffic icons from one network to another; for example, if the default traffic types shown for Network 1 do not match your actual setup, you can move them down. You can also change the network names if desired.</para>
-	</listitem>
-	<listitem><para>(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on each physical network. These labels must match the labels you have already defined on the hypervisor host. To assign each label, click the Edit button under the traffic type icon within each physical network. A popup dialog appears where you can type the label, then click OK.</para>
-	    <para>These traffic labels will be defined only for the hypervisor selected for the first cluster. For all other hypervisors, the labels can be configured after the zone is created.</para>
-	    <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you must specify the corresponding Ethernet port profile names as network traffic label for each traffic type on the physical network. For more information on Nexus dvSwitch, see Configuring a vSphere Cluster with Nexus 1000v Virtual Switch.</para>
-	</listitem>
-	<listitem><para>Click Next.</para>
-	</listitem>
-	<listitem><para>Configure the IP range for public Internet traffic. Enter the following details, then click Add. If desired, you can repeat this step to add more public Internet IP ranges. When done, click Next.</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Gateway.</emphasis> The gateway in use for these IP addresses.</para></listitem>
-		<listitem><para><emphasis role="bold">Netmask.</emphasis> The netmask associated with this IP range.</para></listitem>
-		<listitem><para><emphasis role="bold">VLAN.</emphasis> The VLAN that will be used for public traffic.</para></listitem>
-		<listitem><para><emphasis role="bold">Start IP/End IP.</emphasis> A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>In a new zone, &PRODUCT; adds the first pod for you. You can always add more pods later. For an overview of what a pod is, see <xref linkend="about-pods" />.</para>
-	    <para>To configure the first pod, enter the following, then click Next:</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Pod Name.</emphasis> A name for the pod.</para></listitem>
-		<listitem><para><emphasis role="bold">Reserved system gateway.</emphasis> The gateway for the hosts in that pod.</para></listitem>
-		<listitem><para><emphasis role="bold">Reserved system netmask.</emphasis> The network prefix that defines the pod's subnet. Use CIDR notation.</para></listitem>
-		<listitem><para><emphasis role="bold">Start/End Reserved System IP.</emphasis> The IP range in the management network that &PRODUCT; uses to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. For more information, see <xref linkend="system-reserved-ip-addresses" />.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>Specify a range of VLAN IDs to carry guest traffic for each physical network (see VLAN Allocation Example ), then click Next.</para>
-	</listitem>
-	<listitem><para>In a new pod, &PRODUCT; adds the first cluster for you. You can always add more clusters later. For an overview of what a cluster is, see <xref linkend="about-clusters" />.</para>
-	    <para>To configure the first cluster, enter the following, then click Next:</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0 only; in 3.0.1, this field is read only) Choose the type of hypervisor software that all hosts in this cluster will run. If you choose VMware, additional fields appear so you can give information about a vSphere cluster. For vSphere servers, we recommend creating the cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add Cluster: vSphere .</para></listitem>
-		<listitem><para><emphasis role="bold">Cluster name.</emphasis> Enter a name for the cluster.  This can be text of your choosing and is not used by &PRODUCT;.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>In a new cluster, &PRODUCT; adds the first host for you. You can always add more hosts later. For an overview of what a host is, see <xref linkend="about-hosts" />.</para>
-	    <note><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running.</para></note>
-	    <para>Before you can configure the host, you need to install the hypervisor software on the host. You will need to know which version of the hypervisor software version is supported by &PRODUCT; and what additional configuration is required to ensure the host will work with &PRODUCT;. To find these installation details, see:</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>
-	    <para>To configure the first host, enter the following, then click Next:</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Host Name.</emphasis> The DNS name or IP address of the host.</para></listitem>
-		<listitem><para><emphasis role="bold">Username.</emphasis> Usually root.</para></listitem>
-		<listitem><para><emphasis role="bold">Password.</emphasis> This is the password for the user named above (from your XenServer or KVM install).</para></listitem>
-		<listitem><para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to categorize hosts for ease of maintenance. For example, you can set to the cloud's HA tag (set in the ha.tag global configuration parameter) if you want this host to be used only for VMs with the "high availability" feature enabled. For more information, see HA-Enabled Virtual Machines as well as HA for Hosts, both in the Administration Guide.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>In a new cluster, &PRODUCT; adds the first primary storage server for you. You can always add more servers later. For an overview of what primary storage is, see <xref linkend="about-primary-storage" />.</para>
-	    <para>To configure the first primary storage server, enter the following, then click Next:</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para></listitem>
-		<listitem><para><emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI, or PreSetup.  For KVM, choose NFS or SharedMountPoint.  For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields in the screen vary depending on what you choose here.</para>
-		    <informaltable frame="all">
-			<tgroup cols="2" align="left" colsep="1" rowsep="1">
-			    <colspec colname="c1" />
-			    <colspec colname="c2" />
-			    <tbody>
-				<row>
-				    <entry><para>NFS</para></entry>
-				    <entry>
-	                                <itemizedlist>
-		                            <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
-		                            <listitem><para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para></listitem>
-					    <listitem>
-						<para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para>
-		                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
-					    </listitem>
-	                                </itemizedlist>
-				    </entry>
-			        </row>
-				<row>
-				    <entry><para>iSCSI</para></entry>
-				    <entry>
-	                                <itemizedlist>
-		                            <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
-		                            <listitem><para><emphasis role="bold">Target IQN.</emphasis> The IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.</para></listitem>
-		                            <listitem><para><emphasis role="bold">Lun.</emphasis> The LUN number. For example, 3.</para></listitem>
-					    <listitem>
-						<para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para>
-					        <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
-					    </listitem>
-	                                </itemizedlist>
-				    </entry>
-			        </row>
-				<row>
-				    <entry><para>preSetup</para></entry>
-				    <entry>
-	                                <itemizedlist>
-		                            <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
-		                            <listitem><para><emphasis role="bold">SR Name-Label.</emphasis> Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem>
-					    <listitem>
-						<para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para>
-		                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
-					    </listitem>
-	                                </itemizedlist>
-				    </entry>
-			        </row>
-				<row>
-				    <entry><para>SharedMountPoint</para></entry>
-				    <entry>
-	                                <itemizedlist>
-					    <listitem><para><emphasis role="bold">Path.</emphasis> The path on each host that is where this primary storage is mounted.  For example, "/mnt/primary".</para></listitem>
-					    <listitem>
-						<para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para>
-		                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
-					    </listitem>
-	                                </itemizedlist>
-				    </entry>
-			        </row>
-				<row>
-				    <entry><para>VMFS</para></entry>
-				    <entry>
-	                                <itemizedlist>
-		                            <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the vCenter server.</para></listitem>
-					    <listitem><para><emphasis role="bold">Path.</emphasis> A combination of the datacenter name and the datastore name.  The format is "/" datacenter name "/" datastore name.  For example, "/cloud.dc.VM/cluster1datastore".</para></listitem>
-					    <listitem>
-						<para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para>
-		                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
-					    </listitem>
-	                                </itemizedlist>
-				    </entry>
-			        </row>
-			    </tbody>
-			</tgroup>
-		    </informaltable>
-		</listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>In a new zone, &PRODUCT; adds the first secondary storage server for you. For an overview of what secondary storage is, see <xref linkend="about-secondary-storage" />.</para>
-	    <para>Before you can fill out this screen, you need to prepare the secondary storage by setting up NFS shares and installing the latest &PRODUCT; System VM template. See Adding Secondary Storage :</para>
-	    <itemizedlist>
-		<listitem><para><emphasis role="bold">NFS Server.</emphasis> The IP address of the server.</para></listitem>
-		<listitem><para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para></listitem>
-	    </itemizedlist>
-	</listitem>
-	<listitem><para>Click Launch.</para>
-	</listitem>
+       
+        <listitem><para>After you select Advanced in the Add Zone wizard and click Next, you will be asked to enter the following details. Then click Next.</para>
+           	
+            <itemizedlist>
+             	
+                <listitem><para><emphasis role="bold">Name.</emphasis> A name for the zone.</para></listitem>
+              
+                <listitem><para><emphasis role="bold">DNS 1 and 2.</emphasis> These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.</para></listitem>
+                             <listitem><para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis> These are DNS servers for use by system VMs in the zone(these are VMs used by &PRODUCT; itself, such as virtual routers, console proxies,and Secondary Storage VMs.) These DNS servers will be accessed via the management traffic network interface of the System VMs. The private IP address you provide for the pods must have a route to the internal DNS server named here.</para></listitem>
+              	
+                <listitem><para><emphasis role="bold">Network Domain.</emphasis> (Optional) If you want to assign a special domain name to the guest VM network, specify the DNS suffix.</para></listitem>
+                             <listitem><para><emphasis role="bold">Guest CIDR.</emphasis> This is the CIDR that describes the IP addresses in use in the guest virtual networks in this zone. For example, 10.1.1.0/24. As a matter of good practice you should set different CIDRs for different zones. This will make it easier to set up VPNs between networks in different zones.</para></listitem>
+              
+                <listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Introduced in version 3.0.1) Choose the hypervisor for the first cluster in the zone. You can add clusters with different hypervisors later, after you finish adding the zone.</para></listitem>
+                              <listitem><para><emphasis role="bold">Public.</emphasis> A public zone is available to all users. A zone that is not public will be assigned to a particular domain.  Only users in that domain will be allowed to create guest VMs in this zone.</para></listitem>
+              
+            </itemizedlist>
+            	
+        </listitem>
+        
+        <listitem><para>Choose which traffic types will be carried by the physical network.</para>
+        	
+            <para>The traffic types are management, public, guest, and storage traffic. For more information about the types, roll over the icons to display their tool tips, or see <xref linkend="advanced-zone-network-traffic-types" />. This screen starts out with one network already configured. If you have multiple physical networks, you need to add more. Drag and drop traffic types onto a greyed-out network and it will become active. You can move the traffic icons from one network to another; for example, if the default traffic types shown for Network 1 do not match your actual setup, you can move them down. You can also change the network names if desired.</para>
+        
+        </listitem>
+        	
+        <listitem><para>(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on each physical network. These labels must match the labels you have already defined on the hypervisor host. To assign each label, click the Edit button under the traffic type icon within each physical network. A popup dialog appears where you can type the label, then click OK.</para>
+        	
+            <para>These traffic labels will be defined only for the hypervisor selected for the first cluster. For all other hypervisors, the labels can be configured after the zone is created.</para>
+        	
+           <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you must specify the corresponding Ethernet port profile names as network traffic label for each traffic type on the physical network. For more information on Nexus dvSwitch, see Configuring a vSphere Cluster with Nexus 1000v Virtual Switch.</para>
+        
+        </listitem>
+        	
+        <listitem><para>Click Next.</para>
+        	
+        </listitem>
+        	
+        <listitem><para>Configure the IP range for public Internet traffic. Enter the following details, then click Add. If desired, you can repeat this step to add more public Internet IP ranges. When done, click Next.</para>
+        	
+            <itemizedlist>
+        	
+                <listitem><para><emphasis role="bold">Gateway.</emphasis> The gateway in use for these IP addresses.</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Netmask.</emphasis> The netmask associated with this IP range.</para></listitem>
+        
+                <listitem><para><emphasis role="bold">VLAN.</emphasis> The VLAN that will be used for public traffic.</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Start IP/End IP.</emphasis> A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
+        	
+            </itemizedlist>
+        	
+        </listitem>
+        	
+        <listitem><para>In a new zone, &PRODUCT; adds the first pod for you. You can always add more pods later. For an overview of what a pod is, see <xref linkend="about-pods" />.</para>
+            	
+            <para>To configure the first pod, enter the following, then click Next:</para>
+            	
+            <itemizedlist>
+            
+                <listitem><para><emphasis role="bold">Pod Name.</emphasis> A name for the pod.</para></listitem>
+            	
+                <listitem><para><emphasis role="bold">Reserved system gateway.</emphasis> The gateway for the hosts in that pod.</para></listitem>
+            	
+                <listitem><para><emphasis role="bold">Reserved system netmask.</emphasis> The network prefix that defines the pod's subnet. Use CIDR notation.</para></listitem>
+            	
+                <listitem><para><emphasis role="bold">Start/End Reserved System IP.</emphasis> The IP range in the management network that &PRODUCT; uses to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. For more information, see <xref linkend="system-reserved-ip-addresses" />.</para></listitem>
+            	
+            </itemizedlist>
+            	
+        </listitem>
+        
+        <listitem><para>Specify a range of VLAN IDs to carry guest traffic for each physical network (see VLAN Allocation Example ), then click Next.</para>
+        	
+        </listitem>
+        	
+        <listitem><para>In a new pod, &PRODUCT; adds the first cluster for you. You can always add more clusters later. For an overview of what a cluster is, see <xref linkend="about-clusters" />.</para>
+        	
+            <para>To configure the first cluster, enter the following, then click Next:</para>
+        	
+            <itemizedlist>
+        	
+                <listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0 only; in 3.0.1, this field is read only) Choose the type of hypervisor software that all hosts in this cluster will run. If you choose VMware, additional fields appear so you can give information about a vSphere cluster. For vSphere servers, we recommend creating the cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add Cluster: vSphere .</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Cluster name.</emphasis> Enter a name for the cluster.  This can be text of your choosing and is not used by &PRODUCT;.</para></listitem>
+        	
+            </itemizedlist>
+        	
+        </listitem>
+        	
+        <listitem><para>In a new cluster, &PRODUCT; adds the first host for you. You can always add more hosts later. For an overview of what a host is, see <xref linkend="about-hosts" />.</para>
+        	
+            <note><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running.</para></note>
+        
+            <para>Before you can configure the host, you need to install the hypervisor software on the host. You will need to know which version of the hypervisor software version is supported by &PRODUCT; and what additional configuration is required to ensure the host will work with &PRODUCT;. To find these installation details, see:</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>
+        
+            <para>To configure the first host, enter the following, then click Next:</para>
+        	
+            <itemizedlist>
+        	
+                <listitem><para><emphasis role="bold">Host Name.</emphasis> The DNS name or IP address of the host.</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Username.</emphasis> Usually root.</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Password.</emphasis> This is the password for the user named above (from your XenServer or KVM install).</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to categorize hosts for ease of maintenance. For example, you can set to the cloud's HA tag (set in the ha.tag global configuration parameter) if you want this host to be used only for VMs with the "high availability" feature enabled. For more information, see HA-Enabled Virtual Machines as well as HA for Hosts, both in the Administration Guide.</para></listitem>
+        	
+            </itemizedlist>
+        
+        </listitem>
+        	
+        <listitem><para>In a new cluster, &PRODUCT; adds the first primary storage server for you. You can always add more servers later. For an overview of what primary storage is, see <xref linkend="about-primary-storage" />.</para>
+        	
+            <para>To configure the first primary storage server, enter the following, then click Next:</para>
+                    <itemizedlist>
+        	
+                <listitem><para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para></listitem>
+        	
+                <listitem><para><emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI, or PreSetup.  For KVM, choose NFS or SharedMountPoint.  For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields in the screen vary depending on what you choose here.</para>
+        	
+                    <informaltable frame="all">
+        	
+                        <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        	
+                            <colspec colname="c1" />
+        	
+                            <colspec colname="c2" />
+        	
+                            <tbody>
+        
+                                <row>
+        	
+                                    <entry><para>NFS</para></entry>
+                                           <entry>
+        
+                                       <itemizedlist>
+                                                    <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
+                                                   <listitem><para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para></listitem>
+                                                   <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para></listitem>
+        	
+                                        </itemizedlist>
+                                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
+        
+                                    </entry>
+                                        </row>
+                                       <row>
+                                            <entry><para>iSCSI</para></entry>
+                                            <entry>
+        
+                                        <itemizedlist>
+                                                  <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">Target IQN.</emphasis> The IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">Lun.</emphasis> The LUN number. For example, 3.</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para></listitem>
+                                                </itemizedlist>
+                                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
+                                            </entry>
+                                      </row>
+                                        <row>
+        
+                                    <entry><para>preSetup</para></entry>
+        	
+                                    <entry>
+                                                <itemizedlist>
+                                                   <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the storage device.</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">SR Name-Label.</emphasis> Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para></listitem>
+                                               </itemizedlist>
+        
+                                        <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
+                                            </entry>
+        
+                                </row>
+                                        <row>
+                                            <entry><para>SharedMountPoint</para></entry>
+        
+                                    <entry>
+        	
+                                        <itemizedlist>
+                                                    <listitem><para><emphasis role="bold">Path.</emphasis> The path on each host that is where this primary storage is mounted.  For example, "/mnt/primary".</para></listitem>
+                                                    <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para></listitem>
+        	
+                                        </itemizedlist>
+        	
+                                        <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
+        
+                                    </entry>
+        
+                                </row>
+        
+                                <row>
+        	
+                                    <entry><para>VMFS</para></entry>
+                                            <entry>
+        
+                                        <itemizedlist>
+                                                    <listitem><para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of the vCenter server.</para></listitem>
+                                                    <listitem><para><emphasis role="bold">Path.</emphasis> A combination of the datacenter name and the datastore name.  The format is "/" datacenter name "/" datastore name.  For example, "/cloud.dc.VM/cluster1datastore".</para></listitem>
+        
+                                            <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings.</para></listitem>
+        
+                                        </itemizedlist>
+                                                <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para>
+                                            </entry>
+                                       </row>
+                                    </tbody>
+                                </tgroup>
+                           </informaltable>
+                        </listitem>
+               
+            </itemizedlist>
+           
+        </listitem>
+       
+        <listitem><para>In a new zone, &PRODUCT; adds the first secondary storage server for you. For an overview of what secondary storage is, see <xref linkend="about-secondary-storage" />.</para>
+           
+            <para>Before you can fill out this screen, you need to prepare the secondary storage by setting up NFS shares and installing the latest &PRODUCT; System VM template. See Adding Secondary Storage :</para>
+           	
+            <itemizedlist>
+               
+                <listitem><para><emphasis role="bold">NFS Server.</emphasis> The IP address of the server.</para></listitem>
+               
+                <listitem><para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para></listitem>
+               
+            </itemizedlist>
+           
+        </listitem>
+     	
+        <listitem><para>Click Launch.</para>
+           
+        </listitem>
+    
     </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/advanced-zone-guest-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-guest-ip-addresses.xml b/docs/en-US/advanced-zone-guest-ip-addresses.xml
index b5d10a0..fbc6144 100644
--- a/docs/en-US/advanced-zone-guest-ip-addresses.xml
+++ b/docs/en-US/advanced-zone-guest-ip-addresses.xml
@@ -1,27 +1,26 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="advanced-zone-guest-ip-addresses">
     <title>Advanced Zone Guest IP Addresses</title>
     <para>When advanced networking is used, the administrator can create additional networks for use by the guests.  These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks.  The networks are defined by a VLAN ID, IP range, and gateway.  The administrator may provision thousands of these networks if desired.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/advanced-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-network-traffic-types.xml b/docs/en-US/advanced-zone-network-traffic-types.xml
index 9f475cf..d803592 100644
--- a/docs/en-US/advanced-zone-network-traffic-types.xml
+++ b/docs/en-US/advanced-zone-network-traffic-types.xml
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="advanced-zone-network-traffic-types">
-    <title>Advanced Zone Network Traffic Types</title>
+	<title>Advanced Zone Network Traffic Types</title>
     <para>When advanced networking is used, there can be multiple physical networks in the zone. Each physical network can carry one or more traffic types, and  you need to let &PRODUCT; know which type of network traffic you want each network to carry. The traffic types in an advanced zone are:</para>
     <itemizedlist>
         <listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. This network can be isolated or shared. In an isolated guest network, the administrator needs to reserve VLAN ranges to provide isolation for each &PRODUCT; account’s network (potentially a large number of VLANs). In a shared guest network, all guest VMs share a single network.</para></listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-physical-network-configuration.xml b/docs/en-US/advanced-zone-physical-network-configuration.xml
index 4c44c7d..0d917da 100644
--- a/docs/en-US/advanced-zone-physical-network-configuration.xml
+++ b/docs/en-US/advanced-zone-physical-network-configuration.xml
@@ -5,24 +5,25 @@
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="advanced-zone-physical-network-configuration">
-    <title>Advanced Zone Physical Network Configuration</title>
-    <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para>
-    </section>
+	<title>Advanced Zone Physical Network Configuration</title>
+	<para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para>
+    <xi:include href="configure-guest-traffic-in-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="configure-public-traffic-in-an-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/advanced-zone-public-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-public-ip-addresses.xml b/docs/en-US/advanced-zone-public-ip-addresses.xml
index eeb9404..82b71d1 100644
--- a/docs/en-US/advanced-zone-public-ip-addresses.xml
+++ b/docs/en-US/advanced-zone-public-ip-addresses.xml
@@ -1,27 +1,26 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="advanced-zone-public-ip-addresses">
     <title>Advanced Zone Public IP Addresses</title>
     <para>When advanced networking is used, the administrator can create additional networks for use by the guests.  These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks.  The networks are defined by a VLAN ID, IP range, and gateway.  The administrator may provision thousands of these networks if desired.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/alerts.xml b/docs/en-US/alerts.xml
index f903023..9f926cf 100644
--- a/docs/en-US/alerts.xml
+++ b/docs/en-US/alerts.xml
@@ -1,49 +1,55 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 
-    <section id="alerts">
-        <title>Alerts</title>
-        <para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
-        <programlisting>MEMORY = 0</programlisting>
-        <programlisting>CPU = 1</programlisting>
-        <programlisting>STORAGE =2</programlisting>
-        <programlisting>STORAGE_ALLOCATED = 3</programlisting>
-        <programlisting>PUBLIC_IP = 4</programlisting>
-        <programlisting>PRIVATE_IP = 5</programlisting>
-        <programlisting>HOST = 6</programlisting>
-        <programlisting>USERVM = 7</programlisting>
-        <programlisting>DOMAIN_ROUTER = 8</programlisting>
-        <programlisting>CONSOLE_PROXY = 9</programlisting>
-        <programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
-        <programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
-        <programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
-        <programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
-        <programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
-        <programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
-        <programlisting>USERVM_MIGRATE = 16</programlisting>
-        <programlisting>VLAN = 17</programlisting>
-        <programlisting>SSVM = 18</programlisting>
-        <programlisting>USAGE_SERVER_RESULT = 19</programlisting>
-        <programlisting>STORAGE_DELETE = 20;</programlisting>
-        <programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
-        <programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
-        <programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
-        <programlisting>LOCAL_STORAGE = 24;</programlisting>
-        <programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
-    </section>
+<appendix id="alerts">
+		<title>Alerts</title>
+		<para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
+		<programlisting>MEMORY = 0</programlisting>
+		<programlisting>CPU = 1</programlisting>
+		<programlisting>STORAGE =2</programlisting>
+		<programlisting>STORAGE_ALLOCATED = 3</programlisting>
+		<programlisting>PUBLIC_IP = 4</programlisting>
+		<programlisting>PRIVATE_IP = 5</programlisting>
+		<programlisting>HOST = 6</programlisting>
+		<programlisting>USERVM = 7</programlisting>
+		<programlisting>DOMAIN_ROUTER = 8</programlisting>
+		<programlisting>CONSOLE_PROXY = 9</programlisting>
+		<programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
+		<programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
+		<programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
+		<programlisting>USERVM_MIGRATE = 16</programlisting>
+		<programlisting>VLAN = 17</programlisting>
+		<programlisting>SSVM = 18</programlisting>
+		<programlisting>USAGE_SERVER_RESULT = 19</programlisting>
+		<programlisting>STORAGE_DELETE = 20;</programlisting>
+		<programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
+		<programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
+		<programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
+		<programlisting>LOCAL_STORAGE = 24;</programlisting>
+		<programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
+	</appendix>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/attach-iso-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attach-iso-to-vm.xml b/docs/en-US/attach-iso-to-vm.xml
index 30e5d51..8e0d424 100644
--- a/docs/en-US/attach-iso-to-vm.xml
+++ b/docs/en-US/attach-iso-to-vm.xml
@@ -5,35 +5,36 @@
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
 -->
-
 <section id="attach-iso-to-vm">
-    <title>Attaching an ISO to a VM</title>
-    <orderedlist>
-        <listitem><para>In the left navigation, click Instances.</para></listitem>
-        <listitem><para>Choose the virtual machine you want to work with.</para></listitem>
-        <listitem><para>Click the Attach ISO button <inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="./images/iso-icon.png" />
-            </imageobject>
-            <textobject><phrase>iso.png: Depicts adding an iso image</phrase></textobject>
-        </inlinemediaobject></para></listitem>
-        <listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
-        <listitem><para>Click OK</para></listitem>
-    </orderedlist>
+	<title>Attaching an ISO to a VM</title>
+	<orderedlist>
+		<listitem><para>In the left navigation, click Instances.</para></listitem>
+		<listitem><para>Choose the virtual machine you want to work with.</para></listitem>
+		<listitem><para>Click the Attach ISO button. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/iso-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>iso.png: depicts adding an iso image</phrase>
+					</textobject>
+				</inlinemediaobject></para></listitem>
+		<listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
+		<listitem><para>Click OK.</para></listitem>
+	</orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/automatic-snapshot-creation-retention.xml b/docs/en-US/automatic-snapshot-creation-retention.xml
index ee4cf73..a1f62df 100644
--- a/docs/en-US/automatic-snapshot-creation-retention.xml
+++ b/docs/en-US/automatic-snapshot-creation-retention.xml
@@ -5,26 +5,33 @@
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
 -->
 
 <section id="automatic-snapshot-creation-retention">
-    <title>Automatic Snapshot Creation and Retention</title>
-    <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>, <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold">KVM</emphasis>)</para>
-    <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
-    <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be retained. Older snapshots that exceed the retention limit are automatically deleted. This user-defined limit must be equal to or lower than the global limit set by the &PRODUCT; administrator. See  <xref linkend="globally-configured-limits"/>. The limit applies only to those snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual snapshots can be created and retained.</para>
-    </section>
+	<title>Automatic Snapshot Creation and Retention</title>
+	<para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>,
+			<emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold"
+			>KVM</emphasis>)</para>
+	<para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
+	<para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be
+		retained. Older snapshots that exceed the retention limit are automatically deleted. This
+		user-defined limit must be equal to or lower than the global limit set by the &PRODUCT;
+		administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to
+		those snapshots that are taken as part of an automatic recurring snapshot policy. Additional
+		manual snapshots can be created and retained.</para>
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/basic-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml
index 18afa84..2b37f80 100644
--- a/docs/en-US/basic-zone-configuration.xml
+++ b/docs/en-US/basic-zone-configuration.xml
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="basic-zone-configuration">
-    <title>Basic Zone Configuration</title>
+	<title>Basic Zone Configuration</title>
     <orderedlist>
         <listitem><para>After you select Basic in the Add Zone wizard and click Next, you will be asked to enter the following details. Then click Next.</para>
             <itemizedlist>
@@ -66,7 +65,7 @@
         <listitem><para>Choose which traffic types will be carried by the physical network.</para>
             <para>The traffic types are management, public, guest, and storage traffic. For more information about the types, roll over the icons to display their tool tips, or see Basic Zone Network Traffic Types. This screen starts out with some traffic types already assigned. To add more, drag and drop traffic types onto the network. You can also change the network name if desired.</para>
         </listitem>
-        <listitem><para>(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on the physical network. These labels must match the labels you have already defined on the hypervisor host. To assign each label, click the Edit button under the traffic type icon. A popup dialog appears where you can type the label, then click OK.</para>
+        <listitem><para>3.	(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on the physical network. These labels must match the labels you have already defined on the hypervisor host. To assign each label, click the Edit button under the traffic type icon. A popup dialog appears where you can type the label, then click OK.</para>
             <para>These traffic labels will be defined only for the hypervisor selected for the first cluster. For all other hypervisors, the labels can be configured after the zone is created.</para>
             <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you must specify the corresponding Ethernet port profile names as network traffic label for each traffic type on the physical network. For more information on Nexus dvSwitch, see Configuring a vSphere Cluster with Nexus 1000v Virtual Switch.</para>
         </listitem>
@@ -136,7 +135,7 @@
                 <listitem><para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to categorize hosts for ease of maintenance. For example, you can set this to the cloud's HA tag (set in the ha.tag global configuration parameter) if you want this host to be used only for VMs with the "high availability" feature enabled. For more information, see HA-Enabled Virtual Machines as well as HA for Hosts.</para></listitem>
             </itemizedlist>
         </listitem>
-        <listitem><para>In a new cluster, CloudPlatform adds the first primary storage server for you. You can always add more servers later. For an overview of what primary storage is, see About Primary Storage.</para>
+        <listitem><para>In a new cluster, &PRODUCT; adds the first primary storage server for you. You can always add more servers later. For an overview of what primary storage is, see About Primary Storage.</para>
             <para>To configure the first primary storage server, enter the following, then click Next:</para>
             <itemizedlist>
                 <listitem><para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para></listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/basic-zone-guest-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-guest-ip-addresses.xml b/docs/en-US/basic-zone-guest-ip-addresses.xml
index d1d9135..5143f71 100644
--- a/docs/en-US/basic-zone-guest-ip-addresses.xml
+++ b/docs/en-US/basic-zone-guest-ip-addresses.xml
@@ -1,28 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="basic-zone-guest-ip-addresses">
     <title>Basic Zone Guest IP Addresses</title>
-    <para>When basic networking is used, CloudPlatform will assign IP addresses in the CIDR of the pod to the guests in that pod.  The administrator must add a Direct IP range on the pod for this purpose.  These IPs are in the same VLAN as the hosts.</para>
+    <para>When basic networking is used, &PRODUCT; will assign IP addresses in the CIDR of the pod to the guests in that pod.  The administrator must add a Direct IP range on the pod for this purpose.  These IPs are in the same VLAN as the hosts.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/basic-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-network-traffic-types.xml b/docs/en-US/basic-zone-network-traffic-types.xml
index fa3be0f..70789d0 100644
--- a/docs/en-US/basic-zone-network-traffic-types.xml
+++ b/docs/en-US/basic-zone-network-traffic-types.xml
@@ -1,29 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="basic-zone-network-traffic-types">
-    <title>Basic Zone Network Traffic Types</title>
+	<title>Basic Zone Network Traffic Types</title>
     <para>When basic networking is used, there can be only one physical network in the zone. That physical network carries the following traffic types:</para>
     <itemizedlist>
         <listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod.</para></listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/basic-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-physical-network-configuration.xml b/docs/en-US/basic-zone-physical-network-configuration.xml
index 83833a7..302c293 100644
--- a/docs/en-US/basic-zone-physical-network-configuration.xml
+++ b/docs/en-US/basic-zone-physical-network-configuration.xml
@@ -5,25 +5,23 @@
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="basic-zone-physical-network-configuration">
-    <title>Basic Zone Physical Network Configuration</title>
-    <para>In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to CloudPlatform, you set up the guest network through the Add Zone screens.</para>
-                    
-    </section>
+	<title>Basic Zone Physical Network Configuration</title>
+	<para>In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to &PRODUCT;, you set up the guest network through the Add Zone screens.</para>				
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/best-practices-for-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-for-vms.xml b/docs/en-US/best-practices-for-vms.xml
index a67add4..0ccb183 100644
--- a/docs/en-US/best-practices-for-vms.xml
+++ b/docs/en-US/best-practices-for-vms.xml
@@ -1,23 +1,40 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+        
+        http://www.apache.org/licenses/LICENSE-2.0
+        
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
 -->
 
-<section id="vm-lifecycle">
-    <title>VM Lifecycle</title>
-    <para>The CloudPlatform administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudPlatform global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches t
 his number of VMs, use the CloudPlatform UI to disable allocation of more VMs to the cluster..</para>
-        
+<section id="best-practices-vm">
+	<title>Best Practices for Virtual Machines</title>
+	<para>The &PRODUCT; administrator should monitor the total number of VM instances in each
+        cluster, and disable allocation to the cluster if the total is approaching the maximum that
+        the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of
+        one or more hosts failing, which would increase the VM load on the other hosts as the VMs
+        are automatically redeployed. Consult the documentation for your chosen hypervisor to find
+        the maximum permitted number of VMs per host, then use &PRODUCT; global configuration
+        settings to set this as the default limit. Monitor the VM activity in each cluster at all
+        times. Keep the total number of VMs below a safe level that allows for the occasional host
+        failure. For example, if there are N hosts in the cluster, and you want to allow for one
+        host in the cluster to be down at any given time, the total number of VM instances you can
+        permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this
+        number of VMs, use the &PRODUCT; UI to disable allocation of more VMs to the
+        cluster.</para>
 </section>


Mime
View raw message