cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [24/50] [abbrv] Feature Documentation for s2svpn interVlan and Autoscale
Date Wed, 12 Sep 2012 00:38:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/create-template-from-snapshot.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-template-from-snapshot.xml b/docs/en-US/create-template-from-snapshot.xml
index 3075032..b212adc 100644
--- a/docs/en-US/create-template-from-snapshot.xml
+++ b/docs/en-US/create-template-from-snapshot.xml
@@ -5,25 +5,27 @@
 ]>
 
 <!-- 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="create-template-from-snapshot">
     <title>Creating a Template from a Snapshot</title>
-    <note><para>Not supported by Oracle VM</para></note>
-    <para>If you do not want to stop the VM in order to use the Create Template menu item (as described in <xref linkend="create-template-from-existing-vm"/>), you can create a template directly from any snapshot through the &PRODUCT; UI.</para>
+    <note><para>Not supported by Oracle VM.</para></note>
+    <para></para>
+    <para>If you do not want to stop the VM to use the Create Template menu item, as described in
+            <xref linkend="create-template-from-existing-vm"/>), you can create a template directly
+        from any snapshot through the &PRODUCT; UI.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/create-templates-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-templates-overview.xml b/docs/en-US/create-templates-overview.xml
index 818b42d..900165f 100644
--- a/docs/en-US/create-templates-overview.xml
+++ b/docs/en-US/create-templates-overview.xml
@@ -5,31 +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="create-templates-overview">
-    <title>Creating Templates: Overview</title>
-    <para>&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
-    <orderedlist>
-        <listitem><para>Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.</para></listitem>
-        <listitem><para>Stop the VM.</para></listitem>
-        <listitem><para>Convert the volume into a template.</para></listitem>
-    </orderedlist>
-    <para>There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into &PRODUCT;</para>
-    <para>The various techniques for creating templates are described in the next few sections.</para>
+	<title>Creating Templates: Overview</title>
+	<para>&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
+	<orderedlist>
+		<listitem><para>Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.</para></listitem>
+		<listitem><para>Stop the VM.</para></listitem>
+		<listitem><para>Convert the volume into a template.</para></listitem>
+	</orderedlist>
+	<para>There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot
+		of the VM's volume and create a template from the snapshot, or import a VHD from another
+		system into &PRODUCT;.</para>
+	<para>The various techniques for creating templates are described in the next few sections.</para>
+	
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/create-windows-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-windows-template.xml b/docs/en-US/create-windows-template.xml
index f8dbc79..d02f067 100644
--- a/docs/en-US/create-windows-template.xml
+++ b/docs/en-US/create-windows-template.xml
@@ -5,34 +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="create-windows-template">
-    <title>Creating a Windows Template</title>
-    <para>Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.</para>
-    <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
-    <para>An overview of the procedure is as follows:</para>
-    <orderedlist>
-    <listitem><para>Upload your Windows ISO.</para> <para>For more information, see <xref linkend="add-iso"/></para></listitem>
-    <listitem><para>Create a VM Instance with this ISO.</para><para> For more information, see <xref linkend="creating-vms"/></para></listitem>
-    <listitem><para>Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of Windows Server</para></listitem>        
-    <listitem><para>The preparation steps are complete. Now you can actually create the template as described in Creating the Windows Template.</para></listitem>
-    </orderedlist>
-    <xi:include href="sysprep-windows-server-2008R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sysprep-for-windows-server-2003R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
+	<title>Creating a Windows Template</title>
+	<para>Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.</para>
+	<note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para>
+		</note>
+	<para></para>
+	<para>An overview of the procedure is as follows:</para>
+	<orderedlist>
+	<listitem><para>Upload your Windows ISO.</para> <para>For more information, see <xref linkend="add-iso"/>.</para></listitem>
+	<listitem><para>Create a VM Instance with this ISO.</para><para> For more information, see <xref linkend="creating-vms"/>.</para></listitem>
+	<listitem><para>Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of Windows Server</para></listitem>		
+	<listitem><para>The preparation steps are complete. Now you can actually create the template as described in Creating the Windows Template.</para></listitem>
+	</orderedlist>
+	<xi:include href="sysprep-windows-server-2008R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="sysprep-for-windows-server-2003R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/creating-compute-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-compute-offerings.xml b/docs/en-US/creating-compute-offerings.xml
index 56679a4..31f9741 100644
--- a/docs/en-US/creating-compute-offerings.xml
+++ b/docs/en-US/creating-compute-offerings.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="creating-compute-offerings">
     <title>Creating a New Compute Offering</title>
     <para>To create a new compute offering:</para>
