cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [9/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/using-multiple-guest-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-multiple-guest-networks.xml b/docs/en-US/using-multiple-guest-networks.xml
index ce71caa..7a8ea48 100644
--- a/docs/en-US/using-multiple-guest-networks.xml
+++ b/docs/en-US/using-multiple-guest-networks.xml
@@ -5,27 +5,28 @@
 ]>
 
 <!-- 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="using-multiple-guest-networks">
-    <title>Using Multiple Guest Networks</title>
-    <para>In zones that use advanced networking, additional networks for guest traffic may be added at any time after the initial installation. You can also customize the domain name associated with the network by specifying a DNS suffix for each network.</para>
-    <para>A VM's networks are defined at VM creation time.  A VM cannot add or remove networks after it has been created, although the user can go into the guest and remove the IP address from the NIC on a particular network.</para>
-    <para>Each VM has just one default network.  The virtual router's DHCP reply will set the guest's default gateway as that for the default network.  Multiple non-default networks may be added to a guest in addition to the single, required default network. The administrator can control which networks are available as the default network.</para>
-    <para>Additional networks can either be available to all accounts or be assigned to a specific account. Networks that are available to all accounts are zone-wide. Any user with access to the zone can create a VM with access to that network.  These zone-wide networks provide little or no isolation between guests.Networks that are assigned to a specific account provide strong isolation.</para>
+	<title>Using Multiple Guest Networks</title>
+	<para>In zones that use advanced networking, additional networks for guest traffic may be added at any time after the initial installation. You can also customize the domain name associated with the network by specifying a DNS suffix for each network.</para>
+	<para>A VM's networks are defined at VM creation time.  A VM cannot add or remove networks after it has been created, although the user can go into the guest and remove the IP address from the NIC on a particular network.</para>
+	<para>Each VM has just one default network.  The virtual router's DHCP reply will set the guest's default gateway as that for the default network.  Multiple non-default networks may be added to a guest in addition to the single, required default network. The administrator can control which networks are available as the default network.</para>
+	<para>Additional networks can either be available to all accounts or be assigned to a specific account.  Networks that are available to all accounts are zone-wide.  Any user with access to the zone can create a VM with access to that network.  These zone-wide networks provide little or no isolation between guests. Networks that are assigned to a specific account provide strong isolation.</para>
+    <xi:include href="add-additional-guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="change-network-offering-on-guest-network.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/using-sshkeys.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-sshkeys.xml b/docs/en-US/using-sshkeys.xml
index b51569d..43b5e88 100644
--- a/docs/en-US/using-sshkeys.xml
+++ b/docs/en-US/using-sshkeys.xml
@@ -5,34 +5,40 @@
 ]>
 
 <!-- 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="using-sshkeys">
-    <subtitle>Using the SSH Keys for Authentication on Cloud</subtitle>
-        <para>In addition to the username and password authentication, CloudStack supports using SSH keys to log in to the cloud infrastructure for additional security for your cloud infrastructure. You can use the createSSHKeyPair API to generate the SSH keys.</para>
-        <para>Because each cloud user has their own ssh key, one cloud user cannot log in to another cloud user's instances unless they share their ssh key files.  Using a single SSH key pair, you can manage multiple instances.</para>
-    <subtitle> Creating an Instance Template that Supports SSH Keys</subtitle>
-            <orderedlist>
-                <listitem><para>Create a instance template that supports SSH Keys.</para>
-                <orderedlist numeration="loweralpha"><listitem><para>Create a new instance by using the template provided by cloudstack.</para>
-                 <para>For more information on creating a new instance, see </para></listitem>
-                <listitem><para>Download the cloudstack script from  <ulink url="http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/">The SSH Key Gen Script</ulink>to the instance you have created.</para>
-                <programlisting>wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcloudstack%2Ffiles%2FSSH%2520Key%2520Gen%2520Script%2F&amp;ts=1331225219&amp;use_mirror=iweb</programlisting></listitem>
+      <title>Using SSH Keys for Authentication</title>
+    <para>In addition to the username and password authentication, &PRODUCT; supports using SSH
+        keys to log in to the cloud infrastructure for additional security for your cloud
+        infrastructure. You can use the createSSHKeyPair API to generate the SSH keys.</para>
+    <para>Because each cloud user has their own ssh key, one cloud user cannot log in to another
+        cloud user's instances unless they share their ssh key files.  Using a single SSH key pair,
+        you can manage multiple instances.</para> 
+  <section>
+      <title>Creating an Instance from Template that Supports SSH Keys</title>
+      <para>Perform the following:</para>
+              <orderedlist>
+              <listitem><para>Create a new instance by using the template provided by &PRODUCT;.</para>
+                  <para>For more information on creating a new instance, see <xref linkend="creating-vms"/>.</para></listitem>
+                <listitem><para>Download the &PRODUCT; script from <ulink
+                    url="http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/"
+                    >The SSH Key Gen Script</ulink> to the instance you have created.</para>
+                <programlisting>wget http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in/download </programlisting></listitem>
                 <listitem><para>Copy the file to /etc/init.d.</para>
                 <programlisting>cp cloud-set-guest-sshkey.in /etc/init.d/</programlisting></listitem>
                 <listitem><para>Give the necessary permissions on the script:</para>
