cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [1/5] git commit: Merged over docs from master
Date Thu, 04 Oct 2012 23:16:09 GMT
Updated Branches:
  refs/heads/4.0 4763997ee -> bd384829d


Merged over docs from master


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bd384829
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bd384829
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bd384829

Branch: refs/heads/4.0
Commit: bd384829da265e39f631e14726712b91c6c72e55
Parents: 4763997
Author: Alex Huang <alex.huang@citrix.com>
Authored: Thu Oct 4 16:15:51 2012 -0700
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Thu Oct 4 16:15:51 2012 -0700

----------------------------------------------------------------------
 docs/en-US/API_Developers_Guide.ent                |   21 +
 docs/en-US/API_Developers_Guide.xml                |   51 ++
 docs/en-US/Admin_Guide.ent                         |   22 +
 docs/en-US/Admin_Guide.xml                         |   51 ++
 docs/en-US/Book_Info_Admin.xml                     |   46 ++
 docs/en-US/CloudStack_Nicira_NVP_Guide.ent         |   22 +
 docs/en-US/CloudStack_Nicira_NVP_Guide.xml         |   54 ++
 docs/en-US/Installation_Guide.ent                  |   22 +
 docs/en-US/Installation_Guide.xml                  |   50 ++
 docs/en-US/add-additional-guest-network.xml        |   92 ++-
 docs/en-US/add-clusters-kvm-xenserver.xml          |   53 ++
 docs/en-US/add-clusters-vsphere.xml                |  121 ++++
 docs/en-US/add-gateway-vpc.xml                     |  104 +++
 docs/en-US/add-ingress-egress-rules.xml            |  172 ++++--
 docs/en-US/add-iso.xml                             |  222 ++++---
 docs/en-US/add-load-balancer-rule.xml              |  110 ++-
 docs/en-US/add-members-to-projects.xml             |    2 +
 docs/en-US/add-more-clusters.xml                   |   29 +
 docs/en-US/add-primary-storage.xml                 |  108 +++
 docs/en-US/add-secondary-storage.xml               |   48 ++
 docs/en-US/add-security-group.xml                  |   70 ++-
 docs/en-US/add-tier.xml                            |   89 +++
 docs/en-US/add-vm-to-tier.xml                      |   45 ++
 docs/en-US/add-vpc.xml                             |   75 ++
 docs/en-US/added-API-commands.xml                  |  487 +++++++++-----
 docs/en-US/advanced-zone-configuration.xml         |  546 ++++++++++-----
 ...dvanced-zone-physical-network-configuration.xml |   41 +-
 docs/en-US/api-overview.xml                        |   38 +
 .../automatic-snapshot-creation-retention.xml      |   50 +-
 docs/en-US/change-to-behavior-of-list-commands.xml |  184 +++---
 docs/en-US/changed-apicommands-4.0.xml             |  268 +++++++
 docs/en-US/choosing_a_deployment_architecture.xml  |   29 +
 docs/en-US/cloudstack.xml                          |   79 ++-
 docs/en-US/cloudstack_admin.ent                    |   22 -
 docs/en-US/cloudstack_admin.xml                    |   51 --
 docs/en-US/cloudstack_developers.ent               |   22 -
 docs/en-US/cloudstack_developers.xml               |   52 --
 docs/en-US/cloudstack_installation.ent             |   22 -
 docs/en-US/cloudstack_installation.xml             |   50 --
 docs/en-US/compute-disk-service-offerings.xml      |   40 +-
 docs/en-US/configure-acl.xml                       |  139 ++++
 .../configure-guest-traffic-in-advanced-zone.xml   |  111 ++--
 ...onfigure-public-traffic-in-an-advanced-zone.xml |   11 +-
 docs/en-US/configuring-projects.xml                |   17 +-
 docs/en-US/create-vpn-connection-vpc.xml           |  103 +++
 docs/en-US/create-vpn-customer-gateway.xml         |  191 +++++
 docs/en-US/create-vpn-gateway-for-vpc.xml          |   80 +++
 docs/en-US/create-vr-network-offering.xml          |  108 +++
 docs/en-US/creating-compute-offerings.xml          |   74 ++-
 docs/en-US/delete-reset-vpn.xml                    |   89 +++
 docs/en-US/enable-disable-static-nat-vpc.xml       |   97 +++
 docs/en-US/global-config.xml                       |   54 ++
 docs/en-US/hypervisor-host-install-flow.xml        |    2 +-
 docs/en-US/hypervisor-host-install-libvirt.xml     |    2 +-
 docs/en-US/hypervisor-host-install-overview.xml    |    2 +-
 docs/en-US/hypervisor-host-install-prepare-os.xml  |    2 +-
 .../hypervisor-host-install-security-policies.xml  |    2 +-
 docs/en-US/images/remove-vpc.png                   |  Bin 0 -> 815 bytes
 docs/en-US/images/remove-vpn.png                   |  Bin 0 -> 735 bytes
 docs/en-US/images/reset-vpn.png                    |  Bin 0 -> 860 bytes
 docs/en-US/large_scale_redundant_setup.xml         |   42 ++
 docs/en-US/multi_node_management_server.xml        |   36 +
 docs/en-US/multi_site_deployment.xml               |   50 ++
 docs/en-US/networks.xml                            |   48 ++
 docs/en-US/plugin-niciranvp-about.xml              |   28 +
 docs/en-US/plugin-niciranvp-devicemanagement.xml   |   47 ++
 docs/en-US/plugin-niciranvp-features.xml           |   29 +
 docs/en-US/plugin-niciranvp-guide.xml              |   31 +
 docs/en-US/plugin-niciranvp-introduction.xml       |   26 +
 docs/en-US/plugin-niciranvp-preparations.xml       |   36 +
 docs/en-US/plugin-niciranvp-provider.xml           |   42 ++
 docs/en-US/plugin-niciranvp-revisions.xml          |   45 ++
 docs/en-US/plugin-niciranvp-tables.xml             |   51 ++
 docs/en-US/plugin-niciranvp-troubleshooting.xml    |   28 +
 docs/en-US/plugin-niciranvp-usage.xml              |   29 +
 docs/en-US/plugin-niciranvp-uuidreferences.xml     |   30 +
 docs/en-US/projects-overview.xml                   |   31 +
 docs/en-US/projects.xml                            |   48 +-
 docs/en-US/provisioning-steps.xml                  |    1 -
 docs/en-US/provisioning.xml                        |   25 +
 docs/en-US/re-install-hosts.xml                    |   26 +
 docs/en-US/release-ip-for-vpc.xml                  |   80 +++
 docs/en-US/release-notes-3.0.4.ent                 |   22 -
 docs/en-US/release-notes.ent                       |   22 +
 docs/en-US/remove-tier.xml                         |   55 ++
 docs/en-US/remove-vpc.xml                          |   68 ++
 docs/en-US/separate_storage_network.xml            |   24 +
 docs/en-US/set-global-project-resource-limits.xml  |   82 +++
 docs/en-US/set-per-project-resource-limits.xml     |   55 ++
 docs/en-US/set-projects-creator-permissions.xml    |   91 ++-
 docs/en-US/set-resource-limits-for-projects.xml    |   42 +-
 docs/en-US/small_scale_deployment.xml              |   37 +
 docs/en-US/storage-overview.xml                    |   27 +
 docs/en-US/suspend-project.xml                     |   14 +-
 docs/en-US/system-service-offerings.xml            |    2 +-
 docs/en-US/ui.xml                                  |   35 +-
 docs/en-US/user-services-overview.xml              |  119 +---
 docs/en-US/virtual-machines.xml                    |   34 +
 docs/publican-adminguide.cfg                       |    3 +-
 docs/publican-devguide.cfg                         |    2 +-
 docs/publican-installation.cfg                     |    2 +-
 docs/publican-plugin-niciranvp.cfg                 |   28 +
 docs/publican-release-notes-4_0.cfg                |   27 -
 docs/publican-release-notes.cfg                    |   27 +
 104 files changed, 5072 insertions(+), 1299 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/API_Developers_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/API_Developers_Guide.ent b/docs/en-US/API_Developers_Guide.ent
