incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [7/9] Revert "Feature Documentation for s2svpn interVlan and Autoscale"
Date Thu, 13 Sep 2012 16:03:50 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/networking-in-a-pod.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-in-a-pod.xml b/docs/en-US/networking-in-a-pod.xml
index 5a569bf..81f0827 100644
--- a/docs/en-US/networking-in-a-pod.xml
+++ b/docs/en-US/networking-in-a-pod.xml
@@ -5,42 +5,37 @@
 ]>
 
 <!-- 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="networking-in-a-pod">
-	<title>Networking in a Pod</title>
-	<para>The figure below illustrates network setup within a single pod. The hosts are connected to a
-		pod-level switch. At a minimum, the hosts should have one physical uplink to each switch.
-		Bonded NICs are supported as well. The pod-level switch is a pair of redundant gigabit
-		switches with 10 G uplinks.</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/network-singlepod.png" />
-		</imageobject>
-		<textobject>
-			<phrase>networksinglepod.png: diagram showing logical view of network in a pod</phrase>
-		</textobject>
-	</mediaobject>
-	<para>Servers are connected as follows:</para>
-	<itemizedlist>
-	<listitem><para>Storage devices are connected to only the network that carries management traffic.</para></listitem>
-	<listitem><para>Hosts are connected to networks for both management traffic and public traffic. </para></listitem>
-	<listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem>
-	</itemizedlist>
-	<para>We recommend the use of multiple physical Ethernet cards to implement each network interface as well as redundant switch fabric in order to maximize throughput and improve reliability.</para>
-						
-	</section>
+    <title>Networking in a Pod</title>
+    <para>Figure 2 illustrates network setup within a single pod. The hosts are connected to a pod-level switch. At a minimum, the hosts should have one physical uplink to each switch. Bonded NICs are supported as well. The pod-level switch is a pair of redundant gigabit switches with 10 G uplinks.</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/networking-in-a-pod.png" />
+        </imageobject>
+        <textobject><phrase>networking-in-a-pod.png: Network setup in a pod</phrase></textobject>
+    </mediaobject>
+    <para>Servers are connected as follows:</para>
+    <itemizedlist>
+    <listitem><para>Storage devices are connected to only the network that carries management traffic.</para></listitem>
+    <listitem><para>Hosts are connected to networks for both management traffic and public traffic. </para></listitem>
+    <listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem>
+    </itemizedlist>
+    <para>We recommend the use of multiple physical Ethernet cards to implement each network interface as well as redundant switch fabric in order to maximize throughput and improve reliability.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/networking-in-a-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-in-a-zone.xml b/docs/en-US/networking-in-a-zone.xml
index e50efba..c380c33 100644
--- a/docs/en-US/networking-in-a-zone.xml
+++ b/docs/en-US/networking-in-a-zone.xml
@@ -5,34 +5,32 @@
 ]>
 
 <!-- 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="networking-in-a-zone">
-	<title>Networking in a Zone</title>
-	<para>The following figure illustrates the network setup within a single zone.</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/network-setup-zone.png" />
-		</imageobject>
-		<textobject>
-			<phrase>networksetupzone.png: Depicts network setup in a single zone</phrase>
-		</textobject>
-	</mediaobject>
-	<para>A firewall for management traffic operates in the NAT mode. The network typically is assigned IP addresses in the 192.168.0.0/16 Class B private address space. Each pod is assigned IP addresses in the 192.168.*.0/24 Class C private address space.</para>
-	<para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para>
-						
-	</section>
+    <title>Networking in a Zone</title>
+    <para>Figure 3 illustrates the network setup within a single zone.</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/networking-in-a-zone.png" />
+        </imageobject>
+        <textobject><phrase>networking-in-a-zone.png: Network setup in a single zone</phrase></textobject>
+    </mediaobject>
+    <para>A firewall for management traffic operates in the NAT mode. The network typically is assigned IP addresses in the 192.168.0.0/16 Class B private address space. Each pod is assigned IP addresses in the 192.168.*.0/24 Class C private address space.</para>
+    <para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/networking-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-overview.xml b/docs/en-US/networking-overview.xml
index a71fe95..798fd7a 100644
--- a/docs/en-US/networking-overview.xml
+++ b/docs/en-US/networking-overview.xml
@@ -5,30 +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="networking-overview">
-		<title>Networking Overview</title>
-		<para>&PRODUCT; offers two types of networking scenario:
-		</para>
-		<itemizedlist>
-			<listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
-			<listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
-		</itemizedlist>
-		<para>For more details, see Network Setup.</para>
-	</section>
 