@@ -40,15 +46,18 @@
                 <listitem><para>Run the script while starting up the operating system:</para>
                 <programlisting>chkconfig --add cloud-set-guest-sshkey.in</programlisting></listitem>                    
                 <listitem><para>Stop the instance.</para></listitem>
-                </orderedlist></listitem>
-             </orderedlist>        
-        <subtitle>Creating the SSH Keypair</subtitle>
-            <para>You must make a call to the createSSHKeyPair api method. You can either use the cloudstack python api library or the curl commands to make the call to the cloudstack api.</para>
-            <para>For example, make a call from the cloudstack server to create a SSH keypair called "keypair-doc" for the admin account in the root domain:</para>
-            <note><para>Ensure that you adjust these values to meet your needs. If you are making the API call from a different server, your URL/PORT will be different, and you will need to use the API keys.</para></note>
+              </orderedlist>
+  </section>
+           <section id="create-ssh-keypair">
+               <title>Creating the SSH Keypair</title>
+            <para>You must make a call to the createSSHKeyPair api method. You can either use the &PRODUCT; python api library or the curl commands to make the call to the &PRODUCT; api.</para>
+            <para>For example, make a call from the &PRODUCT; server to create a SSH keypair called "keypair-doc" for the admin account in the root domain:</para>
+            <note><para>Ensure that you adjust these values to meet your needs. If you are making the API call from a
+            different server, your URL or port number will be different, and you will need to use
+            the API keys.</para></note>
             <orderedlist>
                 <listitem><para>Run the following curl command:</para>
-                <programlisting>curl --globoff "http://localhost:8096/?command=createSSHKeyPair&amp;name=keypair-doc&amp;account=admin&amp;domainid=5163440e-c44b-42b5-9109-ad75cae8e8a2"</programlisting>
+                <programlisting>curl --globoff "http://localhost:8096/?command=createSSHKeyPair&amp;name=keypair-doc&amp;account=admin&amp;domainid=1"</programlisting>
                 <para>The output is something similar to what is given below:</para>
                 <programlisting>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;&lt;createsshkeypairresponse cloud-stack-version="3.0.0.20120228045507"&gt;&lt;keypair&gt;&lt;name&gt;keypair-doc&lt;/name&gt;&lt;fingerprint&gt;f6:77:39:d5:5e:77:02:22:6a:d8:7f:ce:ab:cd:b3:56&lt;/fingerprint&gt;&lt;privatekey&gt;-----BEGIN RSA PRIVATE KEY-----
 MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
@@ -78,15 +87,21 @@ KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
 -----END RSA PRIVATE KEY-----</programlisting></listitem>
                 <listitem><para>Save the file.</para></listitem>
             </orderedlist>
-        <subtitle>Creating an Instance</subtitle>
-        <para>After you save the SSH keypair file, you must create an instance by using the template that you created at <xref linkend="create-template"/>. Ensure that you use the same SSH key name that you created at <xref linkend="gen-ssh-keypair"/>.</para>
+           </section>
+    <section id="creating-instance-ssh">
+       <title>Creating an Instance</title>
+            <para>Ensure that you use the same SSH key name that you created.</para>
         <note><para>You cannot create the instance by using the GUI at this time and associate the instance with the newly created SSH keypair.</para></note>
         <para>A sample curl command to create a new instance is:</para>
-        <programlisting>curl --globoff http://localhost:&lt;port numbet&gt;/?command=deployVirtualMachine\&amp;zoneId=1\&amp;serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&amp;templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&amp;securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&amp;account=admin\&amp;domainid=1\&amp;keypair=keypair-doc</programlisting>
+        <programlisting>curl --globoff http://localhost:&lt;port number&gt;/?command=deployVirtualMachine&amp;zoneId=1&amp;serviceOfferingId=18727021-7556-4110-9322-d625b52e0813&amp;templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5&amp;securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5&amp;account=admin\&amp;domainid=1&amp;keypair=keypair-doc</programlisting>
         <para>Substitute the template, service offering and security group IDs (if you are using the security group feature) that are in your cloud environment.</para>
-        <subtitle>Logging In Using the SSH Keypair</subtitle>
+    </section>
+<section id="log-in-ssh">
+    <title>Logging In Using the SSH Keypair</title>
             <para>To test your SSH key generation is successful, check whether you can log in to the cloud setup.</para>
-            <para>For exaple, from a Linux OS, run:</para>
+         <para>For example, from a Linux OS, run:</para>
             <programlisting>ssh -i ~/.ssh/keypair-doc &lt;ip address&gt;</programlisting>
-        <para>The -i parameter tells the ssh client to use a ssh key found at ~/.ssh/keypair-doc.</para>
-</section>
+        <para>The -i parameter directs the ssh client to use a ssh key found at ~/.ssh/keypair-doc.</para>
+    </section>
+</section>  
+      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/vcenter-maintenance-mode.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vcenter-maintenance-mode.xml b/docs/en-US/vcenter-maintenance-mode.xml
index a07300e..2ed7162 100644
--- a/docs/en-US/vcenter-maintenance-mode.xml
+++ b/docs/en-US/vcenter-maintenance-mode.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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="vcenter-maintenance-mode">
     <title>vCenter and Maintenance Mode</title>
     <para>To enter maintenance mode on a vCenter host, both vCenter and &PRODUCT; must be used in concert. &PRODUCT; and vCenter have separate maintenance modes that work closely together.</para>