new file mode 100644
index 0000000..6e902ac
--- /dev/null
+++ b/docs/en-US/API_Developers_Guide.ent
@@ -0,0 +1,21 @@
+<!-- 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.
+-->
+<!ENTITY PRODUCT "CloudPlatform">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Citrix">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/API_Developers_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/API_Developers_Guide.xml b/docs/en-US/API_Developers_Guide.xml
new file mode 100644
index 0000000..7d55e0d
--- /dev/null
+++ b/docs/en-US/API_Developers_Guide.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book 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.
+-->
+
+<book>
+    <bookinfo id="book-release-notes-3.0.4">
+        <title>&PRODUCT; API Developers Guide</title>
+        <productname>Apache CloudStack</productname>
+        <productnumber>4.0</productnumber>
+        <edition></edition>
+        <pubsnumber></pubsnumber>
+        <abstract>
+            <para>
+                Complete technical documentation of &PRODUCT;.
+            </para>
+        </abstract>
+        <corpauthor>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+                </imageobject>
+            </inlinemediaobject>
+        </corpauthor>
+        <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </bookinfo>
+    <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="developer-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/Admin_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/Admin_Guide.ent b/docs/en-US/Admin_Guide.ent
new file mode 100644
index 0000000..abb1885
--- /dev/null
+++ b/docs/en-US/Admin_Guide.ent
@@ -0,0 +1,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.
+-->
+
+<!ENTITY PRODUCT "CloudStack">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/Admin_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Admin_Guide.xml b/docs/en-US/Admin_Guide.xml
new file mode 100644
index 0000000..b8b90ee
--- /dev/null
+++ b/docs/en-US/Admin_Guide.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book 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.
+-->
+
+<book>
+    <bookinfo id="cloudstack_admin">
+    <title>&PRODUCT; Admin Guide</title>
+    <productname>Apache CloudStack</productname>
+    <productnumber>4.0</productnumber>
+    <edition>1</edition>
+    <pubsnumber></pubsnumber>
+    <abstract>
+        <para>
+            Administration Guide for &PRODUCT;.
+        </para>
+    </abstract>
+    <corpauthor>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+            </imageobject>
+        </inlinemediaobject>
+    </corpauthor>
+    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </bookinfo>
+    <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/Book_Info_Admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Book_Info_Admin.xml b/docs/en-US/Book_Info_Admin.xml
new file mode 100644
index 0000000..6bf89b3
--- /dev/null
+++ b/docs/en-US/Book_Info_Admin.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<bookinfo id="book-cloudstack-admin">
+	<title> Apache CloudStack 4.0
+		Administrator's Guide</title>
+	<subtitle>Revised September 11, 2012 01:32 am Pacific</subtitle>
+	<productname></productname>
+	<productnumber></productnumber>
+	<pubsnumber></pubsnumber>
+	<abstract>
+	    <para>If you have already installed &PRODUCT; or you want to learn more about the ongoing 
+	        operation and maintenance of a &PRODUCT;-powered cloud, read this documentation. It
+	        will help you start using, configuring, and managing the ongoing operation of your cloud.</para>
+	</abstract>
+	<corpauthor>
+		<inlinemediaobject>
+			<imageobject>
+				<imagedata fileref="Common_Content/images/title_logo.png" format="PNG" />
+			</imageobject>
+		</inlinemediaobject>
+	</corpauthor>
+	<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</bookinfo>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/CloudStack_Nicira_NVP_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/CloudStack_Nicira_NVP_Guide.ent b/docs/en-US/CloudStack_Nicira_NVP_Guide.ent
new file mode 100644
index 0000000..abb1885
--- /dev/null
+++ b/docs/en-US/CloudStack_Nicira_NVP_Guide.ent
@@ -0,0 +1,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.
+-->
+
+<!ENTITY PRODUCT "CloudStack">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/CloudStack_Nicira_NVP_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml
new file mode 100644
index 0000000..c535c7c
--- /dev/null
+++ b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book 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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+
+<!-- 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.
+-->
+
+<book>
+    <bookinfo id="cloudstack_plugin_niciranvp">
+    <title>&PRODUCT; Plugin Guide for the Nicira NVP Plugin</title>
+    <productname>Apache CloudStack</productname>
+    <productnumber>4.0</productnumber>
+    <edition>1</edition>
+    <pubsnumber></pubsnumber>
+    <abstract>
+        <para>
+            Plugin Guide for the Nicira NVP Plugin.
+        </para>
+    </abstract>
+    <corpauthor>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+            </imageobject>
+        </inlinemediaobject>
+    </corpauthor>
+    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </bookinfo>
+    <xi:include href="plugin-niciranvp-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-revisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/Installation_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/Installation_Guide.ent b/docs/en-US/Installation_Guide.ent
new file mode 100644
index 0000000..abb1885
--- /dev/null
+++ b/docs/en-US/Installation_Guide.ent
@@ -0,0 +1,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.
+-->
+
+<!ENTITY PRODUCT "CloudStack">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/Installation_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Installation_Guide.xml b/docs/en-US/Installation_Guide.xml
new file mode 100644
index 0000000..06ba791
--- /dev/null
+++ b/docs/en-US/Installation_Guide.xml
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book 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.
+-->
+
+<book>
+    <bookinfo id="book-installation">
+        <title>&PRODUCT; Installation Guide</title>
+        <productname>Apache CloudStack</productname>
+        <productnumber>4.0</productnumber>
+        <edition>1</edition>
+        <pubsnumber></pubsnumber>
+        <abstract>
+            <para>
+                Installation Guide for &PRODUCT;.
+            </para>
+        </abstract>
+        <corpauthor>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+                </imageobject>
+            </inlinemediaobject>
+        </corpauthor>
+        <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </bookinfo>
+    <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-additional-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-additional-guest-network.xml b/docs/en-US/add-additional-guest-network.xml
index 57e7ffd..c684da0 100644
--- a/docs/en-US/add-additional-guest-network.xml
+++ b/docs/en-US/add-additional-guest-network.xml
@@ -3,41 +3,63 @@
 <!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="add-additional-guest-network">
