You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jz...@apache.org on 2013/01/11 22:02:58 UTC

[3/52] [partial] CLOUDSTACK-961: Added dependencies for building RPMs.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-loadbalancer-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-loadbalancer-rule-vpc.xml b/docs/tmp/en-US/xml_tmp/add-loadbalancer-rule-vpc.xml
new file mode 100644
index 0000000..bba3e5a
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-loadbalancer-rule-vpc.xml
@@ -0,0 +1,123 @@
+<?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-loadbalancer-rule-vpc">
+  <title>Adding Load Balancing Rules on a VPC</title>
+  <para>A &PRODUCT; user or administrator may create load balancing rules that balance traffic
+    received at a public IP to one or more VMs that belong to a network tier that provides load
+    balancing service in a VPC. A user creates a rule, specifies an algorithm, and assigns the rule
+    to a set of VMs within a VPC.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+      <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>Gateways</para>
+        </listitem>
+        <listitem>
+          <para>Site-to-Site VPN</para>
+        </listitem>
+        <listitem>
+          <para>Network ACLs</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Select IP Addresses.</para>
+      <para>The IP Addresses page is displayed.</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>Select the tier to which you want to apply the rule.</para>
+      <note>
+        <para>In a VPC, the load balancing service is supported only on a single tier.</para>
+      </note>
+    </listitem>
+    <listitem>
+      <para>Specify 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 that receives the 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 the following well-known algorithms:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Round-robin</para>
+            </listitem>
+            <listitem>
+              <para>Least connections</para>
+            </listitem>
+            <listitem>
+              <para>Source</para>
+            </listitem>
+          </itemizedlist>
+        </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>
+        <listitem>
+          <para><emphasis role="bold">Add VMs</emphasis>: Click Add VMs, then select two or more VMs
+            that will divide the load of incoming traffic, and click Apply.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+  <para>The new load balancing rule appears in the list. You can repeat these steps to add more load
+    balancing rules for this IP address.</para>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-members-to-projects.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-members-to-projects.xml b/docs/tmp/en-US/xml_tmp/add-members-to-projects.xml
new file mode 100644
index 0000000..39c3edf
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-members-to-projects.xml
@@ -0,0 +1,35 @@
+<?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-members-to-projects">
+    <title>Adding Members to a Project</title>
+    <para>New members can be added to a project by the project’s administrator, the domain administrator of the domain where the project resides or any parent domain, or the &PRODUCT; root administrator. There are two ways to add members in &PRODUCT;, but only one way is enabled at a time:</para>
+    <itemizedlist>
+        <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/92d4b214/docs/tmp/en-US/xml_tmp/add-more-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-more-clusters.xml b/docs/tmp/en-US/xml_tmp/add-more-clusters.xml
new file mode 100644
index 0000000..894b4d8
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/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/92d4b214/docs/tmp/en-US/xml_tmp/add-password-management-to-templates.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-password-management-to-templates.xml b/docs/tmp/en-US/xml_tmp/add-password-management-to-templates.xml
new file mode 100644
index 0000000..581e564
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-password-management-to-templates.xml
@@ -0,0 +1,33 @@
+<?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-password-management-to-templates">
+    <title>Adding Password Management to Your Templates</title>
+    <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the &PRODUCT; UI.</para>
+    <para>To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into &PRODUCT;, you can specify whether reset admin/root password feature should be enabled for this template.</para>
+    <para>The password management feature works always resets the account password on instance boot.  The script does an HTTP call to the virtual router to retrieve the account password that should be set.  As long as the virtual router is accessible the guest will have access to the account password that should be used.   When the user requests a password reset the management server generates and sends a new password to the virtual router for the account.  Thus an instance reboot is necessary to effect any password changes.</para>
+    <para>If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.</para>
+    <xi:include href="linux-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="windows-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-portforward-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-portforward-rule-vpc.xml b/docs/tmp/en-US/xml_tmp/add-portforward-rule-vpc.xml
new file mode 100644
index 0000000..c3dbc39
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-portforward-rule-vpc.xml
@@ -0,0 +1,103 @@
+<?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-portforward-vpc">
+  <title>Adding a Port Forwarding Rule on a VPC</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 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 deploy the VMs.</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>Gateways</para>
+        </listitem>
+        <listitem>
+          <para>Site-to-Site VPN</para>
+        </listitem>
+        <listitem>
+          <para>Network ACLs</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Choose an existing IP address or acquire a new IP address. Click the name of the IP
+        address in the list.</para>
+      <para>The IP Addresses page is displayed.</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 Port Forwarding node of the diagram, click View All.</para>
+    </listitem>
+    <listitem>
+      <para>Select the tier to which you want to apply the rule.</para>
+    </listitem>
+    <listitem>
+      <para>Specify 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>
+          <itemizedlist>
+            <listitem>
+              <para>TCP</para>
+            </listitem>
+            <listitem>
+              <para>UDP</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Add VM</emphasis>: Click Add VM. Select the name of the
+            instance to which this rule applies, and click Apply.</para>
+          <para>You can test the rule by opening an ssh session to the instance.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-primary-storage.xml b/docs/tmp/en-US/xml_tmp/add-primary-storage.xml
new file mode 100644
index 0000000..9c7ad3d
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/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>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-projects-members-from-ui.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-projects-members-from-ui.xml b/docs/tmp/en-US/xml_tmp/add-projects-members-from-ui.xml
new file mode 100644
index 0000000..670a0ec
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-projects-members-from-ui.xml
@@ -0,0 +1,37 @@
+<?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-projects-members-from-ui">
+    <title>Adding Project Members From the UI</title>
+    <para>The steps below tell how to add a new member to a project if the invitations feature is not enabled in the cloud. If the invitations feature is enabled cloud,as described in <xref linkend="set-up-invitations"/>, use the procedure in <xref linkend="send-projects-membership-invitation"/>.</para>
+  <orderedlist>
+      <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
+      <listitem><para>In the left navigation, click Projects.</para></listitem>
+      <listitem><para>In Select View, choose Projects.</para></listitem>
+      <listitem><para>Click the name of the project you want to work with.</para></listitem>
+      <listitem><para>Click the Accounts tab. The current members of the project are listed.</para></listitem>
+      <listitem><para>Type the account name of the new member you want to add, and click Add Account. You can add only people who have an account in this cloud and within the same domain as the project.</para></listitem>
+   </orderedlist>
+   </section>
+      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-secondary-storage.xml b/docs/tmp/en-US/xml_tmp/add-secondary-storage.xml
new file mode 100644
index 0000000..318a6ea
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-secondary-storage.xml
@@ -0,0 +1,48 @@
+<?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-secondary-storage">
+  <title>Adding Secondary Storage</title>
+  <note>
+    <para>Be sure there is 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 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>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-security-group.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-security-group.xml b/docs/tmp/en-US/xml_tmp/add-security-group.xml
new file mode 100644
index 0000000..85a6ba0
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-security-group.xml
@@ -0,0 +1,49 @@
+<?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-security-group">
+  <title>Adding a Security Group</title>
+  <para>A user or administrator can define a new security group.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network</para>
+    </listitem>
+    <listitem>
+      <para>In Select view, choose Security Groups.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add Security Group.</para>
+    </listitem>
+    <listitem>
+      <para>Provide a name and description.</para>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+      <para>The new security group appears in the Security Groups Details tab.</para>
+    </listitem>
+    <listitem>
+      <para>To make the security group useful, continue to Adding Ingress and Egress Rules to a
+        Security Group.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-tier.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-tier.xml b/docs/tmp/en-US/xml_tmp/add-tier.xml
new file mode 100644
index 0000000..6beaab2
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-tier.xml
@@ -0,0 +1,89 @@
+<?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-tier">
+  <title>Adding Tiers</title>
+  <para>Tiers are distinct locations within a VPC that act as isolated networks, which do not have
+    access to other tiers by default. Tiers are set up on different VLANs that can communicate with
+    each other by using a virtual router. Tiers provide inexpensive, low latency network
+    connectivity to other tiers within the VPC.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+      <para>All the VPC that you have created for the account is listed in the page.</para>
+      <note>
+        <para>The end users can see their own VPCs, while root and domain admin can see any VPC they
+          are authorized to see.</para>
+      </note>
+    </listitem>
+    <listitem>
+      <para>Click the Configure button of the VPC for which you want to set up tiers.</para>
+      <para>The Add new tier dialog is displayed, as follows:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/add-tier.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>add-tier.png: adding a tier to a vpc.</phrase>
+        </textobject>
+      </mediaobject>
+      <para>If you have already created tiers, the VPC diagram is displayed. Click Create Tier to
+        add a new tier.</para>
+    </listitem>
+    <listitem>
+      <para>Specify the following:</para>
+      <para>All the fields are mandatory.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: A unique name for the tier you create.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Offering</emphasis>: The following default network
+            offerings are listed: DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
+            DefaultIsolatedNetworkOfferingForVpcNetworks</para>
+          <para>In a VPC, only one tier can be created by using LB-enabled network offering.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Gateway</emphasis>: The gateway for the tier you create.
+            Ensure that the gateway is within the Super CIDR range that you specified while creating
+            the VPC, and is not overlapped with the CIDR of any existing tier within the VPC.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask</emphasis>: The netmask for the tier you create. </para>
+          <para>For example, if the VPC CIDR is 10.0.0.0/16 and the network tier CIDR is
+            10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the netmask of the tier is
+            255.255.255.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+    </listitem>
+    <listitem>
+      <para>Continue with configuring access control list for the tier.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-vm-to-tier.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-vm-to-tier.xml b/docs/tmp/en-US/xml_tmp/add-vm-to-tier.xml
new file mode 100644
index 0000000..e401eed
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-vm-to-tier.xml
@@ -0,0 +1,45 @@
+<?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-vm-to-tier">
+  <title>Deploying VMs to the Tier</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 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 deploy the VMs.</para>
+      <para>The VPC page is displayed where all the tiers you created are listed.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Add VM button of the tier for which you want to add a VM.</para>
+      <para>The Add Instance page is displayed.</para>
+      <para>Follow the on-screen instruction to add an instance. For information on adding an
+        instance, see Adding Instances section in the Installation Guide.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/add-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/add-vpc.xml b/docs/tmp/en-US/xml_tmp/add-vpc.xml
new file mode 100644
index 0000000..8c088a0
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/add-vpc.xml
@@ -0,0 +1,75 @@
+<?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-vpc">
+  <title>Adding a Virtual Private Cloud</title>
+  <para>When creating the VPC, you simply provide the zone and a set of IP addresses for the VPC
+    network address space. You specify this set of addresses in the form of a Classless Inter-Domain
+    Routing (CIDR) block.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add VPC. The Add VPC page is displayed as follows:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/add-vpc.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>add-vpc.png: adding a vpc.</phrase>
+        </textobject>
+      </mediaobject>
+      <para>Provide the following information:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: A short name for the VPC that you are
+            creating.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Description</emphasis>: A brief description of the VPC.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Zone</emphasis>: Choose the zone where you want the VPC to be
+            available.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Super CIDR for Guest Networks</emphasis>: Defines the CIDR
+            range for all the tiers (guest networks) within a VPC. When you create a tier, ensure
+            that its CIDR is within the Super CIDR value you enter. The CIDR must be RFC1918
+            compliant.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">DNS domain for Guest Networks</emphasis>: If you want to
+            assign a special domain name, specify the DNS suffix. This parameter is applied to all
+            the tiers within the VPC. That implies, all the tiers you create in the VPC belong to
+            the same DNS domain. If the parameter is not specified, a DNS domain name is generated
+            automatically. </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/added-API-commands-4-0.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/added-API-commands-4-0.xml b/docs/tmp/en-US/xml_tmp/added-API-commands-4-0.xml
new file mode 100644
index 0000000..2d86ba4
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/added-API-commands-4-0.xml
@@ -0,0 +1,164 @@
+<?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="added-API-commands-4.0">
+  <title>Added API Commands in 4.0.0-incubating</title>
+  <itemizedlist>
+    <listitem>
+      <para>createCounter (Adds metric counter)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCounter (Deletes a counter)</para>
+    </listitem>
+    <listitem>
+      <para>listCounters (List the counters)</para>
+    </listitem>
+    <listitem>
+      <para>createCondition (Creates a condition)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCondition (Removes a condition)</para>
+    </listitem>
+    <listitem>
+      <para>listConditions (List Conditions for the specific user)</para>
+    </listitem>
+    <listitem>
+      <para>createTags. Add tags to one or more resources. Example:
+        <programlisting>command=createTags
+&amp;resourceIds=1,10,12
+&amp;resourceType=userVm
+&amp;tags[0].key=region
+&amp;tags[0].value=canada
+&amp;tags[1].key=city
+&amp;tags[1].value=Toronto				</programlisting></para>
+    </listitem>
+    <listitem>
+      <para>deleteTags. Remove tags from one or more resources. Example:
+        <programlisting>command=deleteTags
+&amp;resourceIds=1,12
+&amp;resourceType=Snapshot
+&amp;tags[0].key=city								</programlisting></para>
+    </listitem>
+    <listitem>
+      <para>listTags (Show currently defined resource tags)</para>
+    </listitem>
+    <listitem>
+      <para>createVPC (Creates a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>listVPCs (Lists VPCs)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVPC (Deletes a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>updateVPC (Updates a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>restartVPC (Restarts a VPC)</para>
+    </listitem>
+    <listitem>
+      <para>createVPCOffering (Creates VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>updateVPCOffering (Updates VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVPCOffering (Deletes VPC offering)</para>
+    </listitem>
+    <listitem>
+      <para>listVPCOfferings (Lists VPC offerings)</para>
+    </listitem>
+    <listitem>
+      <para>createPrivateGateway (Creates a private gateway)</para>
+    </listitem>
+    <listitem>
+      <para>listPrivateGateways (List private gateways)</para>
+    </listitem>
+    <listitem>
+      <para>deletePrivateGateway (Deletes a Private gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createNetworkACL (Creates a ACL rule the given network (the network has to belong to
+        VPC))</para>
+    </listitem>
+    <listitem>
+      <para>deleteNetworkACL (Deletes a Network ACL)</para>
+    </listitem>
+    <listitem>
+      <para>listNetworkACLs (Lists all network ACLs)</para>
+    </listitem>
+    <listitem>
+      <para>createStaticRoute (Creates a static route)</para>
+    </listitem>
+    <listitem>
+      <para>deleteStaticRoute (Deletes a static route)</para>
+    </listitem>
+    <listitem>
+      <para>listStaticRoutes (Lists all static routes)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnCustomerGateway (Creates site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnGateway (Creates site to site vpn local gateway)</para>
+    </listitem>
+    <listitem>
+      <para>createVpnConnection (Create site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnCustomerGateway (Delete site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnGateway (Delete site to site vpn gateway)</para>
+    </listitem>
+    <listitem>
+      <para>deleteVpnConnection (Delete site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>updateVpnCustomerGateway (Update site to site vpn customer gateway)</para>
+    </listitem>
+    <listitem>
+      <para>resetVpnConnection (Reset site to site vpn connection)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnCustomerGateways (Lists site to site vpn customer gateways)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnGateways (Lists site 2 site vpn gateways)</para>
+    </listitem>
+    <listitem>
+      <para>listVpnConnections (Lists site to site vpn connection gateways)</para>
+    </listitem>
+    <listitem>
+      <para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para>
+    </listitem>
+    <listitem>
+      <para>listCiscoNexusVSMs (Lists the control VLAN ID, packet VLAN ID, and data VLAN ID, as well
+        as the IP address of the Nexus 1000v dvSwitch.)</para>
+    </listitem>
+  </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/added-API-commands.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/added-API-commands.xml b/docs/tmp/en-US/xml_tmp/added-API-commands.xml
new file mode 100644
index 0000000..208aac2
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/added-API-commands.xml
@@ -0,0 +1,195 @@
+<?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="added-API-commands">
+  <title>Added API commands in 3.0</title>
+  <section id="added-api-commands-3.0.2">
+  <title>Added in 3.0.2</title>
+  <itemizedlist>
+    <listitem>
+      <para>changeServiceForSystemVm</para>
+      <para>Changes the service offering for a system VM (console proxy or secondary storage). The
+        system VM must be in a "Stopped" state for this command to take effect.</para>
+    </listitem>
+  </itemizedlist>
+  </section>
+  <section id="added-api-commands-3.0.1">
+  <title>Added in 3.0.1</title>
+  <itemizedlist>
+    <listitem>
+      <para>changeServiceForSystemVm</para>
+      <para>Changes the service offering for a system VM (console proxy or secondary storage). The
+        system VM must be in a "Stopped" state for this command to take effect.</para>
+    </listitem>
+  </itemizedlist>
+  </section>
+  <section id="added-api-commands-3.0.0">
+  <title>Added in 3.0.0</title>
+  <informaltable frame="all">
+    <tgroup cols="3" align="left" colsep="1" rowsep="1">
+      <colspec colname="c1"/>
+      <colspec colname="c2"/>
+      <colspec colname="c3"/>
+      <tbody>
+        <row>
+          <entry><para>assignVirtualMachine (Move a user VM to another user under same
+              domain.)</para></entry>
+          <entry><para>restoreVirtualMachine (Restore a VM to original template or specific
+              snapshot)</para></entry>
+          <entry><para>createLBStickinessPolicy (Creates a Load Balancer stickiness policy
+            )</para></entry>
+        </row>
+        <row>
+          <entry><para>deleteLBStickinessPolicy (Deletes a LB stickiness policy.)</para></entry>
+          <entry><para>listLBStickinessPolicies (Lists LBStickiness policies.)</para></entry>
+          <entry><para>ldapConfig (Configure the LDAP context for this site.)</para></entry>
+        </row>
+        <row>
+          <entry><para>addSwift (Adds Swift.)</para></entry>
+          <entry><para>listSwifts (List Swift.)</para></entry>
+          <entry><para>migrateVolume (Migrate volume)</para></entry>
+        </row>
+        <row>
+          <entry><para>updateStoragePool (Updates a storage pool.)</para></entry>
+          <entry><para>authorizeSecurityGroupEgress (Authorizes a particular egress rule for this
+              security group)</para></entry>
+          <entry><para>revokeSecurityGroupEgress (Deletes a particular egress rule from this
+              security group)</para></entry>
+        </row>
+        <row>
+          <entry><para>createNetworkOffering (Creates a network offering.)</para></entry>
+          <entry><para>deleteNetworkOffering (Deletes a network offering.)</para></entry>
+          <entry><para>createProject (Creates a project)</para></entry>
+        </row>
+        <row>
+          <entry><para>deleteProject (Deletes a project)</para></entry>
+          <entry><para>updateProject (Updates a project)</para></entry>
+          <entry><para>activateProject (Activates a project)</para></entry>
+        </row>
+        <row>
+          <entry><para>suspendProject (Suspends a project)</para></entry>
+          <entry><para>listProjects (Lists projects and provides detailed information for listed
+              projects)</para></entry>
+          <entry><para>addAccountToProject (Adds acoount to a project)</para></entry>
+        </row>
+        <row>
+          <entry><para>deleteAccountFromProject (Deletes account from the project)</para></entry>
+          <entry><para>listProjectAccounts (Lists project's accounts)</para></entry>
+          <entry><para>listProjectInvitations (Lists an account's invitations to join
+              projects)</para></entry>
+        </row>
+        <row>
+          <entry><para>updateProjectInvitation (Accepts or declines project
+            invitation)</para></entry>
+          <entry><para>deleteProjectInvitation (Deletes a project invitation)</para></entry>
+          <entry><para>updateHypervisorCapabilities (Updates a hypervisor
+            capabilities.)</para></entry>
+        </row>
+        <row>
+          <entry><para>listHypervisorCapabilities (Lists all hypervisor
+            capabilities.)</para></entry>
+          <entry><para>createPhysicalNetwork (Creates a physical network)</para></entry>
+          <entry><para>deletePhysicalNetwork (Deletes a Physical Network.)</para></entry>
+        </row>
+        <row>
+          <entry><para>listPhysicalNetworks (Lists physical networks)</para></entry>
+          <entry><para>updatePhysicalNetwork (Updates a physical network)</para></entry>
+          <entry><para>listSupportedNetworkServices (Lists all network services provided by
+              &PRODUCT; or for the given Provider.)</para></entry>
+        </row>
+        <row>
+          <entry><para>addNetworkServiceProvider (Adds a network serviceProvider to a physical
+              network)</para></entry>
+          <entry><para>deleteNetworkServiceProvider (Deletes a Network Service
+            Provider.)</para></entry>
+          <entry><para>listNetworkServiceProviders (Lists network serviceproviders for a given
+              physical network.)</para></entry>
+        </row>
+        <row>
+          <entry><para>updateNetworkServiceProvider (Updates a network serviceProvider of a physical
+              network)</para></entry>
+          <entry><para>addTrafficType (Adds traffic type to a physical network)</para></entry>
+          <entry><para>deleteTrafficType (Deletes traffic type of a physical network)</para></entry>
+        </row>
+        <row>
+          <entry><para>listTrafficTypes (Lists traffic types of a given physical
+            network.)</para></entry>
+          <entry><para>updateTrafficType (Updates traffic type of a physical network)</para></entry>
+          <entry><para>listTrafficTypeImplementors (Lists implementors of implementor of a network
+              traffic type or implementors of all network traffic types)</para></entry>
+        </row>
+        <row>
+          <entry><para>createStorageNetworkIpRange (Creates a Storage network IP
+            range.)</para></entry>
+          <entry><para>deleteStorageNetworkIpRange (Deletes a storage network IP
+            Range.)</para></entry>
+          <entry><para>listStorageNetworkIpRange (List a storage network IP range.)</para></entry>
+        </row>
+        <row>
+          <entry><para>updateStorageNetworkIpRange (Update a Storage network IP range, only allowed
+              when no IPs in this range have been allocated.)</para></entry>
+          <entry><para>listUsageTypes (List Usage Types)</para></entry>
+          <entry><para>addF5LoadBalancer (Adds a F5 BigIP load balancer device)</para></entry>
+        </row>
+        <row>
+          <entry><para>configureF5LoadBalancer (configures a F5 load balancer device)</para></entry>
+          <entry><para>deleteF5LoadBalancer ( delete a F5 load balancer device)</para></entry>
+          <entry><para>listF5LoadBalancers (lists F5 load balancer devices)</para></entry>
+        </row>
+        <row>
+          <entry><para>listF5LoadBalancerNetworks (lists network that are using a F5 load balancer
+              device)</para></entry>
+          <entry><para>addSrxFirewall (Adds a SRX firewall device)</para></entry>
+          <entry><para>deleteSrxFirewall ( delete a SRX firewall device)</para></entry>
+        </row>
+        <row>
+          <entry><para>listSrxFirewalls (lists SRX firewall devices in a physical
+            network)</para></entry>
+          <entry><para>listSrxFirewallNetworks (lists network that are using SRX firewall
+              device)</para></entry>
+          <entry><para>addNetscalerLoadBalancer (Adds a netscaler load balancer
+            device)</para></entry>
+        </row>
+        <row>
+          <entry><para>deleteNetscalerLoadBalancer ( delete a netscaler load balancer
+            device)</para></entry>
+          <entry><para>configureNetscalerLoadBalancer (configures a netscaler load balancer
+              device)</para></entry>
+          <entry><para>listNetscalerLoadBalancers (lists netscaler load balancer
+            devices)</para></entry>
+        </row>
+        <row>
+          <entry><para>listNetscalerLoadBalancerNetworks (lists network that are using a netscaler
+              load balancer device)</para></entry>
+          <entry><para>createVirtualRouterElement (Create a virtual router element.)</para></entry>
+          <entry><para>configureVirtualRouterElement (Configures a virtual router
+            element.)</para></entry>
+        </row>
+        <row>
+          <entry><para>listVirtualRouterElements (Lists all available virtual router
+              elements.)</para></entry>
+          <entry><para/></entry>
+          <entry><para/></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/added-error-codes.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/added-error-codes.xml b/docs/tmp/en-US/xml_tmp/added-error-codes.xml
new file mode 100644
index 0000000..4436bf3
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/added-error-codes.xml
@@ -0,0 +1,138 @@
+<?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="added-error-codes">
+        <title>Added &PRODUCT; Error Codes</title>
+            <para>You can now find the &PRODUCT;-specific error code in the exception response for each type of exception. The following list of error codes is added to the new class named CSExceptionErrorCode.  These codes are applicable in &PRODUCT; 3.0.3 and later versions.</para>
+    <informaltable frame="all">
+        <tgroup cols="3" align="left" colsep="1" rowsep="1">
+            <colspec colname="c1" />
+            <colspec colname="c2" />
+            <colspec colname="c3" />
+                <tbody>
+                    <row>
+                        <entry><para>4250 : "com.cloud.utils.exception.CloudRuntimeException"</para></entry>
+                        <entry><para>4255 : "com.cloud.utils.exception.ExceptionUtil"</para></entry>
+                        <entry><para>4260 : "com.cloud.utils.exception.ExecutionException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4265 : "com.cloud.utils.exception.HypervisorVersionChangedException"</para></entry>
+                        <entry><para>4270 : "com.cloud.utils.exception.RuntimeCloudException"</para></entry>
+                        <entry><para>4275 : "com.cloud.exception.CloudException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4280 : "com.cloud.exception.AccountLimitException"</para></entry>
+                        <entry><para>4285 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+                        <entry><para>4290 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4295 : "com.cloud.exception.CloudExecutionException"</para></entry>
+                        <entry><para>4300 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+                        <entry><para>4305 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4310 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+                        <entry><para>4315 : "com.cloud.exception.HAStateException"</para></entry>
+                        <entry><para>4320 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4325 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+                        <entry><para>4330 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+                        <entry><para>4335 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4340 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+                        <entry><para>4345 : "com.cloud.exception.InternalErrorException"</para></entry>
+                        <entry><para>4350 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4355 : "com.cloud.exception.ManagementServerException"</para></entry>
+                        <entry><para>4360 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+                        <entry><para>4365 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4370 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+                        <entry><para>4375 : "com.cloud.exception.ResourceInUseException"</para></entry>
+                        <entry><para>4380 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4385 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+                        <entry><para>4390 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+                        <entry><para>4395 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4400 : "com.cloud.exception.AccountLimitException"</para></entry>
+                        <entry><para>4405 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+                        <entry><para>4410 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4415 : "com.cloud.exception.CloudException"</para></entry>
+                        <entry><para>4420 : "com.cloud.exception.CloudExecutionException"</para></entry>
+                        <entry><para>4425 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4430 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+                        <entry><para>4435 : "com.cloud.exception.ConnectionException"</para></entry>
+                        <entry><para>4440 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4445 : "com.cloud.exception.DiscoveryException"</para></entry>
+                        <entry><para>4450 : "com.cloud.exception.HAStateException"</para></entry>
+                        <entry><para>4455 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4460 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+                        <entry><para>4465 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+                        <entry><para>4470 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4475 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+                        <entry><para>4480 : "com.cloud.exception.InsufficientVirtualNetworkCapcityException"</para></entry>
+                        <entry><para>4485 : "com.cloud.exception.InternalErrorException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4490 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+                        <entry><para>4495 : "com.cloud.exception.ManagementServerException"</para></entry>
+                        <entry><para>4500 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4505 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+                        <entry><para>4510 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+                        <entry><para>4515 : "com.cloud.exception.ResourceInUseException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4520 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+                        <entry><para>4525 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+                        <entry><para>4530 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+                    </row>
+                    <row>
+                        <entry><para>4535 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+                        <entry><para>9999 : "com.cloud.api.ServerApiException"</para></entry>
+                        <entry><para></para></entry>
+                    </row>
+                </tbody>
+            </tgroup>
+        </informaltable>
+    </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/adding-IP-addresses-for-the-public-network.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/adding-IP-addresses-for-the-public-network.xml b/docs/tmp/en-US/xml_tmp/adding-IP-addresses-for-the-public-network.xml
new file mode 100644
index 0000000..abf4d02
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/adding-IP-addresses-for-the-public-network.xml
@@ -0,0 +1,45 @@
+<?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="adding-IP-addresses-for-the-public-network">
+    <title>Adding IP Addresses for the Public Network</title>
+    <para>These instructions assume you have already logged in to the &PRODUCT; UI.</para>
+    <orderedlist>
+        <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the desired zone .</para></listitem>
+        <listitem><para>Click the Network tab.</para></listitem>
+        <listitem><para>In the Public node of the diagram, click Configure.</para></listitem>
+        <listitem><para>Click the IP Ranges tab.</para></listitem>
+        <listitem><para>Provide the following information:</para>
+        <itemizedlist>
+            <listitem><para>Gateway. The gateway in use for these IP addresses</para></listitem>
+            <listitem><para>Netmask. The netmask associated with this IP range</para></listitem>
+            <listitem><para>VLAN. The VLAN that will be used for public traffic</para></listitem>
+            <listitem><para>Start IP/End IP. A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
+        </itemizedlist>
+        </listitem>
+        <listitem><para>Click Add.</para></listitem>
+    </orderedlist>
+    
+    
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/additional-installation-options.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/additional-installation-options.xml b/docs/tmp/en-US/xml_tmp/additional-installation-options.xml
new file mode 100644
index 0000000..622ef03
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/additional-installation-options.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<chapter id="additional-installation-options">
+    <title>Additional Installation Options</title>
+    <para>The next few sections describe &PRODUCT; features above and beyond the basic deployment options.</para>
+    <xi:include href="install-usage-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ssl.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="database-replication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/admin-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/admin-alerts.xml b/docs/tmp/en-US/xml_tmp/admin-alerts.xml
new file mode 100644
index 0000000..4e47032
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/admin-alerts.xml
@@ -0,0 +1,36 @@
+<?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="admin-alerts">
+    <title>Administrator Alerts</title>
+    <para>The system provides alerts and events to help with the management of the cloud. Alerts are notices to an administrator, generally delivered by e-mail, notifying the administrator that an error has occurred in the cloud. Alert behavior is configurable.</para>
+    <para>Events track all of the user and administrator actions in the cloud. For example, every guest VM start creates an associated event. Events are stored in the Management Server’s database.</para>
+    <para>Emails will be sent to administrators under the following circumstances:</para>
+    <itemizedlist>
+        <listitem><para>The Management Server cluster runs low on CPU, memory, or storage resources</para></listitem>
+        <listitem><para>The Management Server loses heartbeat from a Host for more than 3 minutes</para></listitem>
+        <listitem><para>The Host cluster runs low on CPU, memory, or storage resources</para></listitem>
+        </itemizedlist>
+    
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/admin-guide.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/admin-guide.xml b/docs/tmp/en-US/xml_tmp/admin-guide.xml
new file mode 100644
index 0000000..f1b0327
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/admin-guide.xml
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<chapter id="admin-guide">
+    <title>Administrator Guide</title>
+    <xi:include href="whats-in-this-adminguide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-working-with-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="vm-lifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="accessing-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="stopping-and-starting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-vm-name-os-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-service-offering-for-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="manual-live-migration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="deleting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <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" />
+    <xi:include href="secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="best-practices-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="secondary-storage-vm.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" />
+    <xi:include href="working-with-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-new-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="upload-existing-volume-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="upload-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="private-public-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="attaching-volume.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="detach-move-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="resizing-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="volume-deletion-garbage-collection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="incremental-snapshots-backup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="volume-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="snapshot-restore.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-traffic.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="using-multiple-guest-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-additional-guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="change-network-offering-on-guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-virtual-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="isolated-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="shared-networks.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" />
+    <xi:include href="runtime-allocation-virtual-network-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-network-offerings.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-load-balancer-rule.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="sticky-session-policies-for-lb-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-ip-ranges.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="acquire-new-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="release-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="enable-disable-static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ip-forwarding-firewalling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="firewall-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="port-forwarding.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ip-load-balancing.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-password-management-to-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="configure-vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="tuning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="cloudstack-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/adv-zone-topology-req.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/adv-zone-topology-req.xml b/docs/tmp/en-US/xml_tmp/adv-zone-topology-req.xml
new file mode 100644
index 0000000..3764e92
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/adv-zone-topology-req.xml
@@ -0,0 +1,25 @@
+<?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="adv-zone-topology-req">
+  <title>Advanced Zone Topology Requirements</title>
+  <para>With Advanced Networking, separate subnets must be used for private and public
+    networks.</para>
+</section>