@@ -34,8 +33,9 @@
         <orderedlist numeration="loweralpha">
             <listitem><para>First use vCenter to exit the vCenter maintenance mode.</para>
             <para>This makes the host ready for &PRODUCT; to reactivate it.</para></listitem>
-            <listitem><para>Then use &PRODUCT;'s administrator UI to cancel the &PRODUCT; maintenance mode</para>
+            <listitem><para>Then use &PRODUCT;'s administrator UI to cancel the &PRODUCT; maintenance mode.</para>
            <para>When the host comes back online, the VMs that were migrated off of it are migrated back to it and new VMs can be added.</para></listitem>
-          </orderedlist></listitem>
+          </orderedlist></listitem>        
        </orderedlist>
+    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/virtual-router.xml b/docs/en-US/virtual-router.xml
index 775d474..c9b403b 100644
--- a/docs/en-US/virtual-router.xml
+++ b/docs/en-US/virtual-router.xml
@@ -5,25 +5,28 @@
 ]>
 
 <!-- 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="virtual-router">
     <title>Virtual Router</title>
     <para>The virtual router is a type of System Virtual Machine. The virtual router is one of the most frequently used service providers in &PRODUCT;. The end user has no direct access to the virtual router. Users can ping the virtual router and take actions that affect it (such as setting up port forwarding), but users do not have SSH access into the virtual router.</para>
-    <para>There is no mechanism for the administrator to log in to the virtual router. Virtual routers can be restarted by administrators, but this will interrupt public network access and other services for end users. A basic test in debugging networking issues is to attempt to ping the virtual router from a guest VM. Some of the characteristics of the virtual router are determined by its associated system service offering.</para>
+    <para>There is no mechanism for the administrator to log in to the virtual router. Virtual routers can be restarted by administrators, but this will interrupt public network access and other services for end users. A basic test in debugging networking issues is to attempt to ping the virtual router from a guest VM. Some of the characteristics of the virtual router are determined by its associated system service offering..</para>
+    <xi:include href="configure-virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="upgrade-virtual-router-with-service-offering.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="best-practices-virtual-router.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/vm-lifecycle.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vm-lifecycle.xml b/docs/en-US/vm-lifecycle.xml
index f5696ce..da526a5 100644
--- a/docs/en-US/vm-lifecycle.xml
+++ b/docs/en-US/vm-lifecycle.xml
@@ -5,38 +5,39 @@
 ]>
 
 <!-- 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>Virtual machines can be in the following states:</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/basic-deployment.png" />
-        </imageobject>
-        <textobject><phrase>basic-deployment.png: Basic two-machine CloudStack deployment</phrase></textobject>
-    </mediaobject>
-    <para>Once a virtual machine is destroyed, it cannot be recovered. All the resources used by the virtual machine will be reclaimed by the system. This includes the virtual machine’s IP address.</para>
-    <para>A stop will attempt to gracefully shut down the operating system, which typically involves terminating all the running applications. If the operation system cannot be stopped, it will be forcefully terminated. This has the same effect as pulling the power cord to a physical machine.</para>
-    <para>A reboot is a stop followed by a start.</para>
-    <para>CloudPlatform preserves the state of the virtual machine hard disk until the machine is destroyed.</para>
-    <para>A running virtual machine may fail because of hardware or network issues. A failed virtual machine is in the down state.</para>
-    <para>The system places the virtual machine into the down state if it does not receive the heartbeat from the hypervisor for three minutes.</para>
-    <para>The user can manually restart the virtual machine from the down state.</para>
-    <para>The system will start the virtual machine from the down state automatically if the virtual machine is marked as HA-enabled.</para>
+	<title>VM Lifecycle</title>
+	<para>Virtual machines can be in the following states:</para>
+	<mediaobject>
+		<imageobject>
+			<imagedata fileref="./images/vm-lifecycle.png" />
+		</imageobject>
+		<textobject><phrase>basic_deployment.png: Basic two-machine CloudStack deployment</phrase></textobject>
+	</mediaobject>
+	<para>Once a virtual machine is destroyed, it cannot be recovered. All the resources used by the virtual machine will be reclaimed by the system. This includes the virtual machine’s IP address.</para>
+	<para>A stop will attempt to gracefully shut down the operating system, which typically involves terminating all the running applications. If the operation system cannot be stopped, it will be forcefully terminated. This has the same effect as pulling the power cord to a physical machine.</para>
+	<para>A reboot is a stop followed by a start.</para>
+	<para>&PRODUCT; preserves the state of the virtual machine hard disk until the machine is destroyed.</para>
+	<para>A running virtual machine may fail because of hardware or network issues. A failed virtual machine is in the down state.</para>
+	<para>The system places the virtual machine into the down state if it does not receive the heartbeat from the hypervisor for three minutes.</para>
+	<para>The user can manually restart the virtual machine from the down state.</para>
+	<para>The system will start the virtual machine from the down state automatically if the virtual machine is marked as HA-enabled.</para>
 </section>