+<section id="networking-overview">
+        <title>Networking Overview</title>
+        <para>
+            &PRODUCT; offers two types of networking scenario:
+        </para>
+        <itemizedlist>
+            <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
+            <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
+        </itemizedlist>
+        <para>For more details, see Network Setup.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/pod-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/pod-add.xml b/docs/en-US/pod-add.xml
index 2a2b087..419e333 100644
--- a/docs/en-US/pod-add.xml
+++ b/docs/en-US/pod-add.xml
@@ -1,43 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE bookinfo 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="pod-add">
-	<title>Adding a Pod</title>
-    <para>When you created a new zone, &PRODUCT; adds the first pod for you. You can add more pods at any time using the procedure in this section.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI. See <xref linkend="log-in"/>.</para></listitem>
-        <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone to which you want to add a pod.</para></listitem>
-        <listitem><para>Click the Compute and Storage tab. In the Pods node of the diagram, click View All.</para></listitem>
-        <listitem><para>Click Add Pod.</para></listitem>
-        <listitem><para>Enter the following details in the dialog.</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Name.</emphasis> The name of the pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Gateway.</emphasis> The gateway for the hosts in that pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Netmask.</emphasis> The network prefix that defines the pod's subnet. Use CIDR notation.</para></listitem>
-                <listitem><para><emphasis role="bold">Start/End Reserved System IP.</emphasis>  The IP range in the management network that &PRODUCT; uses to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. For more information, see System Reserved IP Addresses.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>Click OK.</para></listitem>
-    </orderedlist>
+    <title>Adding a Pod</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/port-forwarding.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/port-forwarding.xml b/docs/en-US/port-forwarding.xml
index 1bbba45..b778693 100644
--- a/docs/en-US/port-forwarding.xml
+++ b/docs/en-US/port-forwarding.xml
@@ -5,47 +5,45 @@
 ]>
 
 <!-- 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="port-forwarding">
-	<title>Port Forwarding</title>
-	<para>A port forward service is a set of port forwarding rules that define a policy. A port forward service is then applied to one or more guest VMs. The guest VM then has its inbound network access managed according to the policy defined by the port forwarding service.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses to be forwarded.</para>
-	<para>A guest VM can be in any number of port forward services. Port forward services can be defined but have no members. If a guest VM is part of more than one network, port forwarding rules will function only if they are defined on the default network</para>
-	<para>You cannot use port forwarding to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See Security Groups.</para>
-	<para>To set up port forwarding:</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
-		<listitem><para>If you have not already done so, add a public IP address range to a zone in &PRODUCT;. See Adding a Zone and Pod in the Installation Guide.</para></listitem>
-		<listitem><para>Add one or more VM instances to &PRODUCT;.</para></listitem>
-		<listitem><para>In the left navigation bar, click Network.</para></listitem>
-		<listitem><para>Click the name of the guest network where the VMs are running.</para>
-		</listitem>
-		<listitem><para>Choose an existing IP address or acquire a new IP address. See <xref linkend="acquire-new-ip-address"/>. Click the name of the IP address in the list.</para></listitem>
-		<listitem><para>Click the Configuration tab.</para></listitem>
-		<listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem>
-		<listitem><para>Fill in the following:</para>
-		<itemizedlist>
-			<listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be
-						addressed on the IP address you acquired in the previous step.</para></listitem>
-			<listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for
-						forwarded public traffic.</para></listitem>
-			<listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two
-						ports</para></listitem>
-		</itemizedlist></listitem>
-		<listitem><para>Click Add.</para></listitem>		
-	</orderedlist>
+    <title>Port Forwarding</title>
+    <para>A port forward service is a set of port forwarding rules that define a policy. A port forward service is then applied to one or more guest VMs. The guest VM then has its inbound network access managed according to the policy defined by the port forwarding service. You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses to be forwarded.</para>
+    <para>A guest VM can be in any number of port forward services. Port forward services can be defined but have no members. If a guest VM is part of more than one network, port forwarding rules will function only if they are defined on the default network</para>
+    <para>You cannot use port forwarding to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See Security Groups.</para>
+    <para>To set up port forwarding:</para>
+    <orderedlist>
+        <listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
+        <listitem><para>If you have not already done so, add a public IP address range to a zone in CloudPlatform. See Adding a Zone and Pod in the Installation Guide.</para></listitem>
+        <listitem><para>Add one or more VM instances to CloudPlatform.</para></listitem>
+        <listitem><para>In the left navigation bar, click Network.</para></listitem>
+        <listitem><para>Click the name of the guest network where the VMs are running.</para>
+        </listitem>
+        <listitem><para>Choose an existing IP address or acquire a new IP address. (See Acquiring a New IP Address on page 73.) Click the name of the IP address in the list.</para></listitem>
+        <listitem><para>Click the Configuration tab.</para></listitem>
+        <listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem>
+        <listitem><para>Fill in the following:</para>
+        <itemizedlist>
+            <listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be addressed on the IP address you acquired in the previous step.</para></listitem>
+            <listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for forwarded public traffic.</para></listitem>
+            <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two ports.</para></listitem>
+        </itemizedlist></listitem>
+        <listitem><para>Click Add.</para></listitem>
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/primary-storage-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/primary-storage-add.xml b/docs/en-US/primary-storage-add.xml
index 401588c..588d491 100644
--- a/docs/en-US/primary-storage-add.xml
+++ b/docs/en-US/primary-storage-add.xml
@@ -5,50 +5,24 @@
 ]>
 
 <!-- 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="primary-storage-add">