-    <title>Adding an Additional Guest Network</title>
-    <itemizedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>In the left navigation, choose Network</para></listitem>
-        <listitem><para>Click Add guest network. Provide the following information: </para>
-            <itemizedlist>
-                <listitem><para>Name. The name of the network.  This will be user-visible. </para></listitem>
-                <listitem><para>Description. The description of the network.  This will be user-visible.</para></listitem>
-                <listitem><para>Network offering. If the administrator has configured multiple network offerings, select the one you want to use for this network.</para></listitem>
-                <listitem><para>Pod. The name of the pod this network applies to. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod. </para></listitem>
-                <listitem><para>VLAN ID. The VLAN tag for this network.</para></listitem>
-                <listitem><para>Gateway. The gateway that the guests should use.</para></listitem>
-                <listitem><para>Netmask. The netmask in use on the subnet the guests will use.</para></listitem>
-                <listitem><para>Start IP/End IP. Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests.  We strongly recommend the use of multiple NICs. If multiple NICs are used, they may be in a different subnet.  If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.</para></listitem></itemizedlist></listitem>
-        <listitem><para>Click Create.</para></listitem>
-    </itemizedlist>
-
-    </section>
+  <title>Adding an Additional Guest Network</title>
+  <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 Add guest network. Provide the following information: </para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: The name of the network. This will be
+            user-visible. </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Display Text</emphasis>: The description of the network. This
+            will be user-visible.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Zone</emphasis>. The name of the zone this network applies to.
+            Each zone is a broadcast domain, and therefore each zone has a different IP range for
+            the guest network. The administrator must configure the IP range for each zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network offering</emphasis>: If the administrator has
+            configured multiple network offerings, select the one you want to use for this
+            network.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should
+            use.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the
+            guests will use.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Create.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-clusters-kvm-xenserver.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-clusters-kvm-xenserver.xml b/docs/en-US/add-clusters-kvm-xenserver.xml
new file mode 100644
index 0000000..ad57371
--- /dev/null
+++ b/docs/en-US/add-clusters-kvm-xenserver.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="add-clusters-kvm-xenserver">
+  <title>Add Cluster: KVM or XenServer</title>
+  <para>These steps assume you have already installed the hypervisor on the hosts and logged in to
+    the &PRODUCT; UI.</para>
+  <orderedlist>
+    <listitem>
+      <para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the
+        zone in which you want to add the cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Compute tab.</para>
+    </listitem>
+    <listitem>
+      <para>In the Clusters node of the diagram, click View All.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add Cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Choose the hypervisor type for this cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Choose the pod in which you want to create the cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Enter a name for the cluster. This can be text of your choosing and is not used by
+        &PRODUCT;.</para>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-clusters-vsphere.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-clusters-vsphere.xml b/docs/en-US/add-clusters-vsphere.xml
new file mode 100644
index 0000000..d9e78d2
--- /dev/null
+++ b/docs/en-US/add-clusters-vsphere.xml
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="add-clusters-vsphere">
+  <title>Add Cluster: vSphere</title>
+  <para>Host management for vSphere is done through a combination of vCenter and the &PRODUCT; admin
+    UI. &PRODUCT; requires that all hosts be in a &PRODUCT; cluster, but the cluster may consist of
+    a single host. As an administrator you must decide if you would like to use clusters of one host
+    or of multiple hosts. Clusters of multiple hosts allow for features like live migration.
+    Clusters also require shared storage such as NFS or iSCSI.</para>
+  <para>For vSphere servers, we recommend creating the cluster of hosts in vCenter and then adding
+    the entire cluster to &PRODUCT;. Follow these requirements:</para>
+  <itemizedlist>
+    <listitem>
+      <para>Do not put more than 8 hosts in a vSphere cluster</para>
+    </listitem>
+    <listitem>
+      <para>Make sure the hypervisor hosts do not have any VMs already running before you add them
+        to &PRODUCT;.</para>
+    </listitem>
+  </itemizedlist>
+  <para>To add a vSphere cluster to &PRODUCT;:</para>
+  <orderedlist>
+    <listitem>
+      <para>Create the cluster of hosts in vCenter. Follow the vCenter instructions to do this. You
+        will create a cluster that looks something like this in vCenter.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/vsphere-client.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>vsphereclient.png: vSphere client</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>Log in to the 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 cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Compute tab, and click View All on Pods. Choose the pod to which you want to
+        add the cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Click View Clusters.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add Cluster.</para>
+    </listitem>
+    <listitem>
+      <para>In Hypervisor, choose VMware.</para>
+    </listitem>
+    <listitem>
+      <para>Provide the following information in the dialog. The fields below make reference to
+        values from vCenter.</para>
+      <itemizedlist>
+        <listitem>
+          <para>Cluster Name. Enter the name of the cluster you created in vCenter. For example,
+            "cloud.cluster.2.2.1"</para>
+        </listitem>
+        <listitem>
+          <para>vCenter Host. Enter the hostname or IP address of the vCenter server. </para>
+        </listitem>
+        <listitem>
+          <para>vCenter Username. Enter the username that &PRODUCT; should use to connect to
+            vCenter. This user must have all administrative privileges.</para>
+        </listitem>
+        <listitem>
+          <para>vCenter Password. Enter the password for the user named above</para>
+        </listitem>
+        <listitem>
+          <para>vCenter Datacenter. Enter the vCenter datacenter that the cluster is in. For
+            example, "cloud.dc.VM".</para>
+          <para>If you have enabled Nexus dvSwitch in the environment, the following parameters for
+            dvSwitch configuration are displayed:</para>
+        </listitem>
+        <listitem>
+          <para>Nexus dvSwitch IP Address: The IP address of the Nexus VSM appliance.</para>
+        </listitem>
+        <listitem>
+          <para>Nexus dvSwitch Username: The username required to access the Nexus VSM
+            applicance.</para>
+        </listitem>
+        <listitem>
+          <para>Nexus dvSwitch Password: The password associated with the username specified
+            above.</para>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="./images/add-cluster.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>addcluster.png: add cluster</phrase>
+            </textobject>
+          </mediaobject>
+          <para>There might be a slight delay while the cluster is provisioned. It will
+            automatically display in the UI</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-gateway-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
new file mode 100644
index 0000000..616794a
--- /dev/null
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-gateway-vpc">
+  <title>Adding a Private Gateway to a VPC</title>
+  <para>A private gateway can be added by the root admin only. The VPC private network has 1:1
+    relationship with the NIC of the physical network. No gateways with duplicated VLAN and IP are
+    allowed in the same data center.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+      <para>All the VPCs that you have created for the account is listed in the page.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Configure button of the VPC to which you want to configure load balancing
+        rules.</para>
+      <para>The VPC page is displayed where all the tiers you created are listed in a
+        diagram.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Settings icon.</para>
+      <para>The following options are displayed.</para>
+      <itemizedlist>
+        <listitem>
+          <para>IP Addresses</para>
+        </listitem>
+        <listitem>
+          <para>Private Gateways</para>
+        </listitem>
+        <listitem>
+          <para>Site-to-Site VPN</para>
+        </listitem>
+        <listitem>
+          <para>Network ACLs</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Select Private Gateways.</para>
+      <para>The Gateways page is displayed.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add new gateway:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/add-new-gateway-vpc.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>add-new-gateway-vpc.png: adding a private gateway for the VPC.</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>Specify the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Physical Network</emphasis>: The physical network you have
+            created in the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">IP Address</emphasis>: The IP address associated with the VPC
+            gateway.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Gateway</emphasis>: The gateway through which the traffic is
+            routed to and from the VPC.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask</emphasis>: The netmask associated with the VPC
+            gateway.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN</emphasis>: The VLAN associated with the VPC
+            gateway.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The new gateway appears in the list. You can repeat these steps to add more gateway for
+        this VPC.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-ingress-egress-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-ingress-egress-rules.xml b/docs/en-US/add-ingress-egress-rules.xml
index 964045f..2490cec 100644
--- a/docs/en-US/add-ingress-egress-rules.xml
+++ b/docs/en-US/add-ingress-egress-rules.xml
@@ -3,57 +3,129 @@
 <!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="add-ingress-egress-rules">