+

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vpc.xml b/docs/en-US/vpc.xml
index 3899100..53953ad 100644
--- a/docs/en-US/vpc.xml
+++ b/docs/en-US/vpc.xml
@@ -5,38 +5,132 @@
 ]>
 
 <!-- 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="vpc">
-    <title>Virtual Private Cloud</title>
-    <para></para>
-    <para>To add a Virtual Private Cloud (VPC):</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 the Select view, select VPC.</para></listitem>
-        <listitem><para>Click Add VPC. Provide the following information:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Name</emphasis>: A short name for the VPC that you are creating.</para></listitem>
-                <listitem><para><emphasis role="bold">Description</emphasis>: A brief description of the VPC.</para></listitem>
-                <listitem><para><emphasis role="bold">Zone</emphasis>: Choose the zone where you want the VPC to be available.</para></listitem>
-                <listitem><para><emphasis role="bold">CIDR</emphasis>: To accept the traffic only from the IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
-                <listitem><para><emphasis role="bold">Network Domain</emphasis>: If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
-            </itemizedlist></listitem>
-    </orderedlist>
-</section>
+    <title>About Virtual Private Clouds</title>
+    <para>&PRODUCT; Virtual Private Cloud is a private, isolated part of &PRODUCT;. A VPC
+        can have its own virtual network topology that resembles a traditional physical network. You
+        can launch VMs in the virtual network that can have private addresses in the range of your
+        choice, for example: 10.0.0.0/16. You can define network tiers within your VPC network
+        range, which in turn enables you to group similar kinds of instances based on IP address
+        range.</para>
+    <para>For example, if a VPC has the private range 10.0.0.0/16, its guest networks can have the network ranges 10.0.1.0/24, 10.0.2.0/24, 10.0.3.0/24, and so on.</para>
+    <formalpara>
+        <title>Major Components of a VPC:</title>
+        <para>A VPC is comprised of the following network components:</para>
+     </formalpara>
+      <itemizedlist>
+          <listitem><para><emphasis role="bold">VPC</emphasis>:  A VPC acts as a container for multiple isolated
+                networks that can communicate with each other via its virtual router.</para></listitem>
+          <listitem><para><emphasis role="bold">Network Tiers</emphasis>: Each tier acts as an isolated network with its
+                own VLANs and CIDR list, where you can place groups of resources, such as VMs. The
+                tiers are segmented by  means of VLANs. The NIC of each tier acts as its
+                gateway.</para></listitem>
+          <listitem><para><emphasis role="bold">Virtual Router</emphasis>: A virtual router is automatically created and
+                started when you create a VPC. The virtual router connect the tiers and direct
+                traffic among the public gateway, the VPN gateways, and the NAT instances. For each
+                tier, a corresponding NIC and IP exist in the virtual router. The virtual router
+                provides DNS and DHCP services through its IP.</para></listitem>
+          <listitem><para><emphasis role="bold">Public Gateway</emphasis>: The traffic to and from the Internet routed
+                to the VPC through the public gateway. In a VPC, the public gateway is not exposed
+                to the end user; therefore, static routes are not support for the public
+                gateway.</para></listitem>
+          <listitem><para><emphasis role="bold">Private Gateway</emphasis>: All the traffic to and from a private network routed to the VPC through the private gateway. For more information, see <xref linkend="add-gateway-vpc"/>.</para></listitem>
+          <listitem><para><emphasis role="bold">VPN Gateway</emphasis>: The VPC side of a VPN connection.</para></listitem>
+          <listitem><para><emphasis role="bold">Site-to-Site VPN Connection</emphasis>: A hardware-based VPN connection
+                between your VPC and your datacenter, home network, or co-location facility. For
+                more information, see <xref linkend="site-to-site-vpn"/>.</para></listitem>
+          <listitem><para><emphasis role="bold">Customer Gateway</emphasis>: The customer side of a VPN Connection. For
+                more information, see <xref linkend="create-vpn-customer-gateway"/>.</para></listitem>
+          <listitem><para><emphasis role="bold">NAT Instance</emphasis>: An instance that provides Port Address
+                Translation for instances to access the Internet via the public gateway. For more
+                information, see <xref linkend="enable-disable-static-nat-vpc"/>.</para></listitem>
+      </itemizedlist>
+       <formalpara>
+           <title>Network Architecture in a VPC</title>
+           <para>In a VPC, the following four basic options of network architectures are
+            present:</para>
+       </formalpara>
+       <itemizedlist>
+           <listitem><para>VPC with a public gateway only</para></listitem>
+           <listitem><para>VPC with public and private gateways</para></listitem>
+           <listitem><para>VPC with public and private gateways and site-to-site VPN access</para></listitem>
+           <listitem><para>VPC with a private gateway only and site-to-site VPN access</para></listitem>
+       </itemizedlist>
+       <formalpara>
+          <title>Connectivity Options for a VPC</title>
+           <para>You can connect your VPC to:</para></formalpara>
+           <itemizedlist>
+            <listitem><para>The Internet through the public gateway.</para></listitem>
+           <listitem><para>The corporate datacenter by using a site-to-site VPN connection through the VPN gateway.</para></listitem>
+               <listitem><para>Both the Internet and your corporate datacenter by using both the public gateway and a VPN gateway.</para></listitem>
+       </itemizedlist>
+     <formalpara><title>VPC Network Considerations</title>
+      <para>Consider the following before you create a VPC:</para></formalpara>
+    <itemizedlist><listitem>
+            <para>A VPC, by default, is created in the enabled state.</para>
+        </listitem>
+        <listitem>
+            <para>A VPC can be created in Advance zone only, and can't belong to more than one zone at a time.</para>
+        </listitem>
+        <listitem>
+            <para>The default number of VPCs an account can create is 20. However, you can change it
+                by using the max.account.vpcs global parameter, which controls the maximum number of
+                VPCs an account is allowed to create.</para>
+        </listitem>
+        <listitem>
+            <para>The default number of tiers an account can create within a VPC is 3. You can
+                configure this number by using the vpc.max.networks parameter.</para>
+        </listitem>
+    <listitem>
+            <para>Each tier should have an unique CIDR in the VPC. Ensure that the tier's CIDR
+                should be within the VPC CIDR range.</para>
+        </listitem>
+        <listitem>
+            <para>A tier belongs to only one VPC. </para>
+        </listitem>
+        <listitem>
+            <para>All network tiers inside the VPC should belong to the same account.</para>
+        </listitem>
+        <listitem>
+            <para>When a VPC is created, by default, a SourceNAT IP is allocated to it. The Source
+                NAT IP is released only when the VPC is removed.</para>
+        </listitem>    
+    <listitem><para>A public IP can be used for only one purpose at a time. If the IP is a sourceNAT, it cannot be used for StaticNAT or port forwarding.</para>
+        </listitem>
+        <listitem><para>The instances only have a private IP address that you provision. To communicate with the Internet, enable NAT to an instance that you launch in your VPC.</para>   
+        </listitem>
+        <listitem>
+            <para>Only new networks can be added to a VPC. The maximum number of networks per VPC is
+                limited by the value you specify in the vpc.max.networks parameter. The default
+                value is three.</para>
+        </listitem>
+        <listitem>
+            <para>The load balancing service can be supported  by only one tier inside the
+                VPC.</para>
+        </listitem>  
+        <listitem><para>If an IP address is assigned to a tier:</para><itemizedlist>
+                      <listitem><para>That IP can't be used by more than one tier at a time in the VPC. For example, if you have
+                        tiers A and B, and a public IP1, you can create a port forwarding rule by
+                        using the IP either for A or B, but not for both.</para></listitem>
+                <listitem><para>That IP can't be used for StaticNAT, load balancing, or port forwarding rules for another
+                    guest network inside the VPC.</para></listitem>
+            </itemizedlist>          
+        </listitem>
+        <listitem><para>Remote access VPN is not supported in VPC networks.</para></listitem></itemizedlist>
+           </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vpn.xml b/docs/en-US/vpn.xml
index a459987..ccb3e86 100644
--- a/docs/en-US/vpn.xml
+++ b/docs/en-US/vpn.xml
@@ -5,29 +5,41 @@
 ]>
 
 <!-- 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="vpn">