-	<title>Adding Primary Storage</title>
-    <note><para>Ensure that nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></note>
-    <para>When you create a new zone, the first primary storage is added as part of that procedure. You can add primary storage servers at any time, such as when adding a new cluster or adding more servers to an existing cluster.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
-        <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone in which you want to add the primary storage.</para></listitem>
-        <listitem><para>Click the Compute tab.</para></listitem>
-        <listitem><para>In the Primary Storage node of the diagram, click View All.</para></listitem>
-        <listitem><para>Click Add Primary Storage.</para></listitem>
-        <listitem><para>Provide the following information in the dialog. The information required varies depending on your choice in Protocol.</para>
-            <itemizedlist>
-                <listitem><para>Pod. The pod for the storage device.</para></listitem>
-                <listitem><para>Cluster. The cluster for the storage device.</para></listitem>
-                <listitem><para>Name. The name of the storage device</para></listitem>
-                <listitem><para>Protocol. For XenServer, choose either NFS, iSCSI, or PreSetup.  For KVM, choose NFS or SharedMountPoint.  For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS</para></listitem>
-                <listitem><para>Server (for NFS, iSCSI, or PreSetup). The IP address or DNS name of the storage device</para></listitem>
-                <listitem><para>Server (for VMFS). The IP address or DNS name of the vCenter server.</para></listitem>
-                <listitem><para>Path (for NFS). In NFS this is the exported path from the server.</para></listitem>
-                <listitem><para>Path (for VMFS).  In vSphere this is a combination of the datacenter name and the datastore name.  The format is "/" datacenter name "/" datastore name.  For example, "/cloud.dc.VM/cluster1datastore".</para></listitem>
-                <listitem><para>Path (for SharedMountPoint).  With KVM this is the path on each host that is where this primary storage is mounted.  For example, "/mnt/primary".</para></listitem>
-                <listitem><para>SR Name-Label (for PreSetup).  Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem>
-                <listitem><para>Target IQN (for iSCSI). In iSCSI this is the IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984</para></listitem>
-                <listitem><para>Lun # (for iSCSI). In iSCSI this is the LUN number. For example, 3.</para></listitem>
-                <listitem><para>Tags (optional).  The comma-separated list of tags for this storage device.  It should be an equivalent set or superset of the tags on your disk offerings</para></listitem>
-            </itemizedlist>
-            <para>The tag sets on primary storage across clusters in a Zone must be identical.  For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para></listitem>
-        <listitem><para>Click OK.</para></listitem>     
-    </orderedlist>
+    <title>Adding Primary Storage</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/primary-storage.xml b/docs/en-US/primary-storage.xml
index de4005e..4860488 100644
--- a/docs/en-US/primary-storage.xml
+++ b/docs/en-US/primary-storage.xml
@@ -5,30 +5,24 @@
 ]>
 
 <!-- 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="primary-storage">