@@ -32,19 +31,36 @@
         <listitem><para>Click Add Compute Offering.</para></listitem>
         <listitem><para>In the dialog, make the following choices:</para>
         <itemizedlist>
-            <listitem><para>Name. Any desired name for the service offering.</para></listitem>
-            <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
-            <listitem><para>Storage type. The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
-            <listitem><para># of CPU cores. The number of cores which should be allocated to a system VM with this offering</para></listitem>
-            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, "2000" would provide for a 2 GHz clock.</para></listitem>
-            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, "2048" would provide for a 2 GB RAM allocation.</para></listitem>
-            <listitem><para>Network Rate. Allowed data transfer rate in MB per second.</para></listitem>
-            <listitem><para>Offer HA. If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.</para></listitem>
-            <listitem><para>Storage Tags.  The tags that should be associated with the primary storage used by the system VM.</para></listitem>
-            <listitem><para>Host Tags.  (Optional) Any tags that you use to organize your hosts</para></listitem>
-            <listitem><para>CPU cap. Whether to limit the level of CPU usage even if spare capacity is available.</para></listitem>
-            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
+            <listitem><para><emphasis role="bold">Name</emphasis>: Any desired name for the service offering.</para></listitem>
+            <listitem><para><emphasis role="bold">Description</emphasis>: A short description of the offering that can be
+                        displayed to users</para></listitem>
+            <listitem><para><emphasis role="bold">Storage type</emphasis>: The type of disk that should be allocated.
+                        Local allocates from storage attached directly to the host where the system
+                        VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
+            <listitem><para><emphasis role="bold"># of CPU cores</emphasis>: The number of cores which should be allocated
+                        to a system VM with this offering</para></listitem>
+            <listitem><para><emphasis role="bold">CPU (in MHz)</emphasis>: The CPU speed of the cores that the system VM
+                        is allocated. For example, “2000” would provide for a 2 GHz clock.</para></listitem>
+            <listitem><para><emphasis role="bold">Memory (in MB)</emphasis>: The amount of memory in megabytes that the
+                        system VM should be allocated. For example, “2048” would provide for a 2 GB
+                        RAM allocation.</para></listitem>
+            <listitem><para><emphasis role="bold">Network Rate</emphasis>: Allowed data transfer rate in MB per
+                        second.</para></listitem>
+            <listitem><para><emphasis role="bold">Offer HA</emphasis>: If yes, the administrator can choose to have the
+                        system VM be monitored and as highly available as possible.</para></listitem>
+            <listitem><para><emphasis role="bold">Storage Tags</emphasis>: The tags that should be associated with the
+                        primary storage used by the system VM.</para></listitem>
+            <listitem><para><emphasis role="bold">Host Tags</emphasis>: (Optional) Any tags that you use to organize your
+                        hosts</para></listitem>
+            <listitem><para><emphasis role="bold">CPU cap</emphasis>: Whether to limit the level of CPU usage even if
+                        spare capacity is available.</para></listitem>
+            <listitem><para><emphasis role="bold">Public</emphasis>: Indicate whether the service offering should be
+                        available all domains or only some domains. Choose Yes to make it available
+                        to all domains. Choose No to limit the scope to a subdomain; &PRODUCT;
+                        will then prompt for the subdomain's name.</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                
+    
+    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
index ab56920..d733924 100644
--- a/docs/en-US/creating-network-offerings.xml
+++ b/docs/en-US/creating-network-offerings.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="creating-network-offerings">
     <title>Creating a New Network Offering</title>
     <para>To create a network offering:</para>