-    <title>VPN</title>
-    <para>&PRODUCT; account owners can create virtual private networks (VPN) to access their virtual machines. If the guest network is instantiated from a network offering that offers the Remote Access VPN service, the virtual router (based on the System VM) is used to provide the service. &PRODUCT; provides a L2TP-over-IPsec-based remote access VPN service to guest virtual networks.  Since each network gets its own virtual router, VPNs are not shared across the networks. VPN clients native to Windows, Mac OS X and iOS can be used to connect to the guest networks.  The account owner can create and manage users for their VPN.  &PRODUCT; does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.</para>
-    <note><para>Make sure that not all traffic goes through the VPN.  That is, the route installed by the VPN should be only for the guest network and not for all traffic.</para></note>
-    <itemizedlist>
-    <listitem><para><emphasis role="bold">Road Warrior / Remote Access</emphasis>. Users want to be able to connect securely from a home or office to a private network in the cloud. Typically, the IP address of the connecting client is dynamic and cannot be preconfigured on the VPN server.</para></listitem>
-    <listitem><para><emphasis role="bold">Site to Site</emphasis>. In this scenario, two private subnets are connected over the public Internet with a secure VPN tunnel. The cloud user’s subnet (for example, an office network) is connected through a gateway to the network in the cloud. The address of the user’s gateway must be preconfigured on the VPN server in the cloud. Note that although L2TP-over-IPsec can be used to set up Site-to-Site VPNs, this is not the primary intent of this feature.</para></listitem>
-    </itemizedlist>
+	<title>VPN</title>
+	<para>&PRODUCT; account owners can create virtual private networks (VPN) to access their virtual machines. If the guest network is instantiated from a network offering that offers the Remote Access VPN service, the virtual router (based on the System VM) is used to provide the service. &PRODUCT; provides a L2TP-over-IPsec-based remote access VPN service to guest virtual networks.  Since each network gets its own virtual router, VPNs are not shared across the networks. VPN clients native to Windows, Mac OS X and iOS can be used to connect to the guest networks.  The account owner can create and manage users for their VPN.  &PRODUCT; does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.</para>
+	<note><para>Make sure that not all traffic goes through the VPN.  That is, the route installed by the VPN should be only for the guest network and not for all traffic.</para></note>
+	<para></para>
+	<itemizedlist>
+	<listitem><para><emphasis role="bold">Road Warrior / Remote Access</emphasis>. Users want to be able to
+				connect securely from a home or office to a private network in the cloud. Typically,
+				the IP address of the connecting client is dynamic and cannot be preconfigured on
+				the VPN server.</para></listitem>
+	<listitem><para><emphasis role="bold">Site to Site</emphasis>. In this scenario, two private subnets are
+				connected over the public Internet with a secure VPN tunnel. The cloud user’s subnet
+				(for example, an office network) is connected through a gateway to the network in
+				the cloud. The address of the user’s gateway must be preconfigured on the VPN server
+				in the cloud. Note that although L2TP-over-IPsec can be used to set up Site-to-Site
+				VPNs, this is not the primary intent of this feature. For more information, see <xref linkend="site-to-site-vpn"/></para></listitem>
+	</itemizedlist>
+	<xi:include href="configure-vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="using-vpn-with-windows.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="using-vpn-with-mac.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="site-to-site-vpn.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/windows-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/windows-installation.xml b/docs/en-US/windows-installation.xml
index b6e0632..27f90f3 100644
--- a/docs/en-US/windows-installation.xml
+++ b/docs/en-US/windows-installation.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="windows-installation">
-    <title>Windows OS Installation</title>
-    <para>Download the installer, CloudInstanceManager.msi, from <ulink url="http://cloudstack.org/download.html">Download page</ulink> and run the installer in the newly created Windows VM.</para>
+	<title>Windows OS Installation</title>
+	<para>Download the installer, CloudInstanceManager.msi, from the <ulink
+            url="http://cloudstack.org/download.html">Download page</ulink> and run the installer in
+        the newly created Windows VM.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/work-with-usage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/work-with-usage.xml b/docs/en-US/work-with-usage.xml
index e9fb1d8..40130c8 100644
--- a/docs/en-US/work-with-usage.xml
+++ b/docs/en-US/work-with-usage.xml
@@ -5,24 +5,31 @@
 ]>
 
 <!-- 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="change-database-config">