-		<title>Primary Storage</title>
-		<para>This section gives concepts and technical details about &PRODUCT; primary storage. For information about how to install and configure primary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
-    <xi:include href="best-practices-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="runtime-behavior-of-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-support-for-primarystorage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="storage-tags.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="maintenance-mode-for-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
-
+        <title>Primary Storage</title>
+        <para>This section gives concepts and technical details about CloudPlatform primary storage. For information about how to install and configure primary storage through the CloudPlatform UI, see the Advanced Installation Guide.</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/projects.xml b/docs/en-US/projects.xml
index f26248f..0390f52 100644
--- a/docs/en-US/projects.xml
+++ b/docs/en-US/projects.xml
@@ -5,36 +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.
 -->
 
-<chapter id="projects">
-	<title>Using Projects to Organize Users and Resources</title>
-    <xi:include href="projects-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-projects-creator-permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="send-projects-membership-invitation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="add-projects-members-from-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="accept-membership-invite.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="suspend-project.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="use-project-view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  
-</chapter>
-
+<section id="projects">
+    <title>Projects</title>
+    <para>Projects are used to organize people and resources. &PRODUCT; users within a single domain can group themselves into project teams so they can collaborate and share virtual resources such as VMs, snapshots, templates, data disks, and IP addresses. &PRODUCT; tracks resource usage per project as well as per user, so the usage can be billed to either a user account or a project. For example, a private cloud within a software company might have all members of the QA department assigned to one project, so the company can track the resources used in testing while the project members can more easily isolate their efforts from other users of the same cloud</para>
+    <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators. Once you have created a project, you become that project’s administrator, and you can add others within your domain to the project. &PRODUCT; can be set up either so that you can add people directly to a project, or so that you have to send an invitation which the recipient must accept. Project members can view and manage all virtual resources created by anyone in the project (for example, share VMs). A user can be a member of any  number of projects and can switch views in the &PRODUCT; UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.</para>
+    <para>The project administrator can pass on the role to another project member.  The project administrator can also add more members, remove members from the project, set new resource limits (as long as they are below the global defaults set by the &PRODUCT; administrator), and delete the project. When the administrator removes a member from the project, resources created by that user, such as VM instances, remain with the project. This brings us to the subject of resource ownership and which resources can be used by a project.</para>
+    <para>Resources created within a project are owned by the project, not by any particular &PRODUCT; account, and they can be used only within the project. A user who belongs to one or more projects can still create resources outside of those projects, and those resources belong to the user’s account; they will not be counted against the project’s usage or resource limits. You can create project-level networks to isolate traffic within the project and provide network services such as port forwarding, load balancing, VPN, and static NAT. A project can also make use of certain types of resources from outside the project, if those resources are shared. For example, a shared network or public template is available to any project in the domain. A project can get access to a private template if the template’s owner will grant permission. A project can use any service offering or disk offering available in its domain; however, you can not create private service and disk offerings a
 t the project level..</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/provisioning-steps-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning-steps-overview.xml b/docs/en-US/provisioning-steps-overview.xml