@@ -32,13 +31,23 @@
         <listitem><para>Click Add Network Offering.</para></listitem>
         <listitem><para>In the dialog, make the following choices:</para>
         <itemizedlist>
-            <listitem><para>Name. Any desired name for the network offering</para></listitem>
-            <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
-            <listitem><para>Network Rate. Allowed data transfer rate in MB per second</para></listitem>
-            <listitem><para>Traffic Type. The type of network traffic that will be carried on the network</para></listitem>
-            <listitem><para>Guest Type. Choose whether the guest network is isolated or shared. For a description of these terms, see <xref linkend="about-virtual-networks"/> </para></listitem>
-            <listitem><para>Specify VLAN. (Isolated guest networks only) Indicate whether a VLAN should be specified when this offering is used</para></listitem>
-            <listitem><para>Supported Services. Select one or more of the possible network services. For some services, you must also choose the service provider; for example, if you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load balancers that have been configured in the cloud. Depending on which services you choose, additional fields may appear in the rest of the dialog box.</para><para>Based on the guest network type selected, you can see the following supported services:</para><informaltable>
+            <listitem><para><emphasis role="bold">Name</emphasis>. Any desired name for the network offering</para></listitem>
+            <listitem><para><emphasis role="bold">Description</emphasis>. A short description of the offering that can be
+                        displayed to users</para></listitem>
+            <listitem><para><emphasis role="bold">Network Rate</emphasis>. Allowed data transfer rate in MB per
+                        second</para></listitem>
+           <listitem><para><emphasis role="bold">Guest Type</emphasis>. Choose whether the guest network is isolated or
+                        shared. For a description of these terms, see <xref
+                            linkend="about-virtual-networks"/>
+                    </para></listitem>
+            <listitem><para><emphasis role="bold">Specify VLAN</emphasis>. (Isolated guest networks only) Indicate whether
+                        a VLAN should be specified when this offering is used</para></listitem>
+            <listitem><para><emphasis role="bold">Supported Services</emphasis>. Select one or more of the possible
+                        network services. For some services, you must also choose the service
+                        provider; for example, if you select Load Balancer, you can choose the
+                        &PRODUCT; virtual router or any other load balancers that have been
+                        configured in the cloud. Depending on which services you choose, additional
+                        fields may appear in the rest of the dialog box.</para><para>Based on the guest network type selected, you can see the following supported services:</para><informaltable>
                             <tgroup cols="4" align="left" colsep="1" rowsep="1">
                                 <thead>
                                     <row>
@@ -51,55 +60,68 @@
                                 <tbody>
                                     <row>
                                         <entry><para>DHCP</para></entry>
-                                        <entry><para></para></entry>
+                                        <entry><para>For more information, see <xref linkend="dns-dhcp"/>.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>DNS</para></entry>
-                                        <entry><para></para></entry>
+                                        <entry><para>For more information, see <xref linkend="dns-dhcp"/>.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>Load Balancer</para></entry>
-                                        <entry><para>If you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load balancers that have been configured in the cloud.</para></entry>
+                                        <entry><para>If you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load
+                                            balancers that have been configured in the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>Source NAT</para></entry>
-                                        <entry><para>If you select Source NAT, you can choose the &PRODUCT; virtual router or any other Source NAT providers that have been configured in the cloud.</para></entry>
+                                        <entry><para>If you select Source NAT, you can choose the &PRODUCT; virtual router or any other Source
+                                            NAT providers that have been configured in the
+                                            cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                        <entry><para>Static NAT</para></entry>
-                                        <entry><para>If you select Static NAT, you can choose the &PRODUCT; virtual router or any other Static NAT providers that have been configured in the cloud.</para></entry>
+                                        <entry><para>If you select Static NAT, you can choose the &PRODUCT; virtual router or any other Static
+                                            NAT providers that have been configured in the
+                                            cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>Port Forwarding</para></entry>
-                                        <entry><para>If you select Port Forwarding, you can choose the &PRODUCT; virtual router or any other Port Forwarding providers that have been configured in the cloud.</para></entry>
+                                        <entry><para>If you select Port Forwarding, you can choose the &PRODUCT; virtual router or any other
+                                            Port Forwarding providers that have been configured in
+                                            the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Not Supported</para></entry>
                                     </row>
                                     <row>
                                        <entry><para>VPN</para></entry>