-    <title>Changing the Database Configuration</title>
-    <para>The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties.  To effect a change, edit this file on each Management Server, then restart the Management Server.</para> 
-</section>
+<chapter id="work-with-usage">
+    <title>Working with Usage</title>
+    <para>The Usage Server is an optional, separately-installed part of &PRODUCT; that provides aggregated usage records which you can use to create billing integration for &PRODUCT;. The Usage Server works by taking data from the events log and creating summary usage records that you can access using the listUsageRecords API call. </para>
+    <para>The usage records show the amount of resources, such as VM run time or template storage
+        space, consumed by guest instances.</para>
+    <para>The Usage Server runs at least once per day. It can be configured to run multiple times per day.</para>
+    <xi:include href="configure-usage-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="set-usage-limit.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="globally-configured-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="default-account-resource-limit.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
+    <xi:include href="per-domain-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/working-with-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-hosts.xml b/docs/en-US/working-with-hosts.xml
index fb4364b..9bb524d 100644
--- a/docs/en-US/working-with-hosts.xml
+++ b/docs/en-US/working-with-hosts.xml
@@ -1,28 +1,39 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
 
 <!-- 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="removing-hosts">
-    <title>Removing Hosts</title>
-    <para>Hosts can be removed from the cloud as needed. The procedure to remove a host depends on the hypervisor type.</para>
-</section>
+<chapter id="working-with-hosts">
+    <title>Working With Hosts</title>
+    <section id="adding-hosts">
+        <title>Adding Hosts</title>
+        <para>Additional hosts can be added at any time to provide more capacity for guest VMs. For requirements and instructions, see the Installation Guide.</para>
+    </section>
+    <xi:include href="scheduled-maintenance-maintenance-mode-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="disable-enable-zones-pods-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="removing-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="re-install-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="maintain-hypervisors-on-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="change-host-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="host-allocation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="vlan-provisioning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/working-with-iso.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-iso.xml b/docs/en-US/working-with-iso.xml
index efe5fb5..03e18ee 100644
--- a/docs/en-US/working-with-iso.xml
+++ b/docs/en-US/working-with-iso.xml
@@ -5,29 +5,28 @@
 ]>
 
 <!-- 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="working-with-iso">
-    <title>Working with ISOs</title>
-    <para>&PRODUCT; supports ISOs and their attachment to guest VMs. An ISO is a read-only file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and mount them on their guest VMs.</para>
-    <para>ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is available via HTTP specify an upload URL such as http://my.web.server/filename.iso.</para>
-    <para>ISOs may be public or private, like templates.ISOs are not hypervisor-specific.  That is, a guest on vSphere can mount the exact same image that a guest on KVM can mount.</para>
-    <para>ISO images may be stored in the system and made available with a privacy level similar to templates. ISO images are classified as either bootable or not bootable. A bootable ISO image is one that contains an OS image. &PRODUCT; allows a user to boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. For example, this enables installing PV drivers into Windows.  ISO images are not hypervisor-specific.</para>
+	<title>Working with ISOs</title>
+	<para>&PRODUCT; supports ISOs and their attachment to guest VMs. An ISO is a read-only file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and mount them on their guest VMs.</para>
+	<para>ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is available via HTTP specify an upload URL such as http://my.web.server/filename.iso.</para>
+	<para>ISOs may be public or private, like templates.ISOs are not hypervisor-specific.  That is, a guest on vSphere can mount the exact same image that a guest on KVM can mount.</para>
+	<para>ISO images may be stored in the system and made available with a privacy level similar to templates. ISO images are classified as either bootable or not bootable. A bootable ISO image is one that contains an OS image. &PRODUCT; allows a user to boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. For example, this enables installing PV drivers into Windows.  ISO images are not hypervisor-specific.</para>
     <xi:include href="add-iso.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="attach-iso-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