index daf2cfc..1da4485 100644
--- a/docs/en-US/provisioning-steps-overview.xml
+++ b/docs/en-US/provisioning-steps-overview.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="provisioning-steps-overview">
-	<title>Overview of Provisioning Steps</title>
-	<para>After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.</para>
-	<para>To provision the cloud infrastructure, or to scale it up at any time, follow these procedures:</para>
-	<orderedlist>
-		<listitem><para>Add a zone. See <xref linkend="zone-add" />.</para></listitem>
-		<listitem><para>Add more pods (optional). See <xref linkend="pod-add" />.</para></listitem>
-		<listitem><para>Add more clusters (optional). See <xref linkend="cluster-add" />.</para></listitem>
-		<listitem><para>Add more hosts (optional). See <xref linkend="host-add" />.</para></listitem>
-		<listitem><para>Add primary storage. See <xref linkend="primary-storage-add" />.</para></listitem>
-		<listitem><para>Add secondary storage. See <xref linkend="secondary-storage-add" />.</para></listitem>
-		<listitem><para>Initialize and test the new cloud. See <xref linkend="initialize-and-test" />.</para></listitem>
-	</orderedlist>
-	<para>When you have finished these steps, you will have a deployment with the following basic structure:</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/provisioning-overview.png" />
-		</imageobject>
-		<textobject><phrase>provisioning-overview.png: Conceptual overview of a basic deployment</phrase></textobject>
-	</mediaobject>
+    <title>Overview of Provisioning Steps</title>
+    <para>After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.</para>
+    <para>To provision the cloud infrastructure, or to scale it up at any time, follow these procedures:</para>
+    <orderedlist>
+        <listitem><para>Change the root password. See <xref linkend="changing-root-password" />.</para></listitem>
+        <listitem><para>Add a zone. See <xref linkend="zone-add" />.</para></listitem>
+        <listitem><para>Add more pods (optional). See <xref linkend="pod-add" />.</para></listitem>
+        <listitem><para>Add more clusters (optional). See <xref linkend="cluster-add" />.</para></listitem>
+        <listitem><para>Add more hosts (optional). See <xref linkend="host-add" />.</para></listitem>
+        <listitem><para>Add primary storage. See <xref linkend="primary-storage-add" />.</para></listitem>
+        <listitem><para>Add secondary storage. See <xref linkend="secondary-storage-add" />.</para></listitem>
+        <listitem><para>Initialize and test the new cloud. See <xref linkend="initialize-and-test" />.</para></listitem>
+    </orderedlist>
+    <para>When you have finished these steps, you will have a deployment with the following basic structure:</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/provisioning-overview.png" />
+        </imageobject>
+        <textobject><phrase>provisioning-overview.png: Conceptual overview of a basic deployment</phrase></textobject>
+    </mediaobject>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/provisioning-steps.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml
index 8777b02..fda3e17 100644
--- a/docs/en-US/provisioning-steps.xml
+++ b/docs/en-US/provisioning-steps.xml
@@ -5,26 +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.
 -->
-<chapter id="provisioning-steps">
+
+<section id="provisioning-steps">
     <title>Steps to Provisioning Your Cloud Infrastructure</title>
     <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
     <xi:include href="provisioning-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-root-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="zone-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="pod-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="cluster-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -32,4 +34,4 @@
     <xi:include href="primary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="secondary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="initialize-and-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/release-ip-address.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/release-ip-address.xml b/docs/en-US/release-ip-address.xml
index 9fdccd7..87b5300 100644
--- a/docs/en-US/release-ip-address.xml
+++ b/docs/en-US/release-ip-address.xml
@@ -5,39 +5,37 @@
 ]>
 
 <!-- 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="release-ip-address">
-	<title>Releasing an IP Address</title>
-	<para>When the last rule for an IP address is removed, you can release that IP address. The IP address still belongs to the VPC; however, it can be picked up for any guest network again.</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 release.</para>
-		</listitem>
-		<listitem><para>Click the Release IP button. <inlinemediaobject>
-					<imageobject>
-						<imagedata fileref="./images/release-ip-icon.png"/>
-					</imageobject>
-					<textobject>
-						<phrase>ReleaseIPButton.png: button to release an IP</phrase>
-					</textobject>
-				</inlinemediaobject></para></listitem>		
-	</orderedlist>
+    <title>Releasing an IP Address</title>
+    <orderedlist>
+        <listitem><para>Log in to the CloudPlatform 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 release.</para>
+        </listitem>
+        <listitem><para>Click the Release IP button <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="./images/release-ip-icon.png" />
+            </imageobject>
+            <textobject><phrase>ReleaseIPButton.png: button to release an IP</phrase></textobject>
+        </inlinemediaobject>.</para></listitem>        
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/removing-vsphere-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/removing-vsphere-hosts.xml b/docs/en-US/removing-vsphere-hosts.xml
index 3f819f0..16830b7 100644
--- a/docs/en-US/removing-vsphere-hosts.xml
+++ b/docs/en-US/removing-vsphere-hosts.xml
@@ -1,25 +1,25 @@
 <?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="removing-vsphere-hosts">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/runtime-allocation-virtual-network-resources.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/runtime-allocation-virtual-network-resources.xml b/docs/en-US/runtime-allocation-virtual-network-resources.xml