-                                        <entry><para></para></entry>
+                                        <entry><para>For more information, see <xref linkend="vpn"/>.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Not Supported</para></entry>                                        
                                     </row>
                                     <row>
                                         <entry><para>User Data</para></entry>
-                                        <entry><para></para></entry>
+                                        <entry><para>For more information, see <xref linkend="user-data-and-meta-data"/>.</para></entry>
                                         <entry><para>Not Supported</para></entry>
                                         <entry><para>Supported</para></entry>                                        
                                     </row>
                                     <row>
+                                        <entry><para>Network ACL</para></entry>
+                                        <entry><para>For more information, see <xref linkend="configure-acl"/>.</para></entry>
+                                        <entry><para>Supported</para></entry>
+                                        <entry><para>Not Supported</para></entry>                                        
+                                    </row>
+                                    <row>
                                         <entry><para>Security Groups</para></entry>
-                                        <entry><para>See <xref linkend="add-security-group"/>.</para></entry>
+                                        <entry><para>For more information, see <xref linkend="add-security-group"/>.</para></entry>
                                         <entry><para>Not Supported</para></entry>
                                         <entry><para>Supported</para></entry>                                        
                                     </row>
@@ -107,11 +129,39 @@
                                  </tgroup>
                         </informaltable>
             </listitem>
-            <listitem><para>System Offering. If the service provider for any of the services selected in Supported Services is a virtual router, the System Offering field appears. Choose the system service offering that you want virtual routers to use in this network. For example, if you selected Load Balancer in Supported Services and selected a virtual router to provide load balancing, the System Offering field appears so you can choose between the &PRODUCT; default system service offering and any custom system service offerings that have been defined by the &PRODUCT; root administrator. For more information, see System Service Offerings.</para></listitem>
-            <listitem><para>Redundant router capability. (v3.0.3 and greater) Available only when Virtual Router is selected as the Source NAT provider.  Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the master virtual router and the other as the backup. The master virtual router receives requests from and sends responses to the user’s VM. The backup virtual router is activated only when the master is down. After the failover, the backup becomes the master virtual router. &PRODUCT; deploys the routers on different hosts to ensure reliability if one host is down.</para></listitem>
-            <listitem><para>Conserve mode.  Indicate whether to use conserve mode. In this mode, network resources are allocated only when the first virtual machine starts in the network</para></listitem>
-            <listitem><para>Tags.  Network tag to specify which physical network to use</para></listitem>
+            <listitem><para><emphasis role="bold">System Offering</emphasis>. If the service provider for any of the
+                        services selected in Supported Services is a virtual router, the System
+                        Offering field appears. Choose the system service offering that you want
+                        virtual routers to use in this network. For example, if you selected Load
+                        Balancer in Supported Services and selected a virtual router to provide load
+                        balancing, the System Offering field appears so you can choose between the
+                        &PRODUCT; default system service offering and any custom system service
+                        offerings that have been defined by the &PRODUCT; root administrator.
+                        For more information, see System Service Offerings.</para></listitem>
+            <listitem><para><emphasis role="bold">Redundant router capability</emphasis>. (v3.0.3 and greater) Available
+                        only when Virtual Router is selected as the Source NAT provider. Select this
+                        option if you want to use two virtual routers in the network for
+                        uninterrupted connection: one operating as the master virtual router and the
+                        other as the backup. The master virtual router receives requests from and
+                        sends responses to the user’s VM. The backup virtual router is activated
+                        only when the master is down. After the failover, the backup becomes the
+                        master virtual router. &PRODUCT; deploys the routers on different hosts
+                        to ensure reliability if one host is down.</para></listitem>
+            <listitem><para><emphasis role="bold">Conserve mode</emphasis>. Indicate whether to use conserve mode. In this
+                        mode, network resources are allocated only when the first virtual machine
+                        starts in the network. When the conservative mode is off, the public IP can
+                        only be used for a single service. For example, a public IP used for a port
+                        forwarding rule cannot be used for defining other services, such as SaticNAT
+                        or load balancing. When the conserve mode is on, you can define more than
+                        one service on the same public IP.</para>
+                <note><para>If StaticNAT is enabled, irrespective of the status of the conserve mode, no port forwarding
+                            or load balancing rule can be created for the IP. However, you can add
+                            the firewall rules by using the createFirewallRule command.</para></note></listitem>
+            <listitem><para><emphasis role="bold">Tags</emphasis>. Network tag to specify which physical network to
+                        use.</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                
+    
+    
 </section>

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/creating-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml
index dc37dbb..beb528f 100644
--- a/docs/en-US/creating-vms.xml
+++ b/docs/en-US/creating-vms.xml
@@ -3,47 +3,53 @@
 <!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="creating-vms">