+    <xi:include href="attach-iso-to-vm.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/working-with-snapshots.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-snapshots.xml b/docs/en-US/working-with-snapshots.xml
index 6145ffd..1d8dbd9 100644
--- a/docs/en-US/working-with-snapshots.xml
+++ b/docs/en-US/working-with-snapshots.xml
@@ -5,28 +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="working-with-snapshots">
-    <title>Working with Snapshots</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>&PRODUCT; supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. If you are using the Oracle VM hypervisor, you can not take snapshots, since OVM does not support them.</para>
-    <para>Snapshots may be taken for volumes, including both root and data disks (except when the Oracle VM hypervisor is used, which does not support snapshots). The administrator places a limit on the number of stored snapshots per user. Users can create new volumes from the snapshot for recovery of particular files and they can create templates from snapshots to boot from a restored disk.</para>
-    <para>Users can create snapshots manually or by setting up automatic recurring snapshot policies. Users can also create disk volumes from snapshots, which may be attached to a VM like any other disk volume. Snapshots of both root disks and data disks are supported. However, &PRODUCT; does not currently support booting a VM from a recovered root disk. A disk recovered from snapshot of a root disk is treated as a regular data disk; the data on recovered disk can be accessed by attaching the disk to a VM.</para>
-    <para>A completed snapshot is copied from primary storage to secondary storage, where it is stored until deleted or purged by newer snapshot.</para>
+	<title>Working with Snapshots</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>&PRODUCT; supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. If you are using the Oracle VM hypervisor, you can not take snapshots, since OVM does not support them.</para>
+	<para>Snapshots may be taken for volumes, including both root and data disks (except when the Oracle VM hypervisor is used, which does not support snapshots). The administrator places a limit on the number of stored snapshots per user. Users can create new volumes from the snapshot for recovery of particular files and they can create templates from snapshots to boot from a restored disk.</para>
+	<para>Users can create snapshots manually or by setting up automatic recurring snapshot policies. Users can also create disk volumes from snapshots, which may be attached to a VM like any other disk volume. Snapshots of both root disks and data disks are supported. However, &PRODUCT; does not currently support booting a VM from a recovered root disk. A disk recovered from snapshot of a root disk is treated as a regular data disk; the data on recovered disk can be accessed by attaching the disk to a VM.</para>
+	<para>A completed snapshot is copied from primary storage to secondary storage, where it is stored until deleted or purged by newer snapshot.</para>
+	<xi:include href="automatic-snapshot-creation-retention.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="incremental-snapshots-backup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="volume-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="snapshot-restore.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/working-with-system-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-system-vm.xml b/docs/en-US/working-with-system-vm.xml
index 016d579..97459f9 100644
--- a/docs/en-US/working-with-system-vm.xml
+++ b/docs/en-US/working-with-system-vm.xml
@@ -5,24 +5,29 @@
 ]>
 
 <!-- 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="working-with-system-vm">
+<chapter id="working-with-system-vm">
     <title>Working with System Virtual Machines</title>
     <para>&PRODUCT; uses several types of system virtual machines to perform tasks in the cloud. In general &PRODUCT; manages these system VMs and creates, starts, and stops them as needed based on scale and immediate needs. However, the administrator should be aware of them and their roles to assist in debugging issues.</para>
-</section>
+    <xi:include href="system-vm-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="multiple-system-vm-vmware.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="console-proxy.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="secondary-storage-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/working-with-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-templates.xml b/docs/en-US/working-with-templates.xml
index 57a0a58..9f4e750 100644
--- a/docs/en-US/working-with-templates.xml
+++ b/docs/en-US/working-with-templates.xml
@@ -5,28 +5,28 @@
 ]>
 
 <!-- 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="working-with-templates">
-    <title>Working with Templates</title>
-    <para>A template is a reusable configuration for virtual machines. When users launch VMs, they can choose from a list of templates in &PRODUCT;.</para>
-    <para>Specifically, a template is a virtual disk image that includes one of a variety of operating systems, optional additional software such as office applications, and settings such as access control to determine who can use the template. Each template is associated with a particular type of hypervisor, which is specified when the template is added to &PRODUCT;.</para>
-    <para>&PRODUCT; ships with a default template. In order to present more choices to users, &PRODUCT; administrators and users can create templates and add them to &PRODUCT;.</para>
+<chapter id="working-with-templates">
+	<title>Working with Templates</title>
+	<para>A template is a reusable configuration for virtual machines. When users launch VMs, they can choose from a list of templates in &PRODUCT;.</para>
+	<para>Specifically, a template is a virtual disk image that includes one of a variety of operating systems, optional additional software such as office applications, and settings such as access control to determine who can use the template. Each template is associated with a particular type of hypervisor, which is specified when the template is added to &PRODUCT;.</para>
+	<para>&PRODUCT; ships with a default template. In order to present more choices to users, &PRODUCT; administrators and users can create templates and add them to &PRODUCT;.</para>
     <xi:include href="create-templates-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="requirements-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="best-practices-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -38,7 +38,7 @@
     <xi:include href="export-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="create-windows-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="import-ami.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="create-bare-metal-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="convert-hyperv-vm-to-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-password-management-to-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="delete-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/working-with-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-volumes.xml b/docs/en-US/working-with-volumes.xml