index 479f069..696ea9b 100644
--- a/docs/en-US/runtime-allocation-virtual-network-resources.xml
+++ b/docs/en-US/runtime-allocation-virtual-network-resources.xml
@@ -5,27 +5,24 @@
 ]>
 
 <!-- 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="runtime-allocation-virtual-network-resources">
     <title>Runtime Allocation of Virtual Network Resources</title>
-    <para>When you define a new virtual network, all your settings for that network are stored in
-        &PRODUCT;. The actual network resources are activated only when the first virtual
-        machine starts in the network. When all virtual machines have left the virtual network, the
-        network resources are garbage collected so they can be allocated again. This helps to
-        conserve network resources.</para>
+    <para>When you define a new virtual network, all your settings for that network are stored in &PRODUCT;. The actual network resources are activated only when the first virtual machine starts in the network.  When all virtual machines have left the virtual network, the network resources are garbage collected so they can be allocated again. This helps to conserve network resources..</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml b/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
index 6b736e4..6364e8b 100644
--- a/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
+++ b/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
@@ -1,30 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 
 <section id="scheduled-maintenance-maintenance-mode-hosts">
     <title>Scheduled Maintenance and Maintenance Mode for Hosts</title>
     <para>You can place a host into maintenance mode. When maintenance mode is activated, the host becomes unavailable to receive new guest VMs, and the guest VMs already running on the host are seamlessly migrated to another host not in maintenance mode. This migration uses live migration technology and does not interrupt the execution of the guest.</para>
-    <xi:include href="vcenter-maintenance-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="xenserver-maintenance-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/secondary-storage-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage-add.xml b/docs/en-US/secondary-storage-add.xml
index de7b69a..15e8c74 100644
--- a/docs/en-US/secondary-storage-add.xml
+++ b/docs/en-US/secondary-storage-add.xml
@@ -5,31 +5,24 @@
 ]>
 
 <!-- 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="secondary-storage-add">
-	<title>Adding Secondary Storage</title>
-    <note><para>Be sure there is nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></note>
-    <para>When you create a new zone, the first secondary storage is added as part of that procedure. You can add secondary storage servers at any time to add more servers to an existing zone.</para>
-    <orderedlist>
-        <listitem><para>If you are going to use Swift for cloud-wide secondary storage, you must add the Swift storage to &PRODUCT; before you add the local zone secondary storage servers.</para></listitem>
-        <listitem><para>To prepare for local zone secondary storage, you should have created and mounted an NFS share during Management Server installation.</para></listitem>
-        <listitem><para>Make sure you prepared the system VM template during Management Server installation.</para></listitem>
-        <listitem><para>4.	Now that the secondary storage server for per-zone storage is prepared, add it to &PRODUCT;. Secondary storage is added as part of the procedure for adding a new zone.</para></listitem>
-    </orderedlist>
+    <title>Adding Secondary Storage</title>
+    <para>TODO</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/secondary-storage-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage-vm.xml b/docs/en-US/secondary-storage-vm.xml
index 34015c3..7926444 100644
--- a/docs/en-US/secondary-storage-vm.xml
+++ b/docs/en-US/secondary-storage-vm.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="secondary-storage-vm">
-     <title>Secondary Storage VM</title>
+    <title>Secondary Storage VM</title>
         <para>In addition to the hosts, &PRODUCT;’s Secondary Storage VM mounts and writes to secondary storage.</para>
