cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [45/70] [partial] Adding documents from 4.2
Date Tue, 08 Oct 2013 19:27:49 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/admin-alerts.xml
----------------------------------------------------------------------
diff --git a/en-US/admin-alerts.xml b/en-US/admin-alerts.xml
new file mode 100644
index 0000000..e98f79d
--- /dev/null
+++ b/en-US/admin-alerts.xml
@@ -0,0 +1,128 @@
+<?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 id="external-snmp-manager">
+        <!-- CLOUDSTACK-680 -->
+        <title>Sending Alerts to External SNMP and Syslog Managers</title>
+        <para>In addition to showing administrator alerts on the Dashboard in the &PRODUCT; UI and
+            sending them in email, &PRODUCT; can also send the same alerts to external SNMP or
+            Syslog management software. This is useful if you prefer to use an SNMP or Syslog
+            manager to monitor your cloud.</para>
+        <para>The alerts which can be sent are listed in <xref linkend="alerts"/>. You can also
+            display the most up to date list by calling the API command listAlerts.</para>
+        <section id="snmp-alert-details">
+            <title>SNMP Alert Details</title>
+            <para>The supported protocol is SNMP version 2.</para>
+            <para>Each SNMP trap contains the following information: message, podId, dataCenterId, clusterId, and generationTime.</para>
+        </section>
+        <section id="syslog-alert-details">
+            <title>Syslog Alert Details</title>
+            <para>&PRODUCT; generates a syslog message for every alert. Each syslog message incudes
+                the fields alertType, message, podId, dataCenterId, and clusterId, in the following
+                format. If any field does not have a valid value, it will not be included.</para>
+            <programlisting>Date severity_level Management_Server_IP_Address/Name  alertType:: value dataCenterId:: value  podId:: value  clusterId:: value  message:: value</programlisting>
+            <para>For example:</para>
+            <programlisting>Mar  4 10:13:47    WARN    localhost    alertType:: managementNode message:: Management server node 127.0.0.1 is up</programlisting>
+        </section>
+        <section id="snmp-syslog-config">
+            <title>Configuring SNMP and Syslog Managers</title>
+            <para>To configure one or more SNMP managers or Syslog managers to receive alerts from
+                &PRODUCT;:</para>
+            <orderedlist>
+                <listitem><para>For an SNMP manager, install the &PRODUCT; MIB file on your SNMP manager system.
+                    This maps the SNMP OIDs to trap types that can be more easily read by users.
+                    The file must be publicly available.
+                    For more information on how to install this file, consult the documentation provided with the SNMP manager.</para></listitem>
+                <listitem>
+                    <para>Edit the file /etc/cloudstack/management/log4j-cloud.xml.</para>
+                    <programlisting># vi /etc/cloudstack/management/log4j-cloud.xml</programlisting>
+                </listitem>
+                <listitem>
+                    <para>Add an entry using the syntax shown below. Follow the appropriate example
+                        depending on whether you are adding an SNMP manager or a Syslog manager. To specify
+                        multiple external managers, separate the IP addresses and other configuration values
+                        with commas (,).</para>
+                    <note>
+                        <para>The recommended maximum number of SNMP or Syslog managers is 20 for
+                            each.</para>
+                    </note>
+                    <para/>
+                    <para>The following example shows how to configure two SNMP managers at IP addresses
+                        10.1.1.1 and 10.1.1.2. Substitute your own IP addresses, ports, and communities. Do
+                        not change the other values (name, threshold, class, and layout values).</para>
+                    <programlisting>&lt;appender name="SNMP" class="org.apache.cloudstack.alert.snmp.SnmpTrapAppender"&gt;
+  &lt;param name="Threshold" value="WARN"/&gt;  &lt;!-- Do not edit. The alert feature assumes WARN. --&gt;
+  &lt;param name="SnmpManagerIpAddresses" value="10.1.1.1,10.1.1.2"/&gt;
+  &lt;param name="SnmpManagerPorts" value="162,162"/&gt;
+  &lt;param name="SnmpManagerCommunities" value="public,public"/&gt;
+  &lt;layout class="org.apache.cloudstack.alert.snmp.SnmpEnhancedPatternLayout"&gt; &lt;!-- Do not edit -->
+    &lt;param name="PairDelimeter" value="//"/&gt;
+    &lt;param name="KeyValueDelimeter" value="::"/&gt;
+  &lt;/layout&gt;
+&lt;/appender&gt;</programlisting>
+                    <para>The following example shows how to configure two Syslog managers at IP
+                        addresses 10.1.1.1 and 10.1.1.2. Substitute your own IP addresses. You can
+                        set Facility to any syslog-defined value, such as LOCAL0 - LOCAL7. Do not
+                        change the other values.</para>
+                    <programlisting>&lt;appender name="ALERTSYSLOG"&gt;
+  &lt;param name="Threshold" value="WARN"/&gt;
+  &lt;param name="SyslogHosts" value="10.1.1.1,10.1.1.2"/&gt;
+  &lt;param name="Facility" value="LOCAL6"/&gt;   
+  &lt;layout&gt;
+    &lt;param name="ConversionPattern" value=""/&gt;
+  &lt;/layout&gt;
+&lt;/appender&gt;</programlisting>
+                </listitem>
+                <listitem>
+                    <para>If your cloud has multiple Management Server nodes, repeat these steps to edit
+                        log4j-cloud.xml on every instance.</para>
+                </listitem>
+                <listitem>
+                    <para>If you have made these changes while the Management Server is running, wait a
+                        few minutes for the change to take effect.</para>
+                </listitem>
+            </orderedlist>
+            <para><emphasis role="bold">Troubleshooting:</emphasis> If no alerts appear at the
+                configured SNMP or Syslog manager after a reasonable amount of time, it is likely that
+                there is an error in the syntax of the &lt;appender&gt; entry in log4j-cloud.xml. Check
+                to be sure that the format and settings are correct.</para>
+        </section>
+        <section id="delete-snmp-syslog-manager">
+            <title>Deleting an SNMP or Syslog Manager</title>
+            <para>To remove an external SNMP manager or Syslog manager so that it no longer receives
+                alerts from &PRODUCT;, remove the corresponding entry from the file
+                /etc/cloudstack/management/log4j-cloud.xml.</para>
+        </section>
+    </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/admin-guide.xml
----------------------------------------------------------------------
diff --git a/en-US/admin-guide.xml b/en-US/admin-guide.xml
new file mode 100644
index 0000000..f1b0327
--- /dev/null
+++ b/en-US/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/cloudstack-docs/blob/b23872a5/en-US/adv-zone-topology-req.xml
----------------------------------------------------------------------
diff --git a/en-US/adv-zone-topology-req.xml b/en-US/adv-zone-topology-req.xml
new file mode 100644
index 0000000..3764e92
--- /dev/null
+++ b/en-US/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>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/en-US/advanced-zone-configuration.xml b/en-US/advanced-zone-configuration.xml
new file mode 100644
index 0000000..451b545
--- /dev/null
+++ b/en-US/advanced-zone-configuration.xml
@@ -0,0 +1,385 @@
+<?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="advanced-zone-configuration">
+  <title>Advanced Zone Configuration</title>
+  <orderedlist>
+    <listitem>
+      <para>After you select Advanced in the Add Zone wizard and click Next, you will be asked to
+        enter the following details. Then click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> A name for the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">DNS 1 and 2.</emphasis> These are DNS servers for use by guest
+            VMs in the zone. These DNS servers will be accessed via the public network you will add
+            later. The public IP addresses for the zone must have a route to the DNS server named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis> These are DNS
+            servers for use by system VMs in the zone(these are VMs used by &PRODUCT; itself, such
+            as virtual routers, console proxies,and Secondary Storage VMs.) These DNS servers will
+            be accessed via the management traffic network interface of the System VMs. The private
+            IP address you provide for the pods must have a route to the internal DNS server named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Domain.</emphasis> (Optional) If you want to assign a
+            special domain name to the guest VM network, specify the DNS suffix.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest CIDR.</emphasis> This is the CIDR that describes the IP
+            addresses in use in the guest virtual networks in this zone. For example, 10.1.1.0/24.
+            As a matter of good practice you should set different CIDRs for different zones. This
+            will make it easier to set up VPNs between networks in different zones.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Introduced in version 3.0.1) Choose
+            the hypervisor for the first cluster in the zone. You can add clusters with different
+            hypervisors later, after you finish adding the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public.</emphasis> A public zone is available to all users. A
+            zone that is not public will be assigned to a particular domain. Only users in that
+            domain will be allowed to create guest VMs in this zone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Choose which traffic types will be carried by the physical network.</para>
+      <para>The traffic types are management, public, guest, and storage traffic. For more
+        information about the types, roll over the icons to display their tool tips, or see <xref
+          linkend="advanced-zone-network-traffic-types"/>. This screen starts out with one network
+        already configured. If you have multiple physical networks, you need to add more. Drag and
+        drop traffic types onto a greyed-out network and it will become active. You can move the
+        traffic icons from one network to another; for example, if the default traffic types shown
+        for Network 1 do not match your actual setup, you can move them down. You can also change
+        the network names if desired.</para>
+    </listitem>
+    <listitem>
+      <para>(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on
+        each physical network. These labels must match the labels you have already defined on the
+        hypervisor host. To assign each label, click the Edit button under the traffic type icon
+        within each physical network. A popup dialog appears where you can type the label, then
+        click OK.</para>
+      <para>These traffic labels will be defined only for the hypervisor selected for the first
+        cluster. For all other hypervisors, the labels can be configured after the zone is
+        created.</para>
+      <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you must specify
+        the corresponding Ethernet port profile names as network traffic label for each traffic type
+        on the physical network. For more information on Nexus dvSwitch, see Configuring a vSphere
+        Cluster with Nexus 1000v Virtual Switch in the Installation Guide. If you have enabled
+        VMware dvSwitch in the environment, you must specify the corresponding Switch name as
+        network traffic label for each traffic type on the physical network. For more information,
+        see Configuring a VMware Datacenter with VMware Distributed Virtual Switch in the
+        Installation Guide. </para>
+    </listitem>
+    <listitem>
+      <para>Click Next.</para>
+    </listitem>
+    <listitem>
+      <para>Configure the IP range for public Internet traffic. Enter the following details, then
+        click Add. If desired, you can repeat this step to add more public Internet IP ranges. When
+        done, click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Gateway.</emphasis> The gateway in use for these IP
+            addresses.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask.</emphasis> The netmask associated with this IP
+            range.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN.</emphasis> The VLAN that will be used for public
+            traffic.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start IP/End IP.</emphasis> 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>In a new zone, &PRODUCT; adds the first pod for you. You can always add more pods later.
+        For an overview of what a pod is, see <xref linkend="about-pods"/>.</para>
+      <para>To configure the first pod, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Pod Name.</emphasis> A name for the pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system gateway.</emphasis> The gateway for the hosts
+            in that pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system netmask.</emphasis> The network prefix that
+            defines the pod's subnet. Use CIDR notation.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start/End Reserved System IP.</emphasis> The IP range in the
+            management network that &PRODUCT; uses to manage various system VMs, such as Secondary
+            Storage VMs, Console Proxy VMs, and DHCP. For more information, see <xref
+              linkend="system-reserved-ip-addresses"/>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Specify a range of VLAN IDs to carry guest traffic for each physical network (see VLAN
+        Allocation Example ), then click Next.</para>
+    </listitem>
+    <listitem>
+      <para>In a new pod, &PRODUCT; adds the first cluster for you. You can always add more clusters
+        later. For an overview of what a cluster is, see <xref linkend="about-clusters"/>.</para>
+      <para>To configure the first cluster, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0 only; in 3.0.1, this
+            field is read only) Choose the type of hypervisor software that all hosts in this
+            cluster will run. If you choose VMware, additional fields appear so you can give
+            information about a vSphere cluster. For vSphere servers, we recommend creating the
+            cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add
+            Cluster: vSphere .</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Cluster name.</emphasis> Enter a name for the cluster. This
+            can be text of your choosing and is not used by &PRODUCT;.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first host for you. You can always add more hosts
+        later. For an overview of what a host is, see <xref linkend="about-hosts"/>.</para>
+      <note>
+        <para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already
+          running.</para>
+      </note>
+      <para>Before you can configure the host, you need to install the hypervisor software on the
+        host. You will need to know which version of the hypervisor software version is supported by
+        &PRODUCT; and what additional configuration is required to ensure the host will work with
+        &PRODUCT;. To find these installation details, see:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Citrix XenServer Installation for &PRODUCT;</para>
+        </listitem>
+        <listitem>
+          <para>VMware vSphere Installation and Configuration</para>
+        </listitem>
+        <listitem>
+          <para>KVM Installation and Configuration</para>
+        </listitem>
+        <!-- <listitem>
+          <para>Oracle VM (OVM) Installation and Configuration</para>
+      </listitem> -->
+      </itemizedlist>
+      <para>To configure the first host, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Host Name.</emphasis> The DNS name or IP address of the
+            host.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Username.</emphasis> Usually root.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password.</emphasis> This is the password for the user named
+            above (from your XenServer or KVM install).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to
+            categorize hosts for ease of maintenance. For example, you can set to the cloud's HA tag
+            (set in the ha.tag global configuration parameter) if you want this host to be used only
+            for VMs with the "high availability" feature enabled. For more information, see
+            HA-Enabled Virtual Machines as well as HA for Hosts, both in the Administration
+            Guide.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first primary storage server for you. You can
+        always add more servers later. For an overview of what primary storage is, see <xref
+          linkend="about-primary-storage"/>.</para>
+      <para>To configure the first primary storage server, enter the following, then click
+        Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI,
+            or PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, and RBD. For vSphere choose
+            either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields in the screen vary
+            depending on what you choose here.</para>
+          <informaltable frame="all">
+            <tgroup cols="2" align="left" colsep="1" rowsep="1">
+              <colspec colname="c1"/>
+              <colspec colname="c2"/>
+              <tbody>
+                <row>
+                  <entry><para>NFS</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> The exported path from the
+                          server.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> 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>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>iSCSI</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Target IQN.</emphasis> The IQN of the target.
+                          For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Lun.</emphasis> The LUN number. For example,
+                          3.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> 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>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>preSetup</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">SR Name-Label.</emphasis> Enter the name-label
+                          of the SR that has been set up outside &PRODUCT;.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> 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>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>SharedMountPoint</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> The path on each host that is
+                          where this primary storage is mounted. For example, "/mnt/primary".</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> 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>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>VMFS</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the vCenter server.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> 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><emphasis role="bold">Tags (optional).</emphasis> 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>
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new zone, &PRODUCT; adds the first secondary storage server for you. For an
+        overview of what secondary storage is, see <xref linkend="about-secondary-storage"/>.</para>
+      <para>Before you can fill out this screen, you need to prepare the secondary storage by
+        setting up NFS shares and installing the latest &PRODUCT; System VM template. See Adding
+        Secondary Storage :</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">NFS Server.</emphasis> The IP address of the server or fully
+            qualified domain name of the server.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Launch.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/advanced-zone-guest-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/en-US/advanced-zone-guest-ip-addresses.xml b/en-US/advanced-zone-guest-ip-addresses.xml
new file mode 100644
index 0000000..66bc082
--- /dev/null
+++ b/en-US/advanced-zone-guest-ip-addresses.xml
@@ -0,0 +1,31 @@
+<?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="advanced-zone-guest-ip-addresses">
+  <title>Advanced Zone Guest IP Addresses</title>
+  <para>When advanced networking is used, the administrator can create additional networks for use
+    by the guests. These networks can span the zone and be available to all accounts, or they can be
+    scoped to a single account, in which case only the named account may create guests that attach
+    to these networks. The networks are defined by a VLAN ID, IP range, and gateway. The
+    administrator may provision thousands of these networks if desired. Additionally, the
+    administrator can reserve a part of the IP address space for non-&PRODUCT; VMs and
+    servers.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/advanced-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/en-US/advanced-zone-network-traffic-types.xml b/en-US/advanced-zone-network-traffic-types.xml
new file mode 100644
index 0000000..4d1f465
--- /dev/null
+++ b/en-US/advanced-zone-network-traffic-types.xml
@@ -0,0 +1,34 @@
+<?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="advanced-zone-network-traffic-types">
+	<title>Advanced Zone Network Traffic Types</title>
+    <para>When advanced networking is used, there can be multiple physical networks in the zone. Each physical network can carry one or more traffic types, and  you need to let &PRODUCT; know which type of network traffic you want each network to carry. The traffic types in an advanced zone are:</para>
+    <itemizedlist>
+        <listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. This network can be isolated or shared. In an isolated guest network, the administrator needs to reserve VLAN ranges to provide isolation for each &PRODUCT; account’s network (potentially a large number of VLANs). In a shared guest network, all guest VMs share a single network.</para></listitem>
+        <listitem><para>Management. When &PRODUCT;’s internal resources communicate with each other, they generate management traffic. This includes communication between hosts, system VMs (VMs used by &PRODUCT; to perform various tasks in the cloud), and any other component that communicates directly with the &PRODUCT; Management Server. You must configure the IP range for the system VMs to use.</para></listitem>
+        <listitem><para>Public. Public traffic is generated when VMs in the cloud access the Internet. Publicly accessible IPs must be allocated for this purpose. End users can use the &PRODUCT; UI to acquire these IPs to implement NAT between their guest network and the public network, as described in “Acquiring a New IP Address” in the Administration Guide.</para></listitem>
+        <listitem><para>Storage. While labeled "storage" this is specifically about secondary storage, and doesn't affect traffic for primary storage. This includes traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network.</para></listitem>
+    </itemizedlist>
+    <para>These traffic types can each be on a separate physical network, or they can be combined with certain restrictions. When you use the Add Zone wizard in the UI to create a new zone, you are guided into making only valid choices.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/en-US/advanced-zone-physical-network-configuration.xml b/en-US/advanced-zone-physical-network-configuration.xml
new file mode 100644
index 0000000..cfc6184
--- /dev/null
+++ b/en-US/advanced-zone-physical-network-configuration.xml
@@ -0,0 +1,30 @@
+<?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="advanced-zone-physical-network-configuration">
+  <title>Advanced Zone Physical Network Configuration</title>
+  <para>Within a zone that uses advanced networking, you need to tell the Management Server how the
+    physical network is set up to carry different kinds of traffic in isolation.</para>
+  <xi:include href="configure-guest-traffic-in-advanced-zone.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="configure-public-traffic-in-an-advanced-zone.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="creating-shared-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/advanced-zone-public-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/en-US/advanced-zone-public-ip-addresses.xml b/en-US/advanced-zone-public-ip-addresses.xml
new file mode 100644
index 0000000..82b71d1
--- /dev/null
+++ b/en-US/advanced-zone-public-ip-addresses.xml
@@ -0,0 +1,27 @@
+<?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="advanced-zone-public-ip-addresses">
+    <title>Advanced Zone Public IP Addresses</title>
+    <para>When advanced networking is used, the administrator can create additional networks for use by the guests.  These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks.  The networks are defined by a VLAN ID, IP range, and gateway.  The administrator may provision thousands of these networks if desired.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/alerts.xml
----------------------------------------------------------------------
diff --git a/en-US/alerts.xml b/en-US/alerts.xml
new file mode 100644
index 0000000..ebea4b8
--- /dev/null
+++ b/en-US/alerts.xml
@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<appendix id="alerts">
+		<title>Alerts</title>
+		<para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
+		<programlisting>MEMORY = 0</programlisting>
+		<programlisting>CPU = 1</programlisting>
+		<programlisting>STORAGE =2</programlisting>
+		<programlisting>STORAGE_ALLOCATED = 3</programlisting>
+		<programlisting>PUBLIC_IP = 4</programlisting>
+		<programlisting>PRIVATE_IP = 5</programlisting>
+		<programlisting>HOST = 6</programlisting>
+		<programlisting>USERVM = 7</programlisting>
+		<programlisting>DOMAIN_ROUTER = 8</programlisting>
+		<programlisting>CONSOLE_PROXY = 9</programlisting>
+		<programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
+		<programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
+		<programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
+		<programlisting>USERVM_MIGRATE = 16</programlisting>
+		<programlisting>VLAN = 17</programlisting>
+		<programlisting>SSVM = 18</programlisting>
+		<programlisting>USAGE_SERVER_RESULT = 19</programlisting>
+		<programlisting>STORAGE_DELETE = 20;</programlisting>
+		<programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
+		<programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
+		<programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
+		<programlisting>LOCAL_STORAGE = 24;</programlisting>
+		<programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
+</appendix>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/allocators.xml
----------------------------------------------------------------------
diff --git a/en-US/allocators.xml b/en-US/allocators.xml
new file mode 100644
index 0000000..d8ce2b8
--- /dev/null
+++ b/en-US/allocators.xml
@@ -0,0 +1,28 @@
+<?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="allocators">
+    <title>Allocators</title>
+    <para>&PRODUCT; enables administrators to write custom allocators that will choose the Host to place a new guest and the storage host from which to allocate guest virtual disk images.</para>
+   </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/api-calls.xml
----------------------------------------------------------------------
diff --git a/en-US/api-calls.xml b/en-US/api-calls.xml
new file mode 100644
index 0000000..af4073a
--- /dev/null
+++ b/en-US/api-calls.xml
@@ -0,0 +1,33 @@
+<?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="api-calls">
+    <title>Calling the &PRODUCT; API</title>
+    <xi:include href="making-api-request.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="signing-api-requests.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="enabling-api-call-expiration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="api-throttling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="responses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="asynchronous-commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/api-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/api-overview.xml b/en-US/api-overview.xml
new file mode 100644
index 0000000..a541049
--- /dev/null
+++ b/en-US/api-overview.xml
@@ -0,0 +1,38 @@
+<?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="api-overview">
+  <title>&PRODUCT; API</title>
+  <para>The &PRODUCT; API is a low level API that has been used to implement the &PRODUCT; web UIs.
+    It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF
+    standards.</para>
+  <para>Many &PRODUCT; API calls are asynchronous. These will return a Job ID immediately when
+    called. This Job ID can be used to query the status of the job later. Also, status calls on
+    impacted resources will provide some indication of their state.</para>
+  <para>The API has a REST-like query basis and returns results in XML or JSON.</para>
+  <para>See <ulink
+      url="http://docs.cloudstack.org/CloudStack_Documentation/Developer's_Guide%3A_CloudStack">the
+      Developer’s Guide</ulink> and <ulink
+      url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack">the API
+      Reference</ulink>.</para>
+  <xi:include href="provisioning-auth-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="allocators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="user-data-and-meta-data.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/api-reference.xml
----------------------------------------------------------------------
diff --git a/en-US/api-reference.xml b/en-US/api-reference.xml
new file mode 100644
index 0000000..9a1acc1
--- /dev/null
+++ b/en-US/api-reference.xml
@@ -0,0 +1,24 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+    <section id="api-reference">
+        <title>API Reference Documentation</title>
+        <para>You can find all the API reference documentation at the below site:</para>
+        <para><ulink url="http://cloudstack.apache.org/docs/api/">http://cloudstack.apache.org/docs/api/</ulink></para>
+    </section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/api-throttling.xml
----------------------------------------------------------------------
diff --git a/en-US/api-throttling.xml b/en-US/api-throttling.xml
new file mode 100644
index 0000000..908e223
--- /dev/null
+++ b/en-US/api-throttling.xml
@@ -0,0 +1,67 @@
+<?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="api-throttling">
+  <title>Limiting the Rate of API Requests</title>
+  <para>You can limit the rate at which API requests can be placed for each
+    account. This is useful to avoid malicious attacks on the Management Server, prevent
+    performance degradation, and provide fairness to all accounts.</para>
+  <para>If the number of API calls exceeds the threshold, an error message is returned for any additional API calls.
+    The caller will have to retry these API calls at another time.</para>
+  <section id="api-throttling-configure">
+    <title>Configuring the API Request Rate</title>
+    <para>To control the API request rate, use the following global configuration
+      settings:</para>
+    <itemizedlist>
+      <listitem><para>api.throttling.enabled - Enable/Disable API throttling. By default, this setting is false, so
+        API throttling is not enabled.</para></listitem>
+      <listitem><para>api.throttling.interval (in seconds) - Time interval during which the number of API requests is to be counted.
+        When the interval has passed, the API count is reset to 0.</para></listitem>
+      <listitem><para>api.throttling.max - Maximum number of APIs that can be placed within the api.throttling.interval period.</para></listitem>
+      <listitem><para>api.throttling.cachesize - Cache size for storing API counters.
+        Use a value higher than the total number of accounts managed by the cloud.
+        One cache entry is needed for each account, to store the running API total for that account.
+      </para></listitem>
+    </itemizedlist>
+  </section>
+  <section id="api-throttling-limitations">
+    <title>Limitations on API Throttling</title>
+    <para>The following limitations exist in the current implementation of this feature.</para>
+    <note><para>Even with these limitations, &PRODUCT; is still able to effectively use API throttling to
+      avoid malicious attacks causing denial of service.</para></note>
+    <para/>
+    <itemizedlist>
+      <listitem><para>In a deployment with multiple Management Servers,
+        the cache is not synchronized across them.
+        In this case, &PRODUCT; might not be able to
+        ensure that only the exact desired number of API requests are allowed.
+        In the worst case, the number of API calls that might be allowed is
+        (number of Management Servers) * (api.throttling.max).
+      </para></listitem>
+      <listitem><para>The API commands resetApiLimit and getApiLimit are limited to the
+        Management Server where the API is invoked.
+      </para></listitem>
+    </itemizedlist>        
+  </section>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/append-displayname-vms.xml
----------------------------------------------------------------------
diff --git a/en-US/append-displayname-vms.xml b/en-US/append-displayname-vms.xml
new file mode 100644
index 0000000..592a6e8
--- /dev/null
+++ b/en-US/append-displayname-vms.xml
@@ -0,0 +1,84 @@
+<?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="append-displayname-vms">
+  <title>Appending a Display Name to the Guest VM’s Internal Name</title>
+  <para>Every guest VM has an internal name. The host uses the internal name to identify the guest
+    VMs. &PRODUCT; gives you an option to provide a guest VM with a display name. You can set this
+    display name as the internal name so that the vCenter can use it to identify the guest VM. A new
+    global parameter, vm.instancename.flag, has now been added to achieve this functionality.</para>
+  <para>The default format of the internal name is
+    i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;, where instance.name is a global
+    parameter. However, If vm.instancename.flag is set to true, and if a display name is provided
+    during the creation of a guest VM, the display name is appended to the internal name of the
+    guest VM on the host. This makes the internal name format as
+    i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;displayName&gt;. The default value of vm.instancename.flag
+    is set to false. This feature is intended to make the correlation between instance names and
+    internal names easier in large data center deployments.</para>
+  <para>The following table explains how a VM name is displayed in different scenarios.</para>
+  <informaltable>
+    <tgroup cols="5" align="left" colsep="1" rowsep="1">
+      <colspec colnum="1" colname="c1" colwidth="1.0*"/>
+      <colspec colnum="2" colname="c2" colwidth="1.31*"/>
+      <colspec colnum="3" colname="c3" colwidth="1.07*"/>
+      <colspec colnum="4" colname="c4" colwidth="2.6*"/>
+      <colspec colnum="5" colname="c5" colwidth="4.65*"/>
+      <thead>
+        <row>
+          <entry><para>User-Provided Display Name </para></entry>
+          <entry><para>vm.instancename.flag</para></entry>
+          <entry><para>Hostname on the VM</para></entry>
+          <entry><para>Name on vCenter</para></entry>
+          <entry><para>Internal Name</para></entry>
+        </row>
+      </thead>
+      <tbody>
+        <row>
+          <entry><para>Yes</para></entry>
+          <entry><para>True</para></entry>
+          <entry><para>Display name</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-displayName</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-displayName</para></entry>
+        </row>
+        <row>
+          <entry><para>No</para></entry>
+          <entry><para>True</para></entry>
+          <entry><para>UUID</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+        </row>
+        <row>
+          <entry><para>Yes</para></entry>
+          <entry><para>False</para></entry>
+          <entry><para>Display name</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+        </row>
+        <row>
+          <entry><para>No</para></entry>
+          <entry><para>False</para></entry>
+          <entry><para>UUID</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+          <entry><para>i-&lt;user_id&gt;-&lt;vm_id&gt;-&lt;instance.name&gt;</para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/asynchronous-commands-example.xml
----------------------------------------------------------------------
diff --git a/en-US/asynchronous-commands-example.xml b/en-US/asynchronous-commands-example.xml
new file mode 100644
index 0000000..330f125
--- /dev/null
+++ b/en-US/asynchronous-commands-example.xml
@@ -0,0 +1,106 @@
+<!-- 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="asynchronous-commands-example">
+    <title>Example</title>
+        <para>
+            The following shows an example of using an asynchronous command. Assume the API command:</para>
+        <programlisting>command=deployVirtualMachine&amp;zoneId=1&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=1
+        </programlisting>
+        <para>CloudStack will immediately return a job ID and any other additional data.</para>
+        <programlisting>
+         &lt;deployvirtualmachineresponse&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+             &lt;id&gt;100&lt;/id&gt;
+         &lt;/deployvirtualmachineresponse&gt;
+        </programlisting>
+        <para>Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.</para>
+        <programlisting>command=queryAsyncJobResult&amp;jobId=1</programlisting>
+        <para>Three possible results could come from this query.</para>
+        <para>Job is still pending:</para>
+        <programlisting>
+         &lt;queryasyncjobresult&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+              &lt;jobstatus&gt;0&lt;/jobstatus&gt;
+              &lt;jobprocstatus&gt;1&lt;/jobprocstatus&gt;
+         &lt;/queryasyncjobresult&gt;
+        </programlisting>
+        <para>Job has succeeded:</para>
+        <programlisting>
+            &lt;queryasyncjobresultresponse cloud-stack-version="3.0.1.6"&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt;
+                  &lt;jobstatus&gt;1&lt;/jobstatus&gt;
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                 &lt;jobresultcode&gt;0&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;object&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;
+                    &lt;virtualmachine&gt;
+                    &lt;id&gt;450&lt;/id&gt;
+                    &lt;name&gt;i-2-450-VM&lt;/name&gt;
+                    &lt;displayname&gt;i-2-450-VM&lt;/displayname&gt;
+                    &lt;account&gt;admin&lt;/account&gt;
+                    &lt;domainid&gt;1&lt;/domainid&gt;
+                    &lt;domain&gt;ROOT&lt;/domain&gt;
+                    &lt;created&gt;2011-03-10T18:20:25-0800&lt;/created&gt;
+                    &lt;state&gt;Running&lt;/state&gt;
+                    &lt;haenable&gt;false&lt;/haenable&gt;
+                    &lt;zoneid&gt;1&lt;/zoneid&gt;
+                    &lt;zonename&gt;San Jose 1&lt;/zonename&gt;
+                    &lt;hostid&gt;2&lt;/hostid&gt;
+                    &lt;hostname&gt;905-13.sjc.lab.vmops.com&lt;/hostname&gt;
+                    &lt;templateid&gt;1&lt;/templateid&gt;
+                    &lt;templatename&gt;CentOS 5.3 64bit LAMP&lt;/templatename&gt;
+                    &lt;templatedisplaytext&gt;CentOS 5.3 64bit LAMP&lt;/templatedisplaytext&gt;
+                    &lt;passwordenabled&gt;false&lt;/passwordenabled&gt;
+                    &lt;serviceofferingid&gt;1&lt;/serviceofferingid&gt;
+                    &lt;serviceofferingname&gt;Small Instance&lt;/serviceofferingname&gt;
+                    &lt;cpunumber&gt;1&lt;/cpunumber&gt;
+                    &lt;cpuspeed&gt;500&lt;/cpuspeed&gt;
+                    &lt;memory&gt;512&lt;/memory&gt;
+                    &lt;guestosid&gt;12&lt;/guestosid&gt;
+                    &lt;rootdeviceid&gt;0&lt;/rootdeviceid&gt;
+                    &lt;rootdevicetype&gt;NetworkFilesystem&lt;/rootdevicetype&gt;
+                    &lt;nic&gt;
+                      &lt;id&gt;561&lt;/id&gt;
+                      &lt;networkid&gt;205&lt;/networkid&gt;
+                      &lt;netmask&gt;255.255.255.0&lt;/netmask&gt;
+                      &lt;gateway&gt;10.1.1.1&lt;/gateway&gt;
+                      &lt;ipaddress&gt;10.1.1.225&lt;/ipaddress&gt;
+                      &lt;isolationuri&gt;vlan://295&lt;/isolationuri&gt;
+                      &lt;broadcasturi&gt;vlan://295&lt;/broadcasturi&gt;
+                      &lt;traffictype&gt;Guest&lt;/traffictype&gt;
+                      &lt;type&gt;Virtual&lt;/type&gt;
+                      &lt;isdefault&gt;true&lt;/isdefault&gt;
+                    &lt;/nic&gt;
+                    &lt;hypervisor&gt;XenServer&lt;/hypervisor&gt;
+                   &lt;/virtualmachine&gt;
+                 &lt;/jobresult&gt;
+            &lt;/queryasyncjobresultresponse&gt;
+        </programlisting>
+        <para>Job has failed:</para>
+        <programlisting>
+            &lt;queryasyncjobresult&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt; 
+                  &lt;jobstatus&gt;2&lt;/jobstatus&gt; 
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                  &lt;jobresultcode&gt;551&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;text&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;Unable to deploy virtual machine id = 100 due to not enough capacity&lt;/jobresult&gt; 
+            &lt;/queryasyncjobresult&gt;
+        </programlisting>    
+    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/asynchronous-commands.xml
----------------------------------------------------------------------
diff --git a/en-US/asynchronous-commands.xml b/en-US/asynchronous-commands.xml
new file mode 100644
index 0000000..4c9b59c
--- /dev/null
+++ b/en-US/asynchronous-commands.xml
@@ -0,0 +1,38 @@
+<?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="asynchronous-commands">
+        <title>Asynchronous Commands</title>
+    <para>Asynchronous commands were introduced in &PRODUCT; 2.x. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume.  They differ from synchronous commands by the following:
+        </para>
+        <itemizedlist>
+            <listitem><para>They are identified in the API Reference by an (A).</para></listitem>
+            <listitem><para>They will immediately return a job ID to refer to the job that will be responsible in processing the command.</para></listitem>
+            <listitem><para>If executed as a "create" resource command, it will return the resource ID as well as the job ID.</para>
+                <para>You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.</para>
+            </listitem>
+        </itemizedlist>
+        <xi:include href="job-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="asynchronous-commands-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/attach-iso-to-vm.xml
----------------------------------------------------------------------
diff --git a/en-US/attach-iso-to-vm.xml b/en-US/attach-iso-to-vm.xml
new file mode 100644
index 0000000..8e0d424
--- /dev/null
+++ b/en-US/attach-iso-to-vm.xml
@@ -0,0 +1,40 @@
+<?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="attach-iso-to-vm">
+	<title>Attaching an ISO to a VM</title>
+	<orderedlist>
+		<listitem><para>In the left navigation, click Instances.</para></listitem>
+		<listitem><para>Choose the virtual machine you want to work with.</para></listitem>
+		<listitem><para>Click the Attach ISO button. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/iso-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>iso.png: depicts adding an iso image</phrase>
+					</textobject>
+				</inlinemediaobject></para></listitem>
+		<listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
+		<listitem><para>Click OK.</para></listitem>
+	</orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/en-US/attaching-volume.xml b/en-US/attaching-volume.xml
new file mode 100644
index 0000000..bb9196a
--- /dev/null
+++ b/en-US/attaching-volume.xml
@@ -0,0 +1,61 @@
+<?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="attaching-volume">
+  <title>Attaching a Volume</title>
+  <para>You can attach a volume to a guest VM to provide extra disk storage. Attach a volume when
+    you first create a new volume, when you are moving an existing volume from one VM to another, or
+    after you have migrated a volume from one storage pool to another.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, click Storage.</para>
+    </listitem>
+    <listitem>
+      <para>In Select View, choose Volumes.</para>
+    </listitem>
+    <listitem>
+      <para>Click the volume name in the Volumes list, then click the Attach Disk button<inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/attach-disk-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>AttachDiskButton.png: button to attach a volume</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
+    </listitem>
+    <listitem>
+      <para>In the Instance popup, choose the VM to which you want to attach the volume. You will
+        only see instances to which you are allowed to attach volumes; for example, a user will see
+        only instances created by that user, but the administrator will have more choices.</para>
+      <!-- <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
+    </listitem>
+    <listitem>
+      <para>When the volume has been attached, you should be able to see it by clicking Instances,
+        the instance name, and View Volumes.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/en-US/automatic-snapshot-creation-retention.xml b/en-US/automatic-snapshot-creation-retention.xml
new file mode 100644
index 0000000..54fbe68
--- /dev/null
+++ b/en-US/automatic-snapshot-creation-retention.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="automatic-snapshot-creation-retention">
+  <title>Automatic Snapshot Creation and Retention</title>
+  <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>,
+      <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold"
+    >KVM</emphasis>)</para>
+  <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a
+    disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly
+    interval. One snapshot policy can be set up per disk volume. For example, a user can set up a
+    daily snapshot at 02:30.</para>
+  <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be
+    retained. Older snapshots that exceed the retention limit are automatically deleted. This
+    user-defined limit must be equal to or lower than the global limit set by the &PRODUCT;
+    administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those
+    snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual
+    snapshots can be created and retained.</para>
+</section>
\ No newline at end of file


Mime
View raw message