cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [27/51] [partial] Adding documents from 4.2
Date Wed, 02 Oct 2013 14:23:28 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/remove-member-from-project.xml
----------------------------------------------------------------------
diff --git a/en-US/remove-member-from-project.xml b/en-US/remove-member-from-project.xml
new file mode 100644
index 0000000..dcd3746
--- /dev/null
+++ b/en-US/remove-member-from-project.xml
@@ -0,0 +1,44 @@
+<?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="remove-member-from-project">
+    <title>Removing a Member From a Project</title>
+    <para>When a member is removed from a project, the member’s resources continue to be owned by the project. The former project member cannot create any new resources within the project or use any of the project’s existing resources.</para>
+    <para>A member of a project can be removed by the project administrator, the domain administrator of the domain the project belongs to or of its parent domain, or the &PRODUCT; root administrator.</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.</para></listitem>
+        <listitem><para>Click the Accounts tab.</para></listitem>
+        <listitem><para>Click the name of the member.</para></listitem>
+        <listitem><para>Click the Delete button.<inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="./images/delete-button.png" />
+            </imageobject>
+            <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
+        </inlinemediaobject></para></listitem>
+   </orderedlist>
+   </section>
+      

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/remove-tier.xml
----------------------------------------------------------------------
diff --git a/en-US/remove-tier.xml b/en-US/remove-tier.xml
new file mode 100644
index 0000000..701645c
--- /dev/null
+++ b/en-US/remove-tier.xml
@@ -0,0 +1,57 @@
+<?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="remove-tier">
+  <title>Removing Tiers</title>
+  <para>You can remove a tier from a VPC. A removed tier cannot be revoked. When a tier is removed,
+    only the resources of the tier are expunged. All the network rules (port forwarding, load
+    balancing and staticNAT) and the IP addresses associated to the tier are removed. The IP address
+    still be belonging to the same 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>
+    </listitem>
+    <listitem>
+      <para>Click the Configure button of the VPC for which you want to set up tiers.</para>
+      <para>The Configure VPC page is displayed. Locate the tier you want to work with.</para>
+    </listitem>
+    <listitem>
+      <para>Select the tier you want to remove.</para>
+    </listitem>
+    <listitem>
+      <para>In the Network Details tab, click the Delete Network button.
+      <inlinemediaobject><imageobject>
+        <imagedata fileref="./images/del-tier.png"/>
+      </imageobject>
+      <textobject>
+            <phrase>del-tier.png: button to remove a tier</phrase>
+          </textobject>
+      </inlinemediaobject></para>
+      <para>Click Yes to confirm. Wait for some time for the tier to be removed.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/remove-vpc.xml
----------------------------------------------------------------------
diff --git a/en-US/remove-vpc.xml b/en-US/remove-vpc.xml
new file mode 100644
index 0000000..b373f1a
--- /dev/null
+++ b/en-US/remove-vpc.xml
@@ -0,0 +1,69 @@
+<?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="remove-vpc">
+  <title>Editing, Restarting, and Removing a Virtual Private Cloud</title>
+  <note>
+    <para>Ensure that all the tiers are removed before you remove a VPC.</para>
+  </note>
+  <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>Select the VPC you want to work with.</para>
+    </listitem>
+    <listitem>
+      <para>In the Details tab, click the Remove VPC button<inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/remove-vpc.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>remove-vpc.png: button to remove a VPC</phrase>
+          </textobject>
+      </inlinemediaobject></para>
+      <para>You can remove the VPC by also using the remove button in the Quick View.</para>
+      <para>You can edit the name and description of a VPC. To do that, select the VPC, then click
+        the Edit button. <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/edit-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>edit-icon.png: button to edit a VPC</phrase>
+          </textobject>
+        </inlinemediaobject></para>
+      <para>To restart a VPC, select the VPC, then click the Restart button.<inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/restart-vpc.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>restart-vpc.png: button to restart a VPC</phrase>
+          </textobject>
+        </inlinemediaobject></para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/removed-API-commands.xml
----------------------------------------------------------------------
diff --git a/en-US/removed-API-commands.xml b/en-US/removed-API-commands.xml
new file mode 100644
index 0000000..51bb7cf
--- /dev/null
+++ b/en-US/removed-API-commands.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+    <section id="removed-API-commands">
+        <title>Removed API commands</title>
+            <itemizedlist>
+            <listitem><para>createConfiguration (Adds configuration value)</para></listitem>
+            <listitem><para>configureSimulator (Configures simulator)</para></listitem>
+            </itemizedlist>
+    </section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/removed-api-4.2.xml
----------------------------------------------------------------------
diff --git a/en-US/removed-api-4.2.xml b/en-US/removed-api-4.2.xml
new file mode 100644
index 0000000..596d316
--- /dev/null
+++ b/en-US/removed-api-4.2.xml
@@ -0,0 +1,144 @@
+<?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="removed-api-4.2">
+  <title>Deprecated APIs</title>
+  <itemizedlist>
+    <listitem>
+      <para>deleteCiscoNexusVSM (Deletes a Cisco Nexus VSM device) </para>
+    </listitem>
+    <listitem>
+      <para>enableCiscoNexusVSM (Enables a Cisco Nexus VSM device) </para>
+    </listitem>
+    <listitem>
+      <para>disableCiscoNexusVSM (Disables a Cisco Nexus VSM device) </para>
+    </listitem>
+    <listitem>
+      <para>listCiscoNexusVSMs (Retrieves a Cisco Nexus 1000v Virtual Switch Manager device
+        associated with a Cluster) </para>
+    </listitem>
+    <listitem>
+      <para>addBaremetalHost (Adds a new host.) </para>
+    </listitem>
+    <listitem>
+      <para>addExternalFirewall (Adds an external firewall appliance) </para>
+    </listitem>
+    <listitem>
+      <para>deleteExternalFirewall (Deletes an external firewall appliance.) </para>
+    </listitem>
+    <listitem>
+      <para>listExternalFirewalls (Lists external firewall appliances.) </para>
+    </listitem>
+    <listitem>
+      <para>addExternalLoadBalancer (Adds F5 external load balancer appliance.) </para>
+    </listitem>
+    <listitem>
+      <para>deleteExternalLoadBalancer (Deletes a F5 external load balancer appliance added in a
+        zone.) </para>
+    </listitem>
+    <listitem>
+      <para>listExternalLoadBalancers (Lists F5 external load balancer appliances added in a
+        zone.) </para>
+    </listitem>
+    <listitem>
+      <para>createVolumeOnFiler (Creates a volume.) </para>
+    </listitem>
+    <listitem>
+      <para>destroyVolumeOnFiler (Destroys a volume.) </para>
+    </listitem>
+    <listitem>
+      <para>listVolumesOnFiler (Lists volumes.) </para>
+    </listitem>
+    <listitem>
+      <para>createLunOnFiler (Creates a LUN from a pool.) </para>
+    </listitem>
+    <listitem>
+      <para>destroyLunOnFiler (Destroys a LUN.) </para>
+    </listitem>
+    <listitem>
+      <para>listLunsOnFiler (Lists LUN.) </para>
+    </listitem>
+    <listitem>
+      <para>associateLun (Associates a LUN with a guest IQN.) </para>
+    </listitem>
+    <listitem>
+      <para>dissociateLun (Dissociates a LUN.) </para>
+    </listitem>
+    <listitem>
+      <para>createPool (Creates a pool.) </para>
+    </listitem>
+    <listitem>
+      <para>deletePool (Deletes a pool.) </para>
+    </listitem>
+    <listitem>
+      <para>modifyPool (Modifies pool.) </para>
+    </listitem>
+    <listitem>
+      <para>listPools (Lists pool.) </para>
+    </listitem>
+    <listitem>
+      <para>addF5LoadBalancer (Adds a F5 BigIP load balancer device.) </para>
+    </listitem>
+    <listitem>
+      <para>configureF5LoadBalancer (Configures a F5 load balancer device.) </para>
+    </listitem>
+    <listitem>
+      <para>deleteF5LoadBalancer (Deletes a F5 load balancer device.) </para>
+    </listitem>
+    <listitem>
+      <para>listF5LoadBalancers (Lists F5 load balancer devices.) </para>
+    </listitem>
+    <listitem>
+      <para>listF5LoadBalancerNetworks (Lists network that are using a F5 load balancer device.)
+      </para>
+    </listitem>
+    <listitem>
+      <para>addSrxFirewall (Adds a SRX firewall device.) </para>
+    </listitem>
+    <listitem>
+      <para>deleteSrxFirewall (Deletes a SRX firewall device.) </para>
+    </listitem>
+    <listitem>
+      <para>configureSrxFirewall (Configures a SRX firewall device) </para>
+    </listitem>
+    <listitem>
+      <para>listSrxFirewalls (Lists SRX firewall devices in a physical network) </para>
+    </listitem>
+    <listitem>
+      <para>listSrxFirewallNetworks (Lists network that are using SRX firewall device) </para>
+    </listitem>
+    <listitem>
+      <para>addNetscalerLoadBalancer (Adds a netscaler load balancer device) </para>
+    </listitem>
+    <listitem>
+      <para>deleteNetscalerLoadBalancer (Deletes a netscaler load balancer device) </para>
+    </listitem>
+    <listitem>
+      <para>configureNetscalerLoadBalancer (Configures a netscaler load balancer device) </para>
+    </listitem>
+    <listitem>
+      <para>listNetscalerLoadBalancers (Lists netscaler load balancer devices) </para>
+    </listitem>
+    <listitem>
+      <para>listNetscalerLoadBalancerNetworks (Lists network that are using a netscaler load
+        balancer device) </para>
+    </listitem>
+  </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/removing-hosts.xml
----------------------------------------------------------------------
diff --git a/en-US/removing-hosts.xml b/en-US/removing-hosts.xml
new file mode 100644
index 0000000..468f36e
--- /dev/null
+++ b/en-US/removing-hosts.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<section id="removing-hosts">
+    <title>Removing Hosts</title>
+    <para>Hosts can be removed from the cloud as needed. The procedure to remove a host depends on the hypervisor type.</para>
+    <xi:include href="removing-xenserver-kvm-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="removing-vsphere-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/removing-vsphere-hosts.xml
----------------------------------------------------------------------
diff --git a/en-US/removing-vsphere-hosts.xml b/en-US/removing-vsphere-hosts.xml
new file mode 100644
index 0000000..3f819f0
--- /dev/null
+++ b/en-US/removing-vsphere-hosts.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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="removing-vsphere-hosts">
+    <title>Removing vSphere Hosts</title>
+    <para>To remove this type of host, first place it in maintenance mode, as described in <xref linkend="scheduled-maintenance-maintenance-mode-hosts"/>. Then use &PRODUCT; to remove the host. &PRODUCT; will not direct commands to a host that has been removed using &PRODUCT;. However, the host may still exist in the vCenter cluster.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/removing-xenserver-kvm-hosts.xml
----------------------------------------------------------------------
diff --git a/en-US/removing-xenserver-kvm-hosts.xml b/en-US/removing-xenserver-kvm-hosts.xml
new file mode 100644
index 0000000..c704372
--- /dev/null
+++ b/en-US/removing-xenserver-kvm-hosts.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="removing-xenserver-kvm-hosts">
+    <title>Removing XenServer and KVM Hosts</title>
+    <para>A node cannot be removed from a cluster until it has been placed in maintenance mode.  This will ensure that all of the VMs on it have been migrated to other Hosts.  To remove a Host from the cloud:</para>
+    <orderedlist>
+        <listitem><para>Place the node in maintenance mode.</para><para> See <xref linkend="scheduled-maintenance-maintenance-mode-hosts"/>.</para></listitem>
+        <listitem><para>For KVM, stop the cloud-agent service.</para></listitem>
+        <listitem><para>Use the UI option to remove the node.</para><para>Then you may power down the Host, re-use its IP address, re-install it, etc</para></listitem>
+    </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/requirements-templates.xml
----------------------------------------------------------------------
diff --git a/en-US/requirements-templates.xml b/en-US/requirements-templates.xml
new file mode 100644
index 0000000..f434dbe
--- /dev/null
+++ b/en-US/requirements-templates.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="requirements-templates">
+    <title>Requirements for Templates</title>
+    <itemizedlist>
+        <listitem><para>For XenServer, install PV drivers / Xen tools on each template that you create.  This will enable live migration and clean guest shutdown.</para></listitem>
+        <listitem><para>For vSphere, install VMware Tools on each template that you create.  This will enable console view to work properly.</para></listitem>
+</itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/reserved-ip-addresses-non-csvms.xml
----------------------------------------------------------------------
diff --git a/en-US/reserved-ip-addresses-non-csvms.xml b/en-US/reserved-ip-addresses-non-csvms.xml
new file mode 100644
index 0000000..0f20b63
--- /dev/null
+++ b/en-US/reserved-ip-addresses-non-csvms.xml
@@ -0,0 +1,166 @@
+<?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="reserved-ip-addresses-non-csvms">
+  <title>IP Reservation in Isolated Guest Networks</title>
+  <para>In isolated guest networks, a part of the guest IP address space can be reserved for
+    non-&PRODUCT; VMs or physical servers. To do so, you configure a range of Reserved IP addresses
+    by specifying the CIDR when a guest network is in Implemented state. If your customers wish to
+    have non-&PRODUCT; controlled VMs or physical servers on the same network, they can share a part
+    of the IP address space that is primarily provided to the guest network.</para>
+  <para>In an Advanced zone, an IP address range or a CIDR is assigned to a network when the network
+    is defined. The &PRODUCT; virtual router acts as the DHCP server and uses CIDR for assigning IP
+    addresses to the guest VMs. If you decide to reserve CIDR for non-&PRODUCT; purposes, you can
+    specify a part of the IP address range or the CIDR that should only be allocated by the DHCP
+    service of the virtual router to the guest VMs created in &PRODUCT;. The remaining IPs in that
+    network are called Reserved IP Range. When IP reservation is configured, the administrator can
+    add additional VMs or physical servers that are not part of &PRODUCT; to the same network and
+    assign them the Reserved IP addresses. &PRODUCT; guest VMs cannot acquire IPs from the Reserved
+    IP Range.</para>
+  <section id="ip-reserve-consider">
+    <title>IP Reservation Considerations</title>
+    <para>Consider the following before you reserve an IP range for non-&PRODUCT; machines:</para>
+    <itemizedlist>
+      <listitem>
+        <para>IP Reservation is supported only in Isolated networks.</para>
+      </listitem>
+      <listitem>
+        <para>IP Reservation can be applied only when the network is in Implemented state.</para>
+      </listitem>
+      <listitem>
+        <para>No IP Reservation is done by default.</para>
+      </listitem>
+      <listitem>
+        <para>Guest VM CIDR you specify must be a subset of the network CIDR.</para>
+      </listitem>
+      <listitem>
+        <para>Specify a valid Guest VM CIDR. IP Reservation is applied only if no active IPs exist
+          outside the Guest VM CIDR. </para>
+        <para>You cannot apply IP Reservation if any VM is alloted with an IP address that is
+          outside the Guest VM CIDR.</para>
+      </listitem>
+      <listitem>
+        <para>To reset an existing IP Reservation, apply IP reservation by specifying the value of
+          network CIDR in the CIDR field.</para>
+        <para>For example, the following table describes three scenarios of guest network
+          creation:</para>
+        <informaltable>
+          <tgroup cols="5" align="left" colsep="1" rowsep="1">
+            <colspec colnum="1" colname="c1" colwidth="33.0pt"/>
+            <colspec colnum="2" colname="c2" colwidth="84.75pt"/>
+            <colspec colnum="3" colname="c3" colwidth="97.5pt"/>
+            <colspec colnum="4" colname="c4" colwidth="129.0pt"/>
+            <colspec colnum="5" colname="c5" colwidth="336.0pt"/>
+            <thead>
+              <row>
+                <entry><para>Case</para></entry>
+                <entry><para> CIDR</para></entry>
+                <entry><para>Network CIDR</para></entry>
+                <entry><para>Reserved IP Range for Non-&PRODUCT; VMs</para></entry>
+                <entry><para>Description</para></entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry><para>1</para></entry>
+                <entry><para>10.1.1.0/24</para></entry>
+                <entry><para> None</para></entry>
+                <entry><para>None</para></entry>
+                <entry><para>No IP Reservation.</para></entry>
+              </row>
+              <row>
+                <entry><para>2</para></entry>
+                <entry><para>10.1.1.0/26</para></entry>
+                <entry><para>10.1.1.0/24</para></entry>
+                <entry><para>10.1.1.64 to 10.1.1.254</para></entry>
+                <entry><para>IP Reservation configured by the UpdateNetwork API with
+                    guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR field in the
+                  UI.</para></entry>
+              </row>
+              <row>
+                <entry><para>3</para></entry>
+                <entry><para>10.1.1.0/24</para></entry>
+                <entry><para>None</para></entry>
+                <entry><para>None</para></entry>
+                <entry><para>Removing IP Reservation by the UpdateNetwork API with
+                    guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR field in the UI.
+                  </para></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="ip-reserv-limition">
+    <title>Limitations</title>
+    <itemizedlist>
+      <listitem>
+        <para>The IP Reservation is not supported if active IPs that are found outside the Guest VM
+          CIDR. </para>
+      </listitem>
+      <listitem>
+        <para>Upgrading network offering which causes a change in CIDR (such as upgrading an
+          offering with no external devices to one with external devices) IP Reservation becomes
+          void if any. Reconfigure IP Reservation in the new re-implemeted network.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="best-practice-ipreserv">
+    <title>Best Practices</title>
+    <para>Apply IP Reservation to the guest network as soon as the network state changes to
+      Implemented. If you apply reservation soon after the first guest VM is deployed, lesser
+      conflicts occurs while applying reservation. </para>
+  </section>
+  <section id="reserve-ip">
+    <title>Reserving an IP Range</title>
+    <orderedlist>
+      <listitem>
+        <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+      </listitem>
+      <listitem>
+        <para>In the left navigation, choose Network.</para>
+      </listitem>
+      <listitem>
+        <para>Click the name of the network you want to modify.</para>
+      </listitem>
+      <listitem>
+        <para>In the Details tab, click Edit.<inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="./images/edit-icon.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>edit-icon.png: button to edit a network</phrase>
+            </textobject>
+          </inlinemediaobject></para>
+        <para>The CIDR field changes to editable one.</para>
+      </listitem>
+      <listitem>
+        <para>In CIDR, specify the Guest VM CIDR.</para>
+      </listitem>
+      <listitem>
+        <para>Click Apply.</para>
+        <para>Wait for the update to complete. The Network CIDR and the Reserved IP Range are
+          displayed on the Details page.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/reset-ssh-key-dev.xml
----------------------------------------------------------------------
diff --git a/en-US/reset-ssh-key-dev.xml b/en-US/reset-ssh-key-dev.xml
new file mode 100644
index 0000000..1a904e5
--- /dev/null
+++ b/en-US/reset-ssh-key-dev.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="reset-ssh-key-dev">
+  <title>Resetting SSH Keys to Access VMs</title>
+  <para>Use the resetSSHKeyForVirtualMachine API to set or reset the SSH keypair assigned to a
+    virtual machine. With the addition of this feature, a lost or compromised SSH keypair can be
+    changed, and the user can access the VM by using the new keypair. Just create or register a new
+    keypair, then call resetSSHKeyForVirtualMachine.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/reset-volume-on-reboot.xml
----------------------------------------------------------------------
diff --git a/en-US/reset-volume-on-reboot.xml b/en-US/reset-volume-on-reboot.xml
new file mode 100644
index 0000000..da423ab
--- /dev/null
+++ b/en-US/reset-volume-on-reboot.xml
@@ -0,0 +1,32 @@
+<?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="reset-vm-reboot">
+  <!-- CLOUDSTACK-745 -->
+  <title>Reset VM to New Root Disk on Reboot</title>
+  <para>You can specify that you want to discard the root disk and create a new one whenever a given
+    VM is rebooted. This is useful for secure environments that need a fresh start on every boot and
+    for desktops that should not retain state. The IP address of the VM will not change due to this
+    operation.</para>
+  <para><emphasis role="bold">To enable root disk reset on VM reboot:</emphasis></para>
+  <para>When creating a new service offering, set the parameter isVolatile to True. VMs created from
+    this service offering will have their disks reset upon reboot. See <xref linkend="creating-compute-offerings"/>.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/resizing-volumes.xml
----------------------------------------------------------------------
diff --git a/en-US/resizing-volumes.xml b/en-US/resizing-volumes.xml
new file mode 100644
index 0000000..42b584b
--- /dev/null
+++ b/en-US/resizing-volumes.xml
@@ -0,0 +1,98 @@
+<?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="resizing-volumes">
+  <title>Resizing Volumes</title>
+  <para>&PRODUCT; provides the ability to resize data disks; &PRODUCT; controls volume size by using
+    disk offerings. This provides &PRODUCT; administrators with the flexibility to choose how much
+    space they want to make available to the end users. Volumes within the disk offerings with the
+    same storage tag can be resized. For example, if you only want to offer 10, 50, and 100 GB
+    offerings, the allowed resize should stay within those limits. That implies if you define a 10
+    GB, a 50 GB and a 100 GB disk offerings, a user can upgrade from 10 GB to 50 GB, or 50 GB to 100
+    GB. If you create a custom-sized disk offering, then you have the option to resize the volume by
+    specifying a new, larger size. </para>
+  <para>Additionally, using the resizeVolume API, a data volume can be moved from a static disk
+    offering to a custom disk offering with the size specified. This functionality allows those who
+    might be billing by certain volume sizes or disk offerings to stick to that model, while
+    providing the flexibility to migrate to whatever custom size necessary. </para>
+  <para>This feature is supported on KVM, XenServer, and VMware hosts. However, shrinking volumes is
+    not supported on VMware hosts.</para>
+  <para>Before you try to resize a volume, consider the following:</para>
+  <itemizedlist>
+    <listitem>
+      <para>The VMs associated with the volume are stopped.</para>
+    </listitem>
+    <listitem>
+      <para>The data disks associated with the volume are removed.</para>
+    </listitem>
+    <listitem>
+      <para>When a volume is shrunk, the disk associated with it is simply truncated, and doing so
+        would put its content at risk of data loss. Therefore, resize any partitions or file systems
+        before you shrink a data disk so that all the data is moved off from that disk.</para>
+    </listitem>
+  </itemizedlist>
+  <para>To resize a volume:</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation bar, click Storage.</para>
+    </listitem>
+    <listitem>
+      <para>In Select View, choose Volumes.</para>
+    </listitem>
+    <listitem>
+      <para>Select the volume name in the Volumes list, then click the Resize Volume button <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/resize-volume-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>resize-volume-icon.png: button to display the resize volume option.</phrase>
+          </textobject>
+        </inlinemediaobject></para>
+    </listitem>
+    <listitem>
+      <para>In the Resize Volume pop-up, choose desired characteristics for the storage.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/resize-volume.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>resize-volume.png: option to resize a volume.</phrase>
+        </textobject>
+      </mediaobject>
+      <orderedlist numeration="loweralpha">
+        <listitem>
+          <para>If you select Custom Disk, specify a custom size.</para>
+        </listitem>
+        <listitem>
+          <para>Click Shrink OK to confirm that you are reducing the size of a volume. </para>
+          <para>This parameter protects against inadvertent shrinking of a disk, which might lead to
+            the risk of data loss. You must sign off that you know what you are doing.</para>
+        </listitem>
+      </orderedlist>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/response-formats.xml
----------------------------------------------------------------------
diff --git a/en-US/response-formats.xml b/en-US/response-formats.xml
new file mode 100644
index 0000000..b21f4ab
--- /dev/null
+++ b/en-US/response-formats.xml
@@ -0,0 +1,58 @@
+<?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="response-formats">
+    <title>Response Formats: XML and JSON</title>
+    <para>CloudStack supports two formats as the response to an API call. The default response is XML. If you would like the response to be in JSON, add &amp;response=json to the Command String.</para>
+    <para>The two response formats differ in how they handle blank fields. In JSON, if there is no value for a response field, it will not appear in the response. If all the fields were empty, there might be no response at all.
+      In XML, even if there is no value to be returned, an empty field will be returned as a placeholder XML element.</para>
+    <para>Sample XML Response:</para>
+    <programlisting>
+     &lt;listipaddressesresponse&gt; 
+        &lt;allocatedipaddress&gt;
+        &lt;ipaddress&gt;192.168.10.141&lt;/ipaddress&gt; 
+        &lt;allocated&gt;2009-09-18T13:16:10-0700&lt;/allocated&gt; 
+        &lt;zoneid&gt;4&lt;/zoneid&gt; 
+            &lt;zonename&gt;WC&lt;/zonename&gt; 
+            &lt;issourcenat&gt;true&lt;/issourcenat&gt; 
+        &lt;/allocatedipaddress&gt;
+     &lt;/listipaddressesresponse&gt;
+    </programlisting>
+    <para>Sample JSON Response:</para>
+    <programlisting>
+        { "listipaddressesresponse" : 
+          { "allocatedipaddress" :
+            [ 
+              { 
+                "ipaddress" : "192.168.10.141", 
+                "allocated" : "2009-09-18T13:16:10-0700",
+                "zoneid" : "4", 
+                "zonename" : "WC", 
+                "issourcenat" : "true" 
+              } 
+            ]
+          } 
+        } 
+    </programlisting>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/responses.xml
----------------------------------------------------------------------
diff --git a/en-US/responses.xml b/en-US/responses.xml
new file mode 100644
index 0000000..9f70c87
--- /dev/null
+++ b/en-US/responses.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<section id="responses">
+    <title>Responses</title>
+        <xi:include href="response-formats.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="max-result-page-returned.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="error-handling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/roles.xml
----------------------------------------------------------------------
diff --git a/en-US/roles.xml b/en-US/roles.xml
new file mode 100644
index 0000000..775e30b
--- /dev/null
+++ b/en-US/roles.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="roles">
+    <title>Roles</title>
+    <para>
+        The &PRODUCT; API supports three access roles:</para>
+    <orderedlist>
+        <listitem><para>Root Admin. Access to all features of the cloud, including both virtual and physical resource management.</para></listitem>
+        <listitem><para>Domain Admin. Access to only the virtual resources of the clouds that belong to the administrator’s domain.</para></listitem>
+        <listitem><para>User. Access to only the features that allow management of the user’s virtual instances, storage, and network.</para></listitem>
+    </orderedlist>
+</section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/root-admin-ui-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/root-admin-ui-overview.xml b/en-US/root-admin-ui-overview.xml
new file mode 100644
index 0000000..f59aaea
--- /dev/null
+++ b/en-US/root-admin-ui-overview.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="root-admin-ui-overview">
+    <title>Root Administrator's UI Overview</title>
+    <para>The &PRODUCT; UI helps the &PRODUCT; administrator provision, view, and manage the cloud infrastructure, domains, user accounts, projects, and configuration settings. The first time you start the UI after a fresh Management Server installation, you can choose to follow a guided tour to provision your cloud infrastructure. On subsequent logins, the dashboard of the logged-in user appears. The various links in this screen and the navigation bar on the left provide access to a variety of administrative functions. The root administrator can also use the UI to perform all the same tasks that are present in the end-user’s UI.</para>
+</section>

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

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/runtime-behavior-of-primary-storage.xml
----------------------------------------------------------------------
diff --git a/en-US/runtime-behavior-of-primary-storage.xml b/en-US/runtime-behavior-of-primary-storage.xml
new file mode 100644
index 0000000..5e17a4f
--- /dev/null
+++ b/en-US/runtime-behavior-of-primary-storage.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="runtime-behavior-of-primary-storage">
+    <title>Runtime Behavior of Primary Storage</title>
+    <para>Root volumes are created automatically when a virtual machine is created. Root volumes are deleted when the VM is destroyed. Data volumes can be created and dynamically attached to VMs. <!-- (although, when the Oracle VM hypervisor is used, the VM must be stopped before an additional volume can be attached)--> Data volumes are not deleted when VMs are destroyed.</para>
+    <para>Administrators should monitor the capacity of primary storage devices and add additional primary storage as needed. See the Advanced Installation Guide.</para>
+    <para>Administrators add primary storage to the system by creating a &PRODUCT; storage pool. Each storage pool is associated with a cluster or a zone.</para>
+    <para>With regards to data disks, when a user executes a Disk Offering to create a data disk, the information is initially written to the CloudStack database only. Upon the first request that the data disk be attached to a VM, CloudStack determines what storage to place the volume on and space is taken from that storage (either from preallocated storage or from a storage system (ex. a SAN), depending on how the primary storage was added to CloudStack).</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/runtime-internal-comm-req.xml
----------------------------------------------------------------------
diff --git a/en-US/runtime-internal-comm-req.xml b/en-US/runtime-internal-comm-req.xml
new file mode 100644
index 0000000..f4539dd
--- /dev/null
+++ b/en-US/runtime-internal-comm-req.xml
@@ -0,0 +1,39 @@
+<?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="runtime-internal-comm-req">
+  <title>Runtime Internal Communications Requirements</title>
+  <itemizedlist>
+    <listitem>
+      <para>The Management Servers communicate with each other to coordinate tasks. This
+        communication uses TCP on ports 8250 and 9090.</para>
+    </listitem>
+    <listitem>
+      <para>The console proxy VMs connect to all hosts in the zone over the management traffic
+        network. Therefore the management traffic network of any given pod in the zone must have
+        connectivity to the management traffic network of all other pods in the zone.</para>
+    </listitem>
+    <listitem>
+      <para>The secondary storage VMs and console proxy VMs connect to the Management Server on
+        port 8250. If you are using multiple Management Servers, the load balanced IP address of the
+        Management Servers on port 8250 must be reachable.</para>
+    </listitem>
+  </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
----------------------------------------------------------------------
diff --git a/en-US/scheduled-maintenance-maintenance-mode-hosts.xml b/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
new file mode 100644
index 0000000..6b736e4
--- /dev/null
+++ b/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<section id="scheduled-maintenance-maintenance-mode-hosts">
+    <title>Scheduled Maintenance and Maintenance Mode for Hosts</title>
+    <para>You can place a host into maintenance mode. When maintenance mode is activated, the host becomes unavailable to receive new guest VMs, and the guest VMs already running on the host are seamlessly migrated to another host not in maintenance mode. This migration uses live migration technology and does not interrupt the execution of the guest.</para>
+    <xi:include href="vcenter-maintenance-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="xenserver-maintenance-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/search-base.xml
----------------------------------------------------------------------
diff --git a/en-US/search-base.xml b/en-US/search-base.xml
new file mode 100644
index 0000000..b8fc092
--- /dev/null
+++ b/en-US/search-base.xml
@@ -0,0 +1,51 @@
+<?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="search-base">
+    <title>Search Base</title>
+<para>An LDAP query is relative to a given node of the LDAP directory tree, called the search base. The search base is the distinguished name (DN) of a level of the directory tree below which all users can be found. The users can be in the immediate base directory or in some subdirectory. The search base may be equivalent to the organization, group, or domain name. The syntax for writing a DN varies depending on which LDAP server you are using. A full discussion of distinguished names is outside the scope of our documentation. The following table shows some examples of search bases to find users in the testing department..</para>
+     
+    <informaltable>
+        <tgroup cols="2" align="left" colsep="1" rowsep="1">
+        <thead>
+            <row>
+                <entry><para>LDAP Server</para></entry>
+                <entry><para>Example Search Base DN</para></entry>                                                                    
+            </row>
+        </thead>
+        <tbody>
+            <row>
+            <entry><para>ApacheDS</para></entry>
+                <entry><para>ou=testing,o=project</para></entry>                                    
+            </row>
+            <row>
+                <entry><para>Active Directory</para></entry>
+                <entry><para>OU=testing, DC=company</para></entry>
+            </row>
+        </tbody>
+        </tgroup>
+    </informaltable>
+
+
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/search-user-bind-dn.xml
----------------------------------------------------------------------
diff --git a/en-US/search-user-bind-dn.xml b/en-US/search-user-bind-dn.xml
new file mode 100644
index 0000000..a2d8b6a
--- /dev/null
+++ b/en-US/search-user-bind-dn.xml
@@ -0,0 +1,47 @@
+<?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="search-user-bind-dn">
+    <title>Search User Bind DN</title>
+    <para>The bind DN is the user on the external LDAP server permitted to search the LDAP directory within the defined search base. When the DN is returned, the DN and passed password are used to authenticate the &PRODUCT; user with an LDAP bind. A full discussion of bind DNs is outside the scope of our documentation. The following table shows some examples of bind DNs.</para>
+    <informaltable>
+    <tgroup cols="2" align="left" colsep="1" rowsep="1">
+    <thead>
+        <row>
+            <entry><para>LDAP Server</para></entry>
+            <entry><para>Example Bind DN</para></entry>
+        </row>
+    </thead>
+    <tbody>
+        <row>
+            <entry><para>ApacheDS</para></entry>
+            <entry><para>cn=Administrator,dc=testing,ou=project,ou=org</para></entry>
+        </row>
+        <row>
+            <entry><para>Active Directory</para></entry>
+            <entry><para>CN=Administrator, OU=testing, DC=company, DC=com</para></entry></row>
+    </tbody>
+    </tgroup>
+    </informaltable>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/secondary-storage-add.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage-add.xml b/en-US/secondary-storage-add.xml
new file mode 100644
index 0000000..9dd1e7d
--- /dev/null
+++ b/en-US/secondary-storage-add.xml
@@ -0,0 +1,87 @@
+<?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="secondary-storage-add">
+    <title>Add Secondary Storage</title>
+    <section id="sys-require-secondary-storage">
+    <title>System Requirements for Secondary Storage</title>
+    <itemizedlist>
+        <listitem><para>NFS storage appliance or Linux NFS server</para></listitem>
+        <listitem><para>(Optional) OpenStack Object Storage (Swift) (see http://swift.openstack.org)</para></listitem>
+        <listitem><para>100GB minimum capacity</para></listitem>
+        <listitem><para>A secondary storage device must be located in the same zone as the guest VMs it serves.</para></listitem>
+        <listitem><para>Each Secondary Storage server must be available to all hosts in the zone.</para></listitem>
+    </itemizedlist>
+    </section>
+    <section id="adding-secondary-storage">
+    <title>Adding Secondary Storage</title>
+    <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>
+    <warning><para>Be sure there is nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></warning>
+    <orderedlist>
+        <listitem><para>To prepare for the zone-based Secondary Staging Store, you should have created and mounted an NFS share during Management Server installation. <phrase condition="install">See <xref linkend="prepare-nfs-shares" />.</phrase><phrase condition="admin">See Preparing NFS Shares in the Installation Guide.</phrase></para></listitem>
+        <listitem><para>Make sure you prepared the system VM template during Management Server installation. <phrase condition="install">See <xref linkend="prepare-system-vm-template" />.</phrase><phrase condition="admin">See Prepare the System VM Template in the Installation Guide.</phrase></para></listitem>
+        <listitem><para>Log in to the &PRODUCT; UI as root administrator.</para></listitem>
+        <listitem><para>In the left navigation bar, click Infrastructure.</para></listitem>
+        <listitem><para>In Secondary Storage, click View All.</para></listitem>
+        <listitem><para>Click Add Secondary Storage.</para></listitem>
+        <listitem><para>Fill in the following fields:</para>
+            <itemizedlist>
+                <listitem><para>Name. Give the storage a descriptive name.</para></listitem>
+                <listitem><para>Provider. Choose S3, Swift, or NFS, then fill in the related fields which appear.
+                    The fields will vary depending on the storage provider; for more information, consult the
+                    provider's documentation (such as the S3 or Swift website).
+                    NFS can be used for zone-based storage, and the others for region-wide storage.</para>
+                    <warning><para>You can use only a single S3 or Swift account per region.</para></warning></listitem>
+                <listitem><para>Create NFS Secondary Staging Store. This box must always be checked.</para>
+                    <warning><para>Even if the UI allows you to uncheck this box, do not do so.
+                        This checkbox and the three fields below it must be filled in.
+                        Even when Swift or S3 is used as the secondary storage provider, an NFS
+                        staging storage in each zone is still required.</para></warning><para/></listitem>
+                <listitem><para>Zone. The zone where the NFS Secondary Staging Store is to be located.</para></listitem>
+                <listitem><para>NFS server. The name of the zone's Secondary Staging Store.</para></listitem>
+                <listitem><para>Path. The path to the zone's Secondary Staging Store.</para></listitem>
+            </itemizedlist>
+        </listitem>
+    </orderedlist>
+    </section>
+    <section id="secondary-staging-store">
+        <title>Adding an NFS Secondary Staging Store for Each Zone</title>
+        <para>Every zone must have at least one NFS store provisioned; multiple NFS servers are
+            allowed per zone. To provision an NFS Staging Store for a zone:</para>
+        <orderedlist>
+            <listitem><para>Log in to the &PRODUCT; UI as root administrator.</para></listitem>
+            <listitem><para>In the left navigation bar, click Infrastructure.</para></listitem>
+            <listitem><para>In Secondary Storage, click View All.</para></listitem>
+            <listitem><para>In Select View, choose Secondary Staging Store.</para></listitem>
+            <listitem><para>Click the Add NFS Secondary Staging Store button.</para></listitem>
+            <listitem><para>Fill out the dialog box fields, then click OK:</para>
+                <itemizedlist>
+                    <listitem><para>Zone. The zone where the NFS Secondary Staging Store is to be located.</para></listitem>
+                    <listitem><para>NFS server. The name of the zone's Secondary Staging Store.</para></listitem>
+                    <listitem><para>Path. The path to the zone's Secondary Staging Store.</para></listitem>
+                </itemizedlist>
+            </listitem>
+        </orderedlist>
+    </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/secondary-storage-outage-and-data-loss.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage-outage-and-data-loss.xml b/en-US/secondary-storage-outage-and-data-loss.xml
new file mode 100644
index 0000000..42ab7d4
--- /dev/null
+++ b/en-US/secondary-storage-outage-and-data-loss.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="secondary-storage-outage-and-data-loss">
+    <title>Secondary Storage Outage and Data Loss</title>
+    <para>For a Zone that has only one secondary storage server, a secondary storage outage will have feature level impact to the system but will not impact running guest VMs. It may become impossible to create a VM with the selected template for a user. A user may also not be able to save snapshots or examine/restore saved snapshots. These features will automatically be available when the secondary storage comes back online.</para>
+    <para>Secondary storage data loss will impact recently added user data including templates, snapshots, and ISO images. Secondary storage should be backed up periodically. Multiple secondary storage servers can be provisioned within each zone to increase the scalability of the system.</para>
+</section>

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

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/secondary-storage.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage.xml b/en-US/secondary-storage.xml
new file mode 100644
index 0000000..4a01c27
--- /dev/null
+++ b/en-US/secondary-storage.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<section id="secondary-storage">
+    <title>Secondary Storage</title>
+    <para>This section gives concepts and technical details about &PRODUCT; secondary storage. For information about how to install and configure secondary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
+    <para><xref linkend="about-secondary-storage"/></para>
+</section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/security-groups-advanced-zones.xml
----------------------------------------------------------------------
diff --git a/en-US/security-groups-advanced-zones.xml b/en-US/security-groups-advanced-zones.xml
new file mode 100644
index 0000000..bfae188
--- /dev/null
+++ b/en-US/security-groups-advanced-zones.xml
@@ -0,0 +1,52 @@
+<?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="security-groups-advanced-zones">
+    <title>Security Groups in Advanced Zones (KVM Only)</title>
+        <para>&PRODUCT; provides the ability to use security groups to provide isolation between
+            guests on a single shared, zone-wide network in an advanced zone where KVM is the
+            hypervisor. Using security groups in advanced zones rather than multiple VLANs allows a greater range
+            of options for setting up guest isolation in a cloud.</para>
+        <formalpara>
+            <title>Limitations</title>
+            <para>The following are not supported for this feature:</para>
+        </formalpara>
+        <itemizedlist>
+            <listitem>
+                <para>Two IP ranges with the same VLAN and different gateway or netmask in security
+                    group-enabled shared network.</para>
+            </listitem>
+            <listitem>
+                <para>Two IP ranges with the same VLAN and different gateway or netmask in
+                    account-specific shared networks.</para>
+            </listitem>
+            <listitem>
+                <para>Multiple VLAN ranges in security group-enabled shared network.</para>
+            </listitem>
+            <listitem>
+                <para>Multiple VLAN ranges in account-specific shared networks.</para>
+            </listitem>
+        </itemizedlist>
+        <para>Security groups must be enabled in the zone in order for this feature to be used.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/security-groups.xml
----------------------------------------------------------------------
diff --git a/en-US/security-groups.xml b/en-US/security-groups.xml
new file mode 100644
index 0000000..6b36650
--- /dev/null
+++ b/en-US/security-groups.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!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="security-groups">
+    <title>Security Groups</title>
+    <xi:include href="about-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="security-groups-advanced-zones.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-ingress-egress-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/security-req.xml
----------------------------------------------------------------------
diff --git a/en-US/security-req.xml b/en-US/security-req.xml
new file mode 100644
index 0000000..a4869b4
--- /dev/null
+++ b/en-US/security-req.xml
@@ -0,0 +1,24 @@
+<?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="security-req">
+  <title>Security Requirements</title>
+  <para>The public Internet must not be able to access port 8096 or port 8250 on the Management Server.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/send-projects-membership-invitation.xml
----------------------------------------------------------------------
diff --git a/en-US/send-projects-membership-invitation.xml b/en-US/send-projects-membership-invitation.xml
new file mode 100644
index 0000000..164235f
--- /dev/null
+++ b/en-US/send-projects-membership-invitation.xml
@@ -0,0 +1,42 @@
+<?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="send-projects-membership-invitation">
+    <title>Sending Project Membership Invitations</title>
+    <para>Use these steps to add a new member to a project if the invitations feature is enabled in the cloud as described in <xref linkend="set-up-invitations"/>. If the invitations feature is not turned on, use the procedure in Adding Project Members From the UI.</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 Invitations tab.</para></listitem>
+      <listitem><para>In Add by, select one of the following:</para>
+      <orderedlist>
+          <listitem><para>Account – The invitation will appear in the user’s Invitations tab in the Project View. See Using the Project View.</para></listitem>
+          <listitem><para>Email – The invitation will be sent to the user’s email address. Each emailed invitation includes a unique code called a token which the recipient will provide back to &PRODUCT; when accepting the invitation. Email invitations will work only if the global parameters related to the SMTP server have been set. See <xref linkend="set-up-invitations"/>.</para></listitem>
+      </orderedlist></listitem>
+      <listitem><para>Type the user name or email address of the new member you want to add, and click Invite. Type the &PRODUCT; user name if you chose Account in the previous step. If you chose Email, type the email address. You can invite only people who have an account in this cloud within the same domain as the project. However, you can send the invitation to any email address.</para></listitem>
+      <listitem><para>To view and manage the invitations you have sent, return to this tab. When an invitation is accepted, the new member will appear in the project’s Accounts tab.</para></listitem>
+   </orderedlist>
+</section>


Mime
View raw message