-        <para>Submissions to secondary storage go through the Secondary Storage VM.  The Secondary Storage VM can retrieve templates and ISO images from URLs using a variety of protocols.</para>
-   <para> The secondary storage VM provides a background task that takes care of a variety of secondary storage activities: downloading a new template to a Zone, copying templates between Zones, and snapshot backups.</para>
-    <para>The administrator can log in to the secondary storage VM if needed. </para>
-    
-  	</section>
+        <para>Submissions to secondary storage go through the Secondary Storage VM. The Secondary Storage VM can retrieve templates and ISO images from URLs using a variety of protocols.</para>
+        <para>The secondary storage VM provides a background task that takes care of a variety of secondary storage activities: downloading a new template to a Zone, copying templates between Zones, and snapshot backups.</para>
+        <para>The administrator can log in to the secondary storage VM if needed.</para>
+</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage.xml b/docs/en-US/secondary-storage.xml
index 98ea0dc..e755b56 100644
--- a/docs/en-US/secondary-storage.xml
+++ b/docs/en-US/secondary-storage.xml
@@ -1,33 +1,29 @@
 <?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="secondary-storage">
     <title>Secondary Storage</title>
-    <para>This section gives concepts and technical details about &PRODUCT; secondary storage. For information about how to install and configure secondary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
-    <xi:include href="best-practices-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="changing-secondary-storage-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="changing-secondary-storage-servers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="using-swift-for-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <para>This section gives concepts and technical details about &PRODUCT; secondary storage. For information about how to install and configure secondary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
 </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/security-groups.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/security-groups.xml b/docs/en-US/security-groups.xml
index 0745815..fdb4ee9 100644
--- a/docs/en-US/security-groups.xml
+++ b/docs/en-US/security-groups.xml
@@ -1,31 +1,29 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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="security-groups">
-    <title>Using Security Groups to Control Traffic to VMs</title>
-    <xi:include href="about-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="enable-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
     <xi:include href="add-ingress-egress-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/set-up-invitations.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-up-invitations.xml b/docs/en-US/set-up-invitations.xml
index c1303cf..e6a22db 100644
--- a/docs/en-US/set-up-invitations.xml
+++ b/docs/en-US/set-up-invitations.xml
@@ -5,76 +5,69 @@
 ]>
 
 <!-- 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="set-up-invitations">
     <title>Setting Up Invitations</title>
     <para>&PRODUCT; can be set up either so that project administrators can add people directly to a project, or so that it is necessary to send an invitation which the recipient must accept. The invitation can be sent by email or through the user’s &PRODUCT; account. If you want administrators to use invitations to add members to projects, turn on and set up the invitations feature in &PRODUCT;.</para>
-    <orderedlist>
+    <itemizedlist>
         <listitem><para>Log in as administrator to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation, click Global Settings.</para></listitem>
+        <listitem><para>In the search box, type project and click the search button.</para></listitem>
         <listitem><para>In the search box, type project and click the search button.<inlinemediaobject>
             <imageobject>
                 <imagedata fileref="./images/search-button.png" />
             </imageobject>
             <textobject><phrase>searchbutton.png: Searches projects</phrase></textobject>
         </inlinemediaobject></para></listitem>
-        <listitem><para>In the search results, you can see a few other parameters you need to set to control how
-                invitations behave. The table below shows global configuration parameters related to
-                project invitations. Click the edit button to set each parameter.</para>
+        <listitem><para>In the search results, you will see a few other parameters you need to set to control how invitations behave. The table below shows global configuration parameters related to project invitations. Click the edit button to set each parameter</para>
             <informaltable>
                 <tgroup cols="2" align="left" colsep="1" rowsep="1">
                     <thead>
                         <row>
                             <entry><para>Configuration Parameters</para></entry>
-                            <entry><para>Description</para></entry>                                                      
+                            <entry><para>Description</para></entry>
                         </row>
                         </thead>
                         <tbody>
                         <row>
                             <entry><para>project.invite.required</para></entry>
                             <entry><para>Set to true to turn on the invitations feature.</para></entry>
-                            
-                            
                         </row>
                         <row>
                             <entry><para>project.email.sender</para></entry>
                             <entry><para>The email address to show in the From field of invitation emails.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.invite.timeout</para></entry>
                             <entry><para>Amount of time to allow for a new member to respond to the invitation.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.smtp.host</para></entry>
                             <entry><para>Name of the host that acts as an email server to handle invitations.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.smtp.password</para></entry>
                             <entry><para>(Optional) Password required by the SMTP server. You must also set project.smtp.username and set project.smtp.useAuth to true.</para></entry>