-    <title>Adding Ingress and Egress Rules to a Security Group</title>
-    <itemizedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>In the left navigation, choose Network</para></listitem>
-        <listitem><para>In Select view, choose Security Groups, then click the security group you want .</para></listitem>
-        <listitem><para>To add an ingress rule, click the Ingress Rules tab and fill out the following fields to specify what network traffic is allowed into VM instances in this security group. If no ingress rules are specified, then no traffic will be allowed in, except for responses to any traffic that has been allowed out through an egress rule.</para>
-        <itemizedlist>
-            <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the source of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow incoming traffic from all VMs in another security group</para></listitem>            
-            <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that sources will use to send traffic to the security group. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
-            <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the incoming traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
-                <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be accepted.</para></listitem>
-            <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To accept only traffic from IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
-            <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To accept only traffic from another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter the same name you used in step 7.</para></listitem>
-        </itemizedlist>
-            <para>The following example allows inbound HTTP access from anywhere:</para>
-            <mediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/http-access.png" />
-                </imageobject>
-                <textobject><phrase>httpaccess.png: allows inbound HTTP access from anywhere</phrase></textobject>
-            </mediaobject>
-        </listitem>
-        <listitem><para>To add an egress rule, click the Egress Rules tab and fill out the following fields to specify what type of traffic is allowed to be sent out of VM instances in this security group. If no egress rules are specified, then all traffic will be allowed out. Once egress rules are specified, the following types of traffic are allowed out: traffic specified in egress rules; queries to DNS and DHCP servers; and responses to any traffic that has been allowed in through an ingress rule</para>
-        <itemizedlist>
-            <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the destination of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow outgoing traffic to all VMs in another security group.</para></listitem>
-            <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that VMs will use to send outgoing traffic. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
-            <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the outgoing traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
-            <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be sent</para></listitem>
-            <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To send traffic only to IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the destination. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
-            <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To allow traffic to be sent to another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter its name.</para></listitem>
-        </itemizedlist></listitem>
-        <listitem><para>Click Add.</para></listitem>    
-    </itemizedlist>
+  <title>Adding Ingress and Egress Rules to a Security Group</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network</para>
+    </listitem>
+    <listitem>
+      <para>In Select view, choose Security Groups, then click the security group you want .</para>
+    </listitem>
+    <listitem>
+      <para>To add an ingress rule, click the Ingress Rules tab and fill out the following fields to
+        specify what network traffic is allowed into VM instances in this security group. If no
+        ingress rules are specified, then no traffic will be allowed in, except for responses to any
+        traffic that has been allowed out through an egress rule.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the source of
+            the traffic will be defined by IP address (CIDR) or an existing security group in a
+            &PRODUCT; account (Account). Choose Account if you want to allow incoming traffic from
+            all VMs in another security group</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol</emphasis>. The networking protocol that sources will
+            use to send traffic to the security group. TCP and UDP are typically used for data
+            exchange and end-user communications. ICMP is typically used to send error messages or
+            network monitoring data.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of
+            listening ports that are the destination for the incoming traffic. If you are opening a
+            single port, use the same number in both fields.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of
+            message and error code that will be accepted.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To accept only traffic
+            from IP addresses within a particular address block, enter a CIDR or a comma-separated
+            list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example,
+            192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To
+            accept only traffic from another security group, enter the &PRODUCT; account and name of
+            a security group that has already been defined in that account. To allow traffic between
+            VMs within the security group you are editing now, enter the same name you used in step
+            7.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The following example allows inbound HTTP access from anywhere:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/http-access.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>httpaccess.png: allows inbound HTTP access from anywhere</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>To add an egress rule, click the Egress Rules tab and fill out the following fields to
+        specify what type of traffic is allowed to be sent out of VM instances in this security
+        group. If no egress rules are specified, then all traffic will be allowed out. Once egress
+        rules are specified, the following types of traffic are allowed out: traffic specified in
+        egress rules; queries to DNS and DHCP servers; and responses to any traffic that has been
+        allowed in through an ingress rule</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the
+            destination of the traffic will be defined by IP address (CIDR) or an existing security
+            group in a &PRODUCT; account (Account). Choose Account if you want to allow outgoing
+            traffic to all VMs in another security group.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol</emphasis>. The networking protocol that VMs will use
+            to send outgoing traffic. TCP and UDP are typically used for data exchange and end-user
+            communications. ICMP is typically used to send error messages or network monitoring
+            data.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of
+            listening ports that are the destination for the outgoing traffic. If you are opening a
+            single port, use the same number in both fields.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of
+            message and error code that will be sent</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To send traffic only to IP
+            addresses within a particular address block, enter a CIDR or a comma-separated list of
+            CIDRs. The CIDR is the base IP address of the destination. For example, 192.168.0.0/22.
+            To allow all CIDRs, set to 0.0.0.0/0.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To
+            allow traffic to be sent to another security group, enter the &PRODUCT; account and name
+            of a security group that has already been defined in that account. To allow traffic
+            between VMs within the security group you are editing now, enter its name.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Add.</para>
+    </listitem>
+  </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-iso.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-iso.xml b/docs/en-US/add-iso.xml
index f56d10c..25986e0 100644
--- a/docs/en-US/add-iso.xml
+++ b/docs/en-US/add-iso.xml
@@ -3,89 +3,149 @@
 <!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="add-iso">