-        <title>Creating VMs</title>
-        <para>Virtual machines are usually created from a template. Users can also create blank virtual machines. A blank virtual machine is a virtual machine without an OS template. Users can attach an ISO file and install the OS from the CD/DVD-ROM.</para>
-    <para>To create a VM from a template:</para>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
-            <listitem><para>In the left navigation bar, click Instances.</para></listitem>
-            <listitem><para>Click Add Instance.</para></listitem>
-            <listitem><para>Select a template, then follow the steps in the wizard. (For more information about how the templates came to be in this list, see Working with Templates.</para></listitem>
-            <listitem><para>Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
-            <listitem><para>Click Submit and your VM will be created and started.</para>
-                <note><para>For security reason, the internal name of the VM is visible only to the root admin.</para></note></listitem>
-        </orderedlist>
-        <note><para>Starting with v3.0.3, you can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment.  A new request parameter, startVM, is introduced in the deployVm API to support this feature.  For more information, see the Developer's Guide</para></note>
-        <para>To create a VM from an ISO:</para>
-        <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
-        <listitem><para>In the left navigation bar, click Instances.</para></listitem>
-        <listitem><para>Click Add Instance.</para></listitem>
-        <listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
-        <listitem><para>Click Submit and your VM will be created and started.</para></listitem>
-        <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
-    </orderedlist>
+		<title>Creating VMs</title>
+		<para>Virtual machines are usually created from a template. Users can also create blank virtual machines. A blank virtual machine is a virtual machine without an OS template. Users can attach an ISO file and install the OS from the CD/DVD-ROM.</para>
+	<note><para>Starting with v3.0.3, you can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment.  A new request parameter, startVM, is introduced in the deployVm API to support this feature.  For more information, see the Developer's Guide</para></note>	
+	<para>To create a VM from a template:</para>
+		<orderedlist>
+			<listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
+			<listitem><para>In the left navigation bar, click Instances.</para></listitem>
+			<listitem>
+			<para>Click Add Instance.</para>
+		</listitem>
+		<listitem>
+			<para>Select a zone.</para>
+		</listitem>
+			<listitem><para>Select a template, then follow the steps in the wizard. For more information about how the templates came to be in this list, see <xref linkend="working-with-templates"/>.</para></listitem>
+			<listitem><para>Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
+			<listitem><para>Click Submit and your VM will be created and started.</para>
+			<note><para>For security reason, the internal name of the VM is visible only to the root admin.</para></note>
+			</listitem>
+		</orderedlist>
+		<para>To create a VM from an ISO:</para>
+		<note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
+	<orderedlist>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
+		<listitem><para>In the left navigation bar, click Instances.</para></listitem>
+		<listitem><para>Click Add Instance.</para></listitem>
+		<listitem><para>Select a zone.</para></listitem>
+		<listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
+		<listitem><para>Click Submit and your VM will be created and started.</para></listitem>
+		<listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
+	</orderedlist>
 </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/default-account-resource-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-account-resource-limit.xml b/docs/en-US/default-account-resource-limit.xml
index abc313f..5134e50 100644
--- a/docs/en-US/default-account-resource-limit.xml
+++ b/docs/en-US/default-account-resource-limit.xml
@@ -5,36 +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="default-account-resource-limit">
     <title>Default Account Resource Limits</title>
-    <para>You can limit resource use by accounts. The default limits are set using global configuration parameters, and they affect all accounts within a cloud. The relevant parameters are those beginning with max.account (max.account.snapshots, etc.)..</para>
+    <para>You can limit resource use by accounts. The default limits are set by using global
+        configuration parameters, and they affect all accounts within a cloud. The relevant
+        parameters are those beginning with max.account, for example: max.account.snapshots.</para>
     <para>To override a default limit for a particular account, set a per-account resource limit.</para>
     <orderedlist>
         <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation tree, click Accounts.</para></listitem>
-        <listitem><para>Select the account you want to modify. The current limits are displayed. A value of -1 shows that there is no limit in place</para></listitem>
-        <listitem><para>Click the Edit button<inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="./images/edit-icon.png" />
-            </imageobject>
-            <textobject><phrase>editbutton.png: edits the settings.</phrase></textobject>
-        </inlinemediaobject></para></listitem>
+        <listitem><para>Select the account you want to modify. The current limits are displayed. A value of -1 shows
+                that there is no limit in place.</para></listitem>
+        <listitem><para>Click the Edit button.<inlinemediaobject>
+                    <imageobject>
+                        <imagedata fileref="./images/edit-icon.png"/>
+                    </imageobject>
+                    <textobject>
+                        <phrase>editbutton.png: edits the settings</phrase>
+                    </textobject>
+                </inlinemediaobject></para></listitem>
     </orderedlist>
+    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/deleting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deleting-vms.xml b/docs/en-US/deleting-vms.xml
index 1f1ee95..97245c8 100644
--- a/docs/en-US/deleting-vms.xml
+++ b/docs/en-US/deleting-vms.xml
@@ -5,37 +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="deleting-vms">
-        <title>Deleting VMs</title>
-            <para>Users can delete their own virtual machines. A running virtual machine will be abruptly stopped before it is deleted. Administrators can delete any virtual machines.</para>
-            <para>To delete a virtual machine:</para>    
-            <orderedlist>
-                <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-                <listitem><para>In the left navigation, click Instances.</para></listitem>
-                <listitem><para>Choose the VM that you want to delete.</para></listitem>
-                <listitem><para>Click the Destroy Instance button <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/destroy-instance.png" />
-                </imageobject>
-                <textobject><phrase>Destroyinstance.png: button to destroy an instance</phrase></textobject>
-            </inlinemediaobject>
-                </para></listitem>
-            </orderedlist>
-    </section>
+		<title>Deleting VMs</title>
+			<para>Users can delete their own virtual machines. A running virtual machine will be abruptly stopped before it is deleted. Administrators can delete any virtual machines.</para>
+			<para>To delete a virtual machine:</para>	
+			<orderedlist>
+				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+				<listitem><para>In the left navigation, click Instances.</para></listitem>
+				<listitem><para>Choose the VM that you want to delete.</para></listitem>
+				<listitem><para>Click the Destroy Instance button. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/destroy-instance.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>Destroyinstance.png: button to destroy an instance</phrase>
+					</textobject>
+				</inlinemediaobject>
+			</para></listitem>
+			</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/deployment-architecture-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
index 6a67a2c..1df0a52 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -1,44 +1,43 @@
 <?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="deployment-architecture-overview">
-    <title>Deployment Architecture Overview</title>
-    <para>
-        A &PRODUCT; installation consists of two parts: the Management Server and the cloud infrastructure that it manages. When you set up and manage a &PRODUCT; cloud, you provision resources such as hosts, storage devices, and IP addresses into the Management Server, and the Management Server manages those resources.
-    </para>
-    <para>
-        The minimum production installation consists of one machine running the &PRODUCT; Management Server and another machine to act as the cloud infrastructure (in this case, a very simple infrastructure consisting of one host running hypervisor software). In a trial installation, a single machine can act as both the Management Server and the hypervisor host (using the KVM hypervisor).
-    </para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/basic-deployment.png" />
-        </imageobject>
-        <textobject><phrase>basic-deployment.png: Basic two-machine deployment</phrase></textobject>
-    </mediaobject>
-    <para>A more full-featured installation consists of a highly-available multi-node Management Server installation and up to thousands of hosts using any of several advanced networking setups. For information about deployment options, see Choosing a Deployment Architecture.
-    </para>
-    <xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="networking-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<title>Deployment Architecture Overview</title>
+	<para>
+		A &PRODUCT; installation consists of two parts: the Management Server and the cloud infrastructure that it manages. When you set up and manage a &PRODUCT; cloud, you provision resources such as hosts, storage devices, and IP addresses into the Management Server, and the Management Server manages those resources.
+	</para>
+	<para>
+		The minimum production installation consists of one machine running the &PRODUCT; Management Server and another machine to act as the cloud infrastructure (in this case, a very simple infrastructure consisting of one host running hypervisor software). In a trial installation, a single machine can act as both the Management Server and the hypervisor host (using the KVM hypervisor).
+	</para>
+	<mediaobject>
+		<imageobject>
+			<imagedata fileref="./images/basic-deployment.png" />
+		</imageobject>
+		<textobject><phrase>basic-deployment.png: Basic two-machine deployment</phrase></textobject>
+	</mediaobject>
+	<para>A more full-featured installation consists of a highly-available multi-node Management Server installation and up to thousands of hosts using any of several advanced networking setups. For information about deployment options, see Choosing a Deployment Architecture.
+	</para>
+	<xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="networking-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/developer-guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-guide.xml b/docs/en-US/developer-guide.xml
index c4bdf39..4d4a9d6 100644
--- a/docs/en-US/developer-guide.xml
+++ b/docs/en-US/developer-guide.xml
@@ -5,26 +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.
 -->
-
 <chapter id="developer-guide">
-    <title>Using the API</title>
-    <xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<title>Using the API</title>
+	<xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="whats-new.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="making-api-request.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="enabling-api-call-expiration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -32,7 +31,5 @@
     <xi:include href="responses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="asynchronous-commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="working-with-usage-data.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="event-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="contacting-support.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/enable-disable-static-nat.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enable-disable-static-nat.xml b/docs/en-US/enable-disable-static-nat.xml
index f25327a..0154dca 100644
--- a/docs/en-US/enable-disable-static-nat.xml
+++ b/docs/en-US/enable-disable-static-nat.xml
@@ -5,40 +5,42 @@
 ]>
 
 <!-- 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="enable-disable-static-nat">