index f4fce71..1a9d297 100644
--- a/docs/en-US/working-with-volumes.xml
+++ b/docs/en-US/working-with-volumes.xml
@@ -5,26 +5,34 @@
 ]>
 
 <!-- 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="working-with-volumes">
-    <title>Using Swift for Secondary Storage</title>
-    <para>A volume provides storage to a guest VM.  The volume can provide for a root disk or an additional data disk.  &PRODUCT; supports additional volumes for guest VMs.</para>
-    <para>Volumes are created for a specific hypervisor type. A volume that has been attached to guest using one hypervisor type (e.g, XenServer) may not be attached to a guest that is using another hypervisor type (e.g. vSphere, Oracle VM, KVM).  This is because the different hypervisors use different disk image formats.</para>
-    <para>&PRODUCT; defines a volume as a unit of storage available to a guest VM. Volumes are either root disks or data disks. The root disk has "/" in the file system and is usually the boot device. Data disks provide for additional storage (e.g. As "/opt" or "D:"). Every guest VM has a root disk, and VMs can also optionally have a data disk. End users can mount multiple data disks to guest VMs. Users choose data disks from the disk offerings created by administrators. The user can create a template from a volume as well; this is the standard procedure for private template creation. Volumes are hypervisor-specific: a volume from one hypervisor type may not be used on a guest of another hypervisor type.</para>    
+	<title>Working With Volumes</title>
+	<para>A volume provides storage to a guest VM.  The volume can provide for a root disk or an additional data disk.  &PRODUCT; supports additional volumes for guest VMs.</para>
+	<para>Volumes are created for a specific hypervisor type.   A volume that has been attached to guest using one hypervisor type (e.g, XenServer) may not be attached to a guest that is using another hypervisor type (e.g. vSphere, Oracle VM, KVM).  This is because the different hypervisors use different disk image formats.</para>
+	<para>&PRODUCT; defines a volume as a unit of storage available to a guest VM. Volumes are either root disks or data disks. The root disk has “/” in the file system and is usually the boot device. Data disks provide for additional storage (e.g. As “/opt” or “D:”). Every guest VM has a root disk, and VMs can also optionally have a data disk. End users can mount multiple data disks to guest VMs. Users choose data disks from the disk offerings created by administrators. The user can create a template from a volume as well; this is the standard procedure for private template creation.  Volumes are hypervisor-specific: a volume from one hypervisor type may not be used on a guest of another hypervisor type.</para>	
+	<xi:include href="creating-new-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="upload-existing-volume-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="attaching-volume.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="detach-move-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="vm-storage-migration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="resizing-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="volume-deletion-garbage-collection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/xenserver-maintenance-mode.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/xenserver-maintenance-mode.xml b/docs/en-US/xenserver-maintenance-mode.xml
index 4dfa43e..b947278 100644
--- a/docs/en-US/xenserver-maintenance-mode.xml
+++ b/docs/en-US/xenserver-maintenance-mode.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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="xenserver-maintenance-mode">
     <title>XenServer and Maintenance Mode</title>
     <para>For XenServer, you can take a server offline temporarily by using the Maintenance Mode feature in XenCenter. When you place a server into Maintenance Mode, all running VMs are automatically migrated from it to another host in the same pool. If the server is the pool master, a new master will also be selected for the pool. While a server is Maintenance Mode, you cannot create or start any VMs on it.</para>
@@ -31,10 +30,10 @@
         <itemizedlist>
             <listitem><para>Right-click, then click Enter Maintenance Mode on the shortcut menu.</para>
             </listitem>
-            <listitem><para>On the Server menu, click Enter Maintenance Mode</para>
+            <listitem><para>On the Server menu, click Enter Maintenance Mode.</para>
            </listitem>
         </itemizedlist></listitem> 
-        <listitem><para>Click Enter Maintenance Mode</para></listitem>        
+        <listitem><para>Click Enter Maintenance Mode.</para></listitem>        
     </orderedlist>
     <para>The server's status in the Resources pane shows when all running VMs have been successfully migrated off the server.</para>
     <para><emphasis role="bold">To take a server out of Maintenance Mode:</emphasis></para>
@@ -43,9 +42,10 @@
             <itemizedlist>
                 <listitem><para>Right-click, then click Exit Maintenance Mode on the shortcut menu.</para>
                 </listitem>
-                <listitem><para>On the Server menu, click Exit Maintenance Mode</para>
+                <listitem><para>On the Server menu, click Exit Maintenance Mode.</para>
                 </listitem>
             </itemizedlist></listitem> 
-        <listitem><para>Click Exit Maintenance Mode</para></listitem>        
+        <listitem><para>Click Exit Maintenance Mode.</para></listitem>        
     </orderedlist>
+    
 </section>


Mime
View raw message