-    <title>Adding an ISO</title>
-    <para>To make additional operating system or other software available for use with guest VMs, you can add an ISO. The ISO is typically thought of as an operating system image, but you can also add ISOs for other types of software, such as desktop applications that you want to be installed as part of a template.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
-        <listitem><para>In the left navigation bar, click Templates.</para></listitem>
-        <listitem><para>In Select View, choose ISOs.</para></listitem>
-        <listitem><para>Click Add ISO.</para></listitem>
-        <listitem><para>In the Add ISO screen, provide the following:</para>
-        <itemizedlist>
-            <listitem><para>Name. Short name for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
-            <listitem><para>Description. Display test for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
-            <listitem><para>URL. The URL that hosts the ISO image. The Management Server must be able to access this location via HTTP. If needed you can place the ISO image directly on the Management Server</para></listitem>
-            <listitem><para>Zone. Choose the zone where you want the ISO to be available, or All Zones to make it available throughout &PRODUCT;.</para></listitem>
-            <listitem><para>Bootable. Whether or not a guest could boot off this ISO image.  For example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable.</para></listitem>
-            <listitem><para>OS Type. This helps &PRODUCT; and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following.</para>
-                <itemizedlist>
-                    <listitem><para>If the operating system of your desired ISO image is listed, choose it.</para></listitem>
-                    <listitem><para>If the OS Type of the ISO is not listed or if the ISO is not bootable, choose Other.</para></listitem>
-                    <listitem><para>(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV (32-bit) or Other PV (64-bit)</para></listitem>
-                    <listitem><para>(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have an IDE root disk. The PV-enabled types are:</para>
-                        <informaltable>
-                            <tgroup cols="3" align="left" colsep="1" rowsep="1">
-                            <tbody>
-                                    <row>
-                                        <entry><para>Fedora 13</para></entry>
-                                        <entry><para>Fedora 12</para></entry>
-                                        <entry><para>Fedora 11</para></entry>
-                                        
-                                    </row>
-                                    <row>
-                                    <entry><para>Fedora 10</para></entry>
-                                    <entry><para>Fedora 9</para></entry>
-                                        <entry><para>Other PV</para></entry>
-                                    
-                                    </row>
-                                    <row>
-                                        <entry><para>Debian GNU/Linux</para></entry>
-                                        <entry><para>CentOS 5.3</para></entry>
-                                        <entry><para>CentOS 5.4</para></entry>
-                                    </row>
-                                    <row>
-                                        <entry><para>CentOS 5.5</para></entry>
-                                        <entry><para>Red Hat Enterprise Linux 5.3</para></entry>
-                                        <entry><para>Red Hat Enterprise Linux 5.4</para></entry>
-                                    </row>
-                                <row>
-                                    <entry><para>Red Hat Enterprise Linux 5.5</para></entry>
-                                    <entry><para>Red Hat Enterprise Linux 6</para></entry>
-                                    <entry></entry>
-                                </row>
-                                </tbody>
-                            </tgroup>
-                        </informaltable></listitem>
-                </itemizedlist>
-                <note><para>Note: It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.</para></note>
-            </listitem>    
-            <listitem><para>Extractable. Choose Yes if the ISO should be available for extraction.</para></listitem>
-            <listitem><para>Public. Choose Yes if this ISO should be available to other users.</para></listitem>
-            <listitem><para>Featured. Choose Yes if you would like this ISO to be more prominent for users to select. The ISO will appear in the Featured ISOs list. Only an administrator can make an ISO Featured.</para></listitem>
-        </itemizedlist></listitem>
-        <listitem><para>Click OK.</para>
-            <para>The Management Server will download the ISO. Depending on the size of the ISO, this may take a long time. The ISO status column will display Ready once it has been successfully downloaded into secondary storage. Clicking Refresh updates the download percentage.</para>
+  <title>Adding an ISO</title>
+  <para>To make additional operating system or other software available for use with guest VMs, you
+    can add an ISO. The ISO is typically thought of as an operating system image, but you can also
+    add ISOs for other types of software, such as desktop applications that you want to be installed
+    as part of a template.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation bar, click Templates.</para>
+    </listitem>
+    <listitem>
+      <para>In Select View, choose ISOs.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add ISO.</para>
+    </listitem>
+    <listitem>
+      <para>In the Add ISO screen, provide the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: Short name for the ISO image. For example,
+            CentOS 6.2 64-bit.</para>
         </listitem>
-        <listitem><para><emphasis role="bold">Important</emphasis>: Wait for the ISO to finish downloading. If you move on to the next task and try to use the ISO right away, it will appear to fail.  The entire ISO must be available before &PRODUCT; can work with it</para></listitem>    
-    </orderedlist>
+        <listitem>
+          <para><emphasis role="bold">Description</emphasis>: Display test for the ISO image. For
+            example, CentOS 6.2 64-bit.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">URL</emphasis>: The URL that hosts the ISO image. The
+            Management Server must be able to access this location via HTTP. If needed you can place
+            the ISO image directly on the Management Server</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Zone</emphasis>: Choose the zone where you want the ISO to be
+            available, or All Zones to make it available throughout &PRODUCT;.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Bootable</emphasis>: Whether or not a guest could boot off
+            this ISO image. For example, a CentOS ISO is bootable, a Microsoft Office ISO is not
+            bootable.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">OS Type</emphasis>: This helps &PRODUCT; and the hypervisor
+            perform certain operations and make assumptions that improve the performance of the
+            guest. Select one of the following.</para>
+          <itemizedlist>
+            <listitem>
+              <para>If the operating system of your desired ISO image is listed, choose it.</para>
+            </listitem>
+            <listitem>
+              <para>If the OS Type of the ISO is not listed or if the ISO is not bootable, choose
+                Other.</para>
+            </listitem>
+            <listitem>
+              <para>(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV
+                (32-bit) or Other PV (64-bit)</para>
+            </listitem>
+            <listitem>
+              <para>(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO
+                will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have
+                an IDE root disk. The PV-enabled types are:</para>
+              <informaltable>
+                <tgroup cols="3" align="left" colsep="1" rowsep="1">
+                  <tbody>
+                    <row>
+                      <entry><para>Fedora 13</para></entry>
+                      <entry><para>Fedora 12</para></entry>
+                      <entry><para>Fedora 11</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Fedora 10</para></entry>
+                      <entry><para>Fedora 9</para></entry>
+                      <entry><para>Other PV</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Debian GNU/Linux</para></entry>
+                      <entry><para>CentOS 5.3</para></entry>
+                      <entry><para>CentOS 5.4</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>CentOS 5.5</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 5.3</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 5.4</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Red Hat Enterprise Linux 5.5</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 6</para></entry>
+                      <entry/>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </informaltable>
+            </listitem>
+          </itemizedlist>
+          <note>
+            <para>It is not recommended to choose an older version of the OS than the version in the
+              image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not
+              work. In these cases, choose Other.</para>
+          </note>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Extractable</emphasis>: Choose Yes if the ISO should be
+            available for extraction.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public</emphasis>: Choose Yes if this ISO should be available
+            to other users.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Featured</emphasis>: Choose Yes if you would like this ISO to
+            be more prominent for users to select. The ISO will appear in the Featured ISOs list.
+            Only an administrator can make an ISO Featured.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+      <para>The Management Server will download the ISO. Depending on the size of the ISO, this may
+        take a long time. The ISO status column will display Ready once it has been successfully
+        downloaded into secondary storage. Clicking Refresh updates the download percentage.</para>
+    </listitem>
+    <listitem>
+      <para><emphasis role="bold">Important</emphasis>: Wait for the ISO to finish downloading. If
+        you move on to the next task and try to use the ISO right away, it will appear to fail. The
+        entire ISO must be available before &PRODUCT; can work with it.</para>
+    </listitem>
+  </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-load-balancer-rule.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-load-balancer-rule.xml b/docs/en-US/add-load-balancer-rule.xml
index ddbce95..8cd0da4 100644
--- a/docs/en-US/add-load-balancer-rule.xml
+++ b/docs/en-US/add-load-balancer-rule.xml
@@ -3,44 +3,80 @@
 <!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="add-load-balancer-rule">
-    <title>Adding a Load Balancer Rule</title>
-    <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 load balance the traffic.</para></listitem>
-        <listitem><para>Click View IP Addresses.</para></listitem>
-        <listitem><para>Click the IP address for which you want to create the rule, then click the Configuration tab.</para></listitem>
-        <listitem><para>In the Load Balancing node of the diagram, click View All.</para></listitem>
-        <listitem><para>Fill in the following:</para>        
-        <itemizedlist>
-            <listitem><para>Name. A name for the load balancer rule.</para></listitem>            
-            <listitem><para>Public Port. The port receiving incoming traffic to be balanced.</para></listitem>
-            <listitem><para>Private Port. The port that the VMs will use to receive the traffic.</para></listitem>
-            <listitem><para>Algorithm. Choose the load balancing algorithm you want &PRODUCT; to use. &PRODUCT; supports a variety of well-known algorithms. If you are not familiar with these choices, you will find plenty of information about them on the Internet.</para></listitem>
-            <listitem><para>Stickiness. (Optional) Click Configure and choose the algorithm for the stickiness policy. See Sticky Session Policies for Load Balancer Rules.</para></listitem>
-        </itemizedlist></listitem>    
-        <listitem><para>Click Add VMs, then select two or more VMs that will divide the load of incoming traffic, and click Apply.</para>
-        <para>The new load balancer rule appears in the list. You can repeat these steps to add more load balancer rules for this IP address.</para>
-        </listitem>    
-    </orderedlist>
+  <title>Adding a Load Balancer Rule</title>
+  <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 load balance the traffic.</para>
+    </listitem>
+    <listitem>
+      <para>Click View IP Addresses.</para>
+    </listitem>
+    <listitem>
+      <para>Click the IP address for which you want to create the rule, then click the Configuration
+        tab.</para>
+    </listitem>
+    <listitem>
+      <para>In the Load Balancing node of the diagram, click View All.</para>
+      <para>In a Basic zone, you can also create a load balancing rule without acquiring or
+        selecting an IP address. &PRODUCT; internally assign an IP when you create the load
+        balancing rule, which is listed in the IP Addresses page when the rule is created. </para>
+      <para>To do that, select the name of the network, then click Add Load Balancer tab. Continue
+        with <xref linkend="config-lb"/>.</para>
+    </listitem>
+    <listitem id="config-lb">
+      <para>Fill in the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: A name for the load balancer rule.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public Port</emphasis>: The port receiving incoming traffic to
+            be balanced.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Private Port</emphasis>: The port that the VMs will use to
+            receive the traffic.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Algorithm</emphasis>: Choose the load balancing algorithm you
+            want &PRODUCT; to use. &PRODUCT; supports a variety of well-known algorithms. If you are
+            not familiar with these choices, you will find plenty of information about them on the
+            Internet.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Stickiness</emphasis>: (Optional) Click Configure and choose
+            the algorithm for the stickiness policy. See Sticky Session Policies for Load Balancer
+            Rules.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Add VMs, then select two or more VMs that will divide the load of incoming
+        traffic, and click Apply.</para>
+      <para>The new load balancer rule appears in the list. You can repeat these steps to add more
+        load balancer rules for this IP address.</para>
+    </listitem>
+  </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-members-to-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-members-to-projects.xml b/docs/en-US/add-members-to-projects.xml
index a51726e..39c3edf 100644
--- a/docs/en-US/add-members-to-projects.xml
+++ b/docs/en-US/add-members-to-projects.xml
@@ -29,5 +29,7 @@
         <listitem><para>If invitations have been enabled, you can send invitations to new members.</para></listitem>
         <listitem><para>If invitations are not enabled, you can add members directly through the UI.</para></listitem>
     </itemizedlist>
+    <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" />
    </section>
       

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-more-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-more-clusters.xml b/docs/en-US/add-more-clusters.xml
new file mode 100644
index 0000000..a2e41e3
--- /dev/null
+++ b/docs/en-US/add-more-clusters.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="add-more-clusters">
+  <title>Add More Clusters (Optional)</title>
+  <para>You need to tell &PRODUCT; about the hosts that it will manage. Hosts exist inside clusters,
+    so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
+  <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bd384829/docs/en-US/add-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-primary-storage.xml b/docs/en-US/add-primary-storage.xml
new file mode 100644
index 0000000..9c7ad3d
--- /dev/null
+++ b/docs/en-US/add-primary-storage.xml
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="add-primary-storage">
+  <title>Adding Primary Storage</title>
+  <note>
+    <para>Ensure that nothing stored on the server. Adding the server to CloudStack 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>
+</section>


Mime
View raw message