-                                
                             </row>
                             <row>
                                 <entry><para>project.smtp.port</para></entry>
                                 <entry><para>SMTP server’s listening port.</para></entry>
-                                
                             </row>
                             <row>
                                 <entry><para>project.smtp.useAuth</para></entry>
@@ -88,9 +81,7 @@
                 </tgroup>
             </informaltable>
         </listitem>
-        <listitem><para>Restart the Management Server:</para>
+        <listitem><para>Restart the Management Server</para>
         <programlisting>service cloud-management restart</programlisting></listitem>
-    </orderedlist>
-    
+    </itemizedlist>
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/set-up-network-for-users.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-up-network-for-users.xml b/docs/en-US/set-up-network-for-users.xml
index c91565a..4e2be48 100644
--- a/docs/en-US/set-up-network-for-users.xml
+++ b/docs/en-US/set-up-network-for-users.xml
@@ -5,27 +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.
 -->
 
-<chapter id="set-up-network-for-users">
+<section id="set-up-network-for-users">
     <title>Setting Up Networking for Users</title>
-    <xi:include href="networks-for-users-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="about-virtual-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="network-service-providers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
+    <para>People using cloud infrastructure have a variety of needs and preferences when it comes to the networking services provided by the cloud. As a &PRODUCT; administrator, you can do the following things to set up networking for your users:</para>
+    <itemizedlist>
+        <listitem><para>Set up physical networks in zones</para></listitem>
+        <listitem><para>Set up several different providers for the same service on a single physical network (for example, both Cisco and Juniper firewalls)</para></listitem>
+        <listitem><para>Bundle different types of network services into network offerings, so users can choose the desired network services for any given virtual machine </para></listitem>
+        <listitem><para>Add new network offerings as time goes on so end users can upgrade to a better class of service on their network</para></listitem>
+        <listitem><para>Provide more ways for a network to be accessed by a user, such as through a project of which the user is a member </para></listitem>
+    </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/set-usage-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-usage-limit.xml b/docs/en-US/set-usage-limit.xml
index 5e2d770..3ef528a 100644
--- a/docs/en-US/set-usage-limit.xml
+++ b/docs/en-US/set-usage-limit.xml
@@ -5,25 +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="set-usage-limit">
     <title>Setting Usage Limits</title>
     <para>&PRODUCT; provides several administrator control points for capping resource usage by users. Some of these limits are global configuration parameters. Others are applied at the ROOT domain and may be overridden on a per-account basis.</para>
     <para>Aggregate limits may be set on a per-domain basis.  For example, you may limit a domain and all subdomains to the creation of 100 VMs.</para>
     <para>This section covers the following topics:</para>
-    </section>
+    <para><xref linkend="globally-configured-limit" />Globally Configured Limits</para>
+    <para><xref linkend="default-account-resource-limit" />Default Account Resource Limits</para>
+    <para><xref linkend="per-domain-limits" />Per Domain Limits</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/shared-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/shared-networks.xml b/docs/en-US/shared-networks.xml
index d5a7ede..d505fed 100644
--- a/docs/en-US/shared-networks.xml
+++ b/docs/en-US/shared-networks.xml
@@ -5,28 +5,26 @@
 ]>
 
 <!-- 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="shared-networks">
     <title>Shared Networks</title>
-    <para>A shared network can be accessed by virtual machines that belong to many different
-        accounts. Network Isolation on shared networks is accomplished using techniques such as
-        security groups (supported only in basic zones in &PRODUCT; 3.0.3 and later
-        versions).</para>
+    <para>A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished using techniques such as security groups (supported only in basic zones in &PRODUCT; 3.0.3).</para>
     <itemizedlist>
         <listitem><para>Shared Networks are created by the administrator</para></listitem>
         <listitem><para>Shared Networks can be designated to a certain domain</para></listitem>
@@ -34,6 +32,4 @@
         <listitem><para>Shared Networks are isolated by security groups</para></listitem>
         <listitem><para>Public Network is a shared network that is not shown to the end users</para></listitem>
         </itemizedlist>
-    
-    
 </section>


Mime
View raw message