-    <title>Enabling or Disabling Static NAT</title>
-    <para>If port forwarding rules are already in effect for an IP address, you cannot enable static NAT to that IP.</para>
-    <para>If a guest VM is part of more than one network, static NAT rules will function only if they are defined on the default network.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>In the left navigation, choose Network.</para></listitem>
-        <listitem><para>Click the name of the network where you want to work with.</para></listitem>
-        <listitem><para>Click View IP Addresses.</para></listitem>
-        <listitem><para>Click the IP address you want to work with.</para>
-        </listitem>
-        <listitem><para>Click the Static NAT button.<inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="./images/release-ip-icon.png" />
-            </imageobject>
-            <textobject><phrase>ReleaseIPButton.png: button to release an IP</phrase></textobject>
-        </inlinemediaobject>The button toggles between Enable and Disable, depending on whether static NAT is currently enabled for the IP address.</para></listitem>
-        <listitem><para>If you are enabling static NAT, a dialog appears where you can choose the destination VM and click Apply</para></listitem>        
-    </orderedlist>
+	<title>Enabling or Disabling Static NAT</title>
+	<para>If port forwarding rules are already in effect for an IP address, you cannot enable static NAT to that IP.</para>
+	<para>If a guest VM is part of more than one network, static NAT rules will function only if they are defined on the default network.</para>
+	<orderedlist>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
+		<listitem><para>In the left navigation, choose Network.</para></listitem>
+		<listitem><para>Click the name of the network where you want to work with.</para></listitem>
+		<listitem><para>Click View IP Addresses.</para></listitem>
+		<listitem><para>Click the IP address you want to work with.</para>
+		</listitem>
+		<listitem><para>Click the Static NAT <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/enable-disable.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>ReleaseIPButton.png: button to release an IP</phrase>
+					</textobject>
+				</inlinemediaobject>button.</para><para>The button toggles between Enable and Disable, depending on whether static NAT is currently enabled for the IP address.</para></listitem>
+		<listitem><para>If you are enabling static NAT, a dialog appears where you can choose the destination VM and
+				click Apply.</para></listitem>		
+	</orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/enable-security-groups.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enable-security-groups.xml b/docs/en-US/enable-security-groups.xml
index 27f69d2..c957310 100644
--- a/docs/en-US/enable-security-groups.xml
+++ b/docs/en-US/enable-security-groups.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="enable-security-groups">
-    <title>Enabling Security Groups</title>
-    <para>In order for security groups to function in a zone, the security groups feature must first be enabled for the zone. The administrator can do this when creating a new zone, by selecting a network offering that includes security groups. The procedure is described in Basic Zone Configuration in the Advanced Installation Guide.</para>
+	<title>Enabling Security Groups</title>
+	<para>In order for security groups to function in a zone, the security groups feature must first be
+        enabled for the zone. The administrator can do this when creating a new zone, by selecting a
+        network offering that includes security groups. The procedure is described in Basic Zone
+        Configuration in the Advanced Installation Guide. The administrator can not enable security
+        groups for an existing zone, only when creating a new zone.</para>
 </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/end-user-ui-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/end-user-ui-overview.xml b/docs/en-US/end-user-ui-overview.xml
index dc95ce0..6ec1a25 100644
--- a/docs/en-US/end-user-ui-overview.xml
+++ b/docs/en-US/end-user-ui-overview.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="end-user-ui-overview">
-    <title>End User's UI Overview</title>
-    <para>The &PRODUCT; UI helps users of cloud infrastructure to view and use their cloud resources, including virtual machines, templates and ISOs, data volumes and snapshots, guest networks, and IP addresses. If the user is a member or administrator of one or more &PRODUCT; projects, the UI can provide a project-oriented view.</para>
+	<title>End User's UI Overview</title>
+	<para>The &PRODUCT; UI helps users of cloud infrastructure to view and use their cloud resources, including virtual machines, templates and ISOs, data volumes and snapshots, guest networks, and IP addresses. If the user is a member or administrator of one or more &PRODUCT; projects, the UI can provide a project-oriented view.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a28fd66b/docs/en-US/event-log-queries.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/event-log-queries.xml b/docs/en-US/event-log-queries.xml
index 32a1612..a0dcaa6 100644
--- a/docs/en-US/event-log-queries.xml
+++ b/docs/en-US/event-log-queries.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="event-log-queries">
     <title>Event Log Queries</title>
     <para>Database logs can be queried from the user interface. The list of events captured by the system includes:</para>
@@ -34,4 +33,4 @@
         <listitem><para>Storage volume creation and deletion</para></listitem>
         <listitem><para>User login and logout</para></listitem>            
     </itemizedlist>
-       </section>
+   	</section>


Mime
View raw message