cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [26/51] [partial] Adding documents from 4.2
Date Wed, 02 Oct 2013 14:23:27 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/separate_storage_network.xml
----------------------------------------------------------------------
diff --git a/en-US/separate_storage_network.xml b/en-US/separate_storage_network.xml
new file mode 100644
index 0000000..c3f6330
--- /dev/null
+++ b/en-US/separate_storage_network.xml
@@ -0,0 +1,24 @@
+<!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="separate_storage_network">
+    <title>Separate Storage Network</title>
+    <para>In the large-scale redundant setup described in the previous section, storage traffic can overload the management network. A separate storage network is optional for deployments. Storage protocols such as iSCSI are sensitive to network delays. A separate storage network ensures guest network traffic contention does not impact storage performance.</para>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/service-offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/service-offerings.xml b/en-US/service-offerings.xml
new file mode 100644
index 0000000..5283c05
--- /dev/null
+++ b/en-US/service-offerings.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="service-offerings">
+    <title>Service Offerings</title>
+    <para><xref linkend="set-up-network-for-users" />vCenter Maintenance Mode</para>
+    <para><xref linkend="about-virtual-networks" />XenServer and Maintenance Mode</para>
+    <para><xref linkend="customizing-dns" />vCenter Maintenance Mode</para>
+    <para><xref linkend="stop-start-management-server" />XenServer and Maintenance Mode</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-database-buffer-pool-size.xml
----------------------------------------------------------------------
diff --git a/en-US/set-database-buffer-pool-size.xml b/en-US/set-database-buffer-pool-size.xml
new file mode 100644
index 0000000..8265ae5
--- /dev/null
+++ b/en-US/set-database-buffer-pool-size.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="set-database-buffer-pool-size">
+    <title>Set Database Buffer Pool Size</title>
+    <para>It is important to provide enough memory space for the MySQL database to cache data and indexes:</para>
+    <orderedlist>
+        <listitem><para>Edit the MySQL configuration file:</para><programlisting>/etc/my.cnf</programlisting></listitem>
+        <listitem><para>Insert the following line in the [mysqld] section, below the datadir line. Use a value that is appropriate for your situation. We recommend setting the buffer pool at 40% of RAM if MySQL is on the same server as the management server or 70% of RAM if MySQL has a dedicated server. The following example assumes a dedicated server with 1024M of RAM.</para>
+            <programlisting>innodb_buffer_pool_size=700M</programlisting></listitem>
+        <listitem><para>Restart the MySQL service.</para><programlisting># service mysqld restart</programlisting></listitem>
+      </orderedlist>
+    <para>For more information about the buffer pool, see "The InnoDB Buffer Pool" at <ulink url="http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html">MySQL Reference Manual</ulink>.</para>
+</section>
+      

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-global-project-resource-limits.xml
----------------------------------------------------------------------
diff --git a/en-US/set-global-project-resource-limits.xml b/en-US/set-global-project-resource-limits.xml
new file mode 100644
index 0000000..8ec1325
--- /dev/null
+++ b/en-US/set-global-project-resource-limits.xml
@@ -0,0 +1,82 @@
+<?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="set-global-project-resource-limits">
+  <title>Setting the Global Project Resource Limits</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in as administrator to the &PRODUCT; UI.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, click Global Settings.</para>
+    </listitem>
+    <listitem>
+      <para>In the search box, type max.projects and click the search button.</para>
+    </listitem>
+    <listitem>
+      <para>In the search results, you will see the parameters you can use to set per-project
+        maximum resource amounts that apply to all projects in the cloud. No project can have more
+        resources, but an individual project can have lower limits. Click the edit button to set
+        each parameter. <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/edit-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>editbutton.png: Edits parameters</phrase>
+          </textobject>
+        </inlinemediaobject></para>
+      <informaltable>
+        <tgroup cols="2" align="left" colsep="1" rowsep="1">
+          <tbody>
+            <row>
+              <entry><para>max.project.public.ips</para></entry>
+              <entry><para>Maximum number of public IP addresses that can be owned by any project in
+                  the cloud. See About Public IP Addresses.</para></entry>
+            </row>
+            <row>
+              <entry><para>max.project.snapshots</para></entry>
+              <entry><para>Maximum number of snapshots that can be owned by any project in the
+                  cloud. See Working with Snapshots.</para></entry>
+            </row>
+            <row>
+              <entry><para>max.project.templates</para></entry>
+              <entry><para>Maximum number of templates that can be owned by any project in the
+                  cloud. See Working with Templates.</para></entry>
+            </row>
+            <row>
+              <entry><para>max.project.uservms</para></entry>
+              <entry><para>Maximum number of guest virtual machines that can be owned by any project
+                  in the cloud. See Working With Virtual Machines.</para></entry>
+            </row>
+            <row>
+              <entry><para>max.project.volumes</para></entry>
+              <entry><para>Maximum number of data volumes that can be owned by any project in the
+                  cloud. See Working with Volumes.</para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </listitem>
+    <listitem>
+      <para>Restart the Management Server.</para>
+      <programlisting># service cloudstack-management restart</programlisting>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-monitor-total-vm-limits-per-host.xml
----------------------------------------------------------------------
diff --git a/en-US/set-monitor-total-vm-limits-per-host.xml b/en-US/set-monitor-total-vm-limits-per-host.xml
new file mode 100644
index 0000000..0cc2475
--- /dev/null
+++ b/en-US/set-monitor-total-vm-limits-per-host.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="set-monitor-total-vm-limits-per-host">
+    <title>Set and Monitor Total VM Limits per Host</title>
+    <para>The &PRODUCT; administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use &PRODUCT; global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this numb
 er of VMs, use the &PRODUCT; UI to disable allocation of more VMs to the cluster.</para>
+</section>
+      

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-per-project-resource-limits.xml
----------------------------------------------------------------------
diff --git a/en-US/set-per-project-resource-limits.xml b/en-US/set-per-project-resource-limits.xml
new file mode 100644
index 0000000..a0f64ea
--- /dev/null
+++ b/en-US/set-per-project-resource-limits.xml
@@ -0,0 +1,55 @@
+<?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="set-per-project-resource-limits">
+  <title>Setting Per-Project Resource Limits</title>
+  <para>The &PRODUCT; root administrator or the domain administrator of the domain where the project
+    resides can set new resource limits for an individual project. The project owner can set
+    resource limits only if the owner is also a domain or root administrator.</para>
+  <para>The new limits must be below the global default limits set by the &PRODUCT; administrator
+    (as described in <xref linkend="set-resource-limits-for-projects"/>). If the project already
+    owns more of a given type of resource than the new maximum, the resources are not affected;
+    however, the project can not add any new resources of that type until the total drops below the
+    new limit.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in as administrator 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 Resources tab. This tab lists the current maximum amount that the project is
+        allowed to own for each type of resource.</para>
+    </listitem>
+    <listitem>
+      <para>Type new values for one or more resources.</para>
+    </listitem>
+    <listitem>
+      <para>Click Apply.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-projects-creator-permissions.xml
----------------------------------------------------------------------
diff --git a/en-US/set-projects-creator-permissions.xml b/en-US/set-projects-creator-permissions.xml
new file mode 100644
index 0000000..dd9cfe9
--- /dev/null
+++ b/en-US/set-projects-creator-permissions.xml
@@ -0,0 +1,62 @@
+<?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="set-projects-creator-permissions">
+  <title>Setting Project Creator Permissions</title>
+  <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict
+    that ability to just &PRODUCT; administrators.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in as administrator to the &PRODUCT; UI.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, click Global Settings.</para>
+    </listitem>
+    <listitem>
+      <para>In the search box, type allow.user.create.projects.</para>
+    </listitem>
+    <listitem>
+      <para>Click the edit button to set the parameter.<inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="./images/edit-icon.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>editbutton.png: Edits parameters</phrase>
+          </textobject>
+        </inlinemediaobject></para>
+      <informaltable>
+        <tgroup cols="2" align="left" colsep="1" rowsep="1">
+          <tbody>
+            <row>
+              <entry><para>allow.user.create.projects</para></entry>
+              <entry><para>Set to true to allow end users to create projects. Set to false if you
+                  want only the &PRODUCT; root administrator and domain administrators to create
+                  projects.</para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </listitem>
+    <listitem>
+      <para>Restart the Management Server.</para>
+      <programlisting># service cloudstack-management restart</programlisting>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-resource-limits-for-projects.xml
----------------------------------------------------------------------
diff --git a/en-US/set-resource-limits-for-projects.xml b/en-US/set-resource-limits-for-projects.xml
new file mode 100644
index 0000000..669ca25
--- /dev/null
+++ b/en-US/set-resource-limits-for-projects.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="set-resource-limits-for-projects">
+  <title>Setting Resource Limits for Projects</title>
+  <para>The &PRODUCT; administrator can set global default limits to control the amount of resources
+    that can be owned by each project in the cloud. This serves to prevent uncontrolled usage of
+    resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators
+    can override these resource limits for individual projects with their domains, as long as the
+    new limits are below the global defaults set by the &PRODUCT; root administrator. The root
+    administrator can also set lower resource limits for any project in the cloud</para>
+  <xi:include href="set-per-project-resource-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="set-global-project-resource-limits.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

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

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-up-network-for-users.xml
----------------------------------------------------------------------
diff --git a/en-US/set-up-network-for-users.xml b/en-US/set-up-network-for-users.xml
new file mode 100644
index 0000000..c22babc
--- /dev/null
+++ b/en-US/set-up-network-for-users.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.
+-->
+<chapter id="set-up-network-for-users">
+  <title>Setting Up Networking for Users</title>
+  <xi:include href="networks-for-users-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="about-virtual-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="network-service-providers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-usage-limit.xml
----------------------------------------------------------------------
diff --git a/en-US/set-usage-limit.xml b/en-US/set-usage-limit.xml
new file mode 100644
index 0000000..5e2d770
--- /dev/null
+++ b/en-US/set-usage-limit.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="set-usage-limit">
+    <title>Setting Usage Limits</title>
+    <para>&PRODUCT; provides several administrator control points for capping resource usage by users. Some of these limits are global configuration parameters. Others are applied at the ROOT domain and may be overridden on a per-account basis.</para>
+    <para>Aggregate limits may be set on a per-domain basis.  For example, you may limit a domain and all subdomains to the creation of 100 VMs.</para>
+    <para>This section covers the following topics:</para>
+    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/set-zone-vlan-run-vm-max.xml
----------------------------------------------------------------------
diff --git a/en-US/set-zone-vlan-run-vm-max.xml b/en-US/set-zone-vlan-run-vm-max.xml
new file mode 100644
index 0000000..2159b75
--- /dev/null
+++ b/en-US/set-zone-vlan-run-vm-max.xml
@@ -0,0 +1,65 @@
+<?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="set-zone-vlan-run-vm-max">
+  <title>Setting Zone VLAN and Running VM Maximums</title>
+  <para>In the external networking case, every VM in a zone must have a unique guest IP address.
+    There are two variables that you need to consider in determining how to configure &PRODUCT;
+    to support this: how many Zone VLANs do you expect to have and how many VMs do you expect to
+    have running in the Zone at any one time.</para>
+  <para>Use the following table to determine how to configure &PRODUCT; for your
+    deployment.</para>
+  <informaltable>
+    <tgroup cols="3" align="left" colsep="1" rowsep="1">
+      <thead>
+        <row>
+          <entry><para>guest.vlan.bits</para></entry>
+          <entry><para>Maximum Running VMs per Zone</para></entry>
+          <entry><para>Maximum Zone VLANs</para></entry>
+        </row>
+      </thead>
+      <tbody>
+        <row>
+          <entry><para>12</para></entry>
+          <entry><para>4096</para></entry>
+          <entry><para>4094</para></entry>
+        </row>
+        <row>
+          <entry><para>11</para></entry>
+          <entry><para>8192</para></entry>
+          <entry><para>2048</para></entry>
+        </row>
+        <row>
+          <entry><para>10</para></entry>
+          <entry><para>16384</para></entry>
+          <entry><para>1024</para></entry>
+        </row>
+        <row>
+          <entry><para>10</para></entry>
+          <entry><para>32768</para></entry>
+          <entry><para>512</para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+  <para>Based on your deployment's needs, choose the appropriate value of guest.vlan.bits. Set it as
+    described in Edit the Global Configuration Settings (Optional) section and restart the
+    Management Server.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/shared-networks.xml
----------------------------------------------------------------------
diff --git a/en-US/shared-networks.xml b/en-US/shared-networks.xml
new file mode 100644
index 0000000..b8a86f1
--- /dev/null
+++ b/en-US/shared-networks.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="shared-networks">
+  <title>Shared Networks</title>
+  <para>A shared network can be accessed by virtual machines that belong to many different accounts.
+    Network Isolation on shared networks is accomplished by using techniques such as security
+    groups, which is supported only in Basic zones in &PRODUCT; 3.0.3 and later versions.</para>
+  <itemizedlist>
+    <listitem>
+      <para>Shared Networks are created by the administrator</para>
+    </listitem>
+    <listitem>
+      <para>Shared Networks can be designated to a certain domain</para>
+    </listitem>
+    <listitem>
+      <para>Shared Network resources such as VLAN and physical network that it maps to are
+        designated by the administrator</para>
+    </listitem>
+    <listitem>
+      <para>Shared Networks can be isolated by security groups</para>
+    </listitem>
+    <listitem>
+      <para>Public Network is a shared network that is not shown to the end users</para>
+    </listitem>
+    <listitem>
+      <para>Source NAT per zone is not supported in Shared Network when the service provider is
+        virtual router. However, Source NAT per account is supported.</para>
+    </listitem>
+  </itemizedlist>
+  <para>For information, see <xref linkend="creating-shared-network"/>.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/signing-api-calls-python.xml
----------------------------------------------------------------------
diff --git a/en-US/signing-api-calls-python.xml b/en-US/signing-api-calls-python.xml
new file mode 100644
index 0000000..a2f897f
--- /dev/null
+++ b/en-US/signing-api-calls-python.xml
@@ -0,0 +1,101 @@
+<?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="signing-api-calls-python">
+    <title>How to sign an API call with Python</title>
+    <para>To illustrate the procedure used to sign API calls we present a step by step interactive session
+          using Python.</para>
+    
+    <para>First import the required modules:</para>
+    <programlisting>
+
+ <![CDATA[
+$python
+Python 2.7.3 (default, Nov 17 2012, 19:54:34) 
+[GCC 4.2.1 Compatible Apple Clang 4.1 ((tags/Apple/clang-421.11.66))] on darwin
+Type "help", "copyright", "credits" or "license" for more information.
+>>> import urllib2
+>>> import urllib
+>>> import hashlib
+>>> import hmac
+>>> import base64
+ ]]>
+    </programlisting>
+   
+    <para>Define the endpoint of the Cloud, the command that you want to execute and the keys of the user.</para>
+    <programlisting>
+ <![CDATA[
+
+>>> baseurl='http://localhost:8080/client/api?'
+>>> request={}
+>>> request['command']='listUsers'
+>>> request['response']='json'
+>>> request['apikey']='plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg'
+>>> secretkey='VDaACYb0LV9eNjTetIOElcVQkvJck_J_QljX_FcHRj87ZKiy0z0ty0ZsYBkoXkY9b7eq1EhwJaw7FF3akA3KBQ'
+  ]]>
+    </programlisting>
+    <para>Build the request string:</para>
+    <programlisting>
+ <![CDATA[
+>>> request_str='&'.join(['='.join([k,urllib.quote_plus(request[k])]) for k in request.keys()])
+>>> request_str
+'apikey=plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg&command=listUsers&response=json'
+  ]]>
+    </programlisting>
+
+    <para>Compute the signature with hmac, do a 64 bit encoding and a url encoding: </para>
+    <programlisting>
+  <![CDATA[
+>>> sig_str='&'.join(['='.join([k.lower(),urllib.quote_plus(request[k].lower().replace('+','%20'))])for k in sorted(request.iterkeys())]) 
+>>> sig_str
+'apikey=plgwjfzk4gys3momtvmjuvg-x-jlwlnfauj9gabbbf9edm-kaymmailqzzq1elzlyq_u38zcm0bewzgudp66mg&command=listusers&response=json'
+>>> sig=hmac.new(secretkey,sig_str,hashlib.sha1)
+>>> sig
+<hmac.HMAC instance at 0x10d91d680>
+>>> sig=hmac.new(secretkey,sig_str,hashlib.sha1).digest()
+>>> sig
+'M:]\x0e\xaf\xfb\x8f\xf2y\xf1p\x91\x1e\x89\x8a\xa1\x05\xc4A\xdb'
+>>> sig=base64.encodestring(hmac.new(secretkey,sig_str,hashlib.sha1).digest())
+>>> sig
+'TTpdDq/7j/J58XCRHomKoQXEQds=\n'
+>>> sig=base64.encodestring(hmac.new(secretkey,sig_str,hashlib.sha1).digest()).strip()
+>>> sig
+'TTpdDq/7j/J58XCRHomKoQXEQds='
+>>> sig=urllib.quote_plus(base64.encodestring(hmac.new(secretkey,sig_str,hashlib.sha1).digest()).strip())
+  ]]>
+    </programlisting>
+
+    <para>Finally, build the entire string and do an http GET:</para>
+    <programlisting>
+  <![CDATA[
+>>> req=baseurl+request_str+'&signature='+sig
+>>> req
+'http://localhost:8080/client/api?apikey=plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg&command=listUsers&response=json&signature=TTpdDq%2F7j%2FJ58XCRHomKoQXEQds%3D'
+>>> res=urllib2.urlopen(req)
+>>> res.read()
+'{ "listusersresponse" : { "count":3 ,"user" : [  {"id":"7ed6d5da-93b2-4545-a502-23d20b48ef2a","username":"admin","firstname":"admin","lastname":"cloud","created":"2012-07-05T12:18:27-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg","secretkey":"VDaACYb0LV9eNjTetIOElcVQkvJck_J_QljX_FcHRj87ZKiy0z0ty0ZsYBkoXkY9b7eq1EhwJaw7FF3akA3KBQ","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"}, {"id":"1fea6418-5576-4989-a21e-4790787bbee3","username":"runseb","firstname":"foobar","lastname":"goa","email":"joe@smith.com","created":"2013-04-10T16:52:06-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"Xhsb3MewjJQaXXMszRcLvQI9_NPy_UcbDj1QXikkVbDC9MDSPwWdtZ1bUY1H7JBEYTtDDLY3yuchCeW778GkBA","secretkey":"gIsgmi8C5YwxMHjX5o51pSe0kqs6JnKriw0jJBLceY5b
 gnfzKjL4aM6ctJX-i1ddQIHJLbLJDK9MRzsKk6xZ_w","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"}, {"id":"52f65396-183c-4473-883f-a37e7bb93967","username":"toto","firstname":"john","lastname":"smith","email":"john@smith.com","created":"2013-04-23T04:27:22-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"THaA6fFWS_OmvU8od201omxFC8yKNL_Hc5ZCS77LFCJsRzSx48JyZucbUul6XYbEg-ZyXMl_wuEpECzK-wKnow","secretkey":"O5ywpqJorAsEBKR_5jEvrtGHfWL1Y_j1E4Z_iCr8OKCYcsPIOdVcfzjJQ8YqK0a5EzSpoRrjOFiLsG0hQrYnDA","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"} ] } }'
+  ]]>
+    </programlisting>
+    
+ </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/signing-api-requests.xml
----------------------------------------------------------------------
diff --git a/en-US/signing-api-requests.xml b/en-US/signing-api-requests.xml
new file mode 100644
index 0000000..92ff79e
--- /dev/null
+++ b/en-US/signing-api-requests.xml
@@ -0,0 +1,63 @@
+<?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="signing-api-requests">
+    <title>Signing API Requests</title>
+    <para>Whether you access the CloudStack API with HTTP or HTTPS, it must still be signed so that CloudStack can verify the caller has been authenticated and authorized to execute the command.  Make sure that you have both the API Key and Secret Key provided by the CloudStack administrator for your account before proceeding with the signing process.</para>
+    <para>To show how to sign a request, we will re-use the previous example.</para>
+    <programlisting>http://http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+    <para>Breaking this down, we have several distinct parts to this URL.</para>
+    <itemizedlist>
+        <listitem><para>Base URL: This is the base URL to the CloudStack Management Server.</para>
+            <programlisting>http://localhost:8080</programlisting>
+        </listitem>
+        <listitem><para>API Path: This is the path to the API Servlet that processes the incoming requests.</para>
+            <programlisting>/client/api?</programlisting>
+        </listitem>
+        <listitem><para>Command String: This part of the query string comprises of the command, its parameters, and the API Key that identifies the account.</para>
+            <note><para>As with all query string parameters of field-value pairs, the "field" component is case insensitive while all "value" values are case sensitive.</para></note>
+            <programlisting>command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ</programlisting>
+        </listitem>
+        <listitem><para>Signature: This is the signature of the command string that is generated using a combination of the user’s Secret Key and the HMAC SHA-1 hashing algorithm.</para>
+            <programlisting>&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+        </listitem>
+    </itemizedlist>
+    <para>Every API request has the format Base URL+API Path+Command String+Signature.</para>
+    <para>To generate the signature.</para>
+    <orderedlist>
+        <listitem><para>For each field-value pair (as separated by a '&amp;') in the Command String, URL encode each value so that it can be safely sent via HTTP GET.</para>
+            <note><para>Make sure all spaces are encoded as "%20" rather than "+".</para></note>
+        </listitem>
+        <listitem><para>Lower case the entire Command String and sort it alphabetically via the field for each field-value pair.  The result of this step would look like the following.</para>
+            <programlisting>apikey=mivr6x7u6bn_sdahobpjnejpgest35exq-jb8cg20yi3yaxxcgpyuairmfi_ejtvwz0nukkjbpmy3y2bcikwfq&amp;command=deployvirtualmachine&amp;diskofferingid=1&amp;serviceofferingid=1&amp;templateid=2&amp;zoneid=4</programlisting>
+        </listitem>
+        <listitem><para>Take the sorted Command String and run it through the HMAC SHA-1 hashing algorithm (most programming languages offer a utility method to do this) with the user’s Secret Key.  Base64 encode the resulting byte array in UTF-8 so that it can be safely transmitted via HTTP.  The final string produced after Base64 encoding should be "Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D".</para>
+            <para>By reconstructing the final URL in the format Base URL+API Path+Command String+Signature, the final URL should look like:</para>
+            <programlisting>http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+        </listitem>
+    </orderedlist>
+  
+    <xi:include href="signing-api-calls-python.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />   
+
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/site-to-site-vpn.xml
----------------------------------------------------------------------
diff --git a/en-US/site-to-site-vpn.xml b/en-US/site-to-site-vpn.xml
new file mode 100644
index 0000000..9a41a0a
--- /dev/null
+++ b/en-US/site-to-site-vpn.xml
@@ -0,0 +1,70 @@
+<?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="site-to-site-vpn">
+  <title>Setting Up a Site-to-Site VPN Connection</title>
+  <para>A Site-to-Site VPN connection helps you establish a secure connection from an enterprise
+    datacenter to the cloud infrastructure. This allows users to access the guest VMs by
+    establishing a VPN connection to the virtual router of the account from a device in the
+    datacenter of the enterprise. Having this facility eliminates the need to establish VPN
+    connections to individual VMs.</para>
+  <para>The difference from Remote VPN is that Site-to-site VPNs connects entire networks to each
+    other, for example, connecting a branch office network to a company headquarters network. In a
+    site-to-site VPN, hosts do not have VPN client software; they send and receive normal TCP/IP
+    traffic through a VPN gateway.</para>
+  <para>The supported endpoints on the remote datacenters are: </para>
+  <itemizedlist>
+    <listitem>
+      <para>Cisco ISR with IOS 12.4 or later</para>
+    </listitem>
+    <listitem>
+      <para>Juniper J-Series routers with JunOS 9.5 or later</para>
+    </listitem>
+  </itemizedlist>
+  <note>
+    <para>In addition to the specific Cisco and Juniper devices listed above, the expectation is
+      that any Cisco or Juniper device running on the supported operating systems are able to
+      establish VPN connections.</para>
+  </note>
+  <para></para>
+  <para> To set up a Site-to-Site VPN connection, perform the following:</para>
+  <orderedlist>
+    <listitem>
+      <para>Create a Virtual Private Cloud (VPC).</para>
+      <para>See <xref linkend="configure-vpc"/>.</para>
+    </listitem>
+    <listitem>
+      <para>Create a VPN Customer Gateway.</para>
+    </listitem>
+    <listitem>
+      <para>Create a VPN gateway for the VPC that you created.</para>
+    </listitem>
+    <listitem>
+      <para>Create VPN connection from the VPC VPN gateway to the customer VPN gateway.</para>
+    </listitem>
+  </orderedlist>
+  <xi:include href="create-vpn-customer-gateway.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="create-vpn-gateway-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="create-vpn-connection-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="delete-reset-vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/small_scale_deployment.xml
----------------------------------------------------------------------
diff --git a/en-US/small_scale_deployment.xml b/en-US/small_scale_deployment.xml
new file mode 100644
index 0000000..bba2b9a
--- /dev/null
+++ b/en-US/small_scale_deployment.xml
@@ -0,0 +1,37 @@
+<!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="small_scale_deployment">
+    <title>Small-Scale Deployment</title>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/small-scale-deployment.png" />
+        </imageobject>
+        <textobject><phrase>Small-Scale Deployment</phrase></textobject>
+    </mediaobject>
+    <para>This diagram illustrates the network architecture of a small-scale &PRODUCT; deployment.</para>
+    <itemizedlist>
+        <listitem><para>A firewall provides a connection to the Internet. The firewall is configured in NAT mode. The firewall forwards HTTP requests and API calls from the Internet to the Management Server. The Management Server resides on the management network.</para></listitem>
+        <listitem><para>A layer-2 switch connects all physical servers and storage.</para></listitem>
+        <listitem><para>A single NFS server functions as both the primary and secondary storage.</para></listitem>
+        <listitem><para>The Management Server is connected to the management network.</para></listitem>
+    </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/snapshot-performance-vmware.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-performance-vmware.xml b/en-US/snapshot-performance-vmware.xml
new file mode 100644
index 0000000..c26d66d
--- /dev/null
+++ b/en-US/snapshot-performance-vmware.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="snapshot-performance-vmware">
+  <title>VMware Volume Snapshot Performance</title>
+  <para>When you take a snapshot of a data or root volume on VMware, &PRODUCT; uses an
+    efficient storage technique to improve performance.</para>
+  <para>A snapshot is not immediately exported from vCenter to a mounted NFS
+    share and packaged into an OVA file format. This operation would consume time and resources.
+    Instead, the original file formats (e.g., VMDK) provided by vCenter are
+    retained. An OVA file will only be created as needed, on demand. To generate the OVA,
+    &PRODUCT; uses information in a properties file (*.ova.meta) which it stored along with
+    the original snapshot data. </para>
+  <note><para>For upgrading customers: This process applies only to newly created snapshots after upgrade to &PRODUCT;
+    4.2. Snapshots that have already been taken and stored in OVA format will continue to
+    exist in that format, and will continue to work as expected.</para></note>
+  <para/>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/snapshot-restore.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-restore.xml b/en-US/snapshot-restore.xml
new file mode 100644
index 0000000..b2f60f4
--- /dev/null
+++ b/en-US/snapshot-restore.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="snapshot-restore">
+    <title>Snapshot Restore</title>
+        <para>There are two paths to restoring snapshots. Users can create a volume from the snapshot. The volume can then be mounted to a VM and files recovered as needed. Alternatively, a template may be created from the snapshot of a root disk. The user can then boot a VM from this template to effect recovery of the root disk.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/snapshot-throttling.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-throttling.xml b/en-US/snapshot-throttling.xml
new file mode 100644
index 0000000..6bda437
--- /dev/null
+++ b/en-US/snapshot-throttling.xml
@@ -0,0 +1,45 @@
+<?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="snapshot-throttling">
+    <title>Snapshot Job Throttling</title>
+    <para>When a snapshot of a virtual machine is requested, the snapshot job runs on the same
+        host where the VM is running or, in the case of a stopped VM, the host where it ran last. If
+        many snapshots are requested for VMs on a single host, this can lead to problems with too
+        many snapshot jobs overwhelming the resources of the host.</para>
+    <para>To address this situation, the cloud's root administrator can throttle how many snapshot
+        jobs are executed simultaneously on the hosts in the cloud by using the global configuration
+        setting concurrent.snapshots.threshold.perhost. By using this setting, the administrator can
+        better ensure that snapshot jobs do not time out and hypervisor hosts do not experience
+        performance issues due to hosts being overloaded with too many snapshot requests.</para>
+    <para>Set concurrent.snapshots.threshold.perhost to a value that represents a best guess about
+        how many snapshot jobs the hypervisor hosts can execute at one time, given the current
+        resources of the hosts and the number of VMs running on the hosts. If a given host has more
+        snapshot requests, the additional requests are placed in a waiting queue. No new snapshot
+        jobs will start until the number of currently executing snapshot jobs falls below the
+        configured limit.</para>
+    <para>The admin can also set job.expire.minutes to place a maximum on how long a snapshot
+        request will wait in the queue. If this limit is reached, the snapshot request fails and
+        returns an error message. </para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/source-build.xml
----------------------------------------------------------------------
diff --git a/en-US/source-build.xml b/en-US/source-build.xml
new file mode 100644
index 0000000..a56d304
--- /dev/null
+++ b/en-US/source-build.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="source-build">
+    <title>Building &PRODUCT; from Source</title>
+    <note>
+        <para>Prior to the 4.0.0 incubating release, Ant was used to build &PRODUCT;. A migration to Maven started in the 4.0.0 cycle, and has completed in 4.1.0.</para>
+        <para>The website and the wiki contain up to date information on the build procedure at:</para>
+            <itemizedlist>
+                <listitem><para><ulink url="https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+on+master+branch">https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+on+master+branch</ulink></para></listitem>
+                <listitem><para><ulink url="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment">https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment</ulink></para></listitem>
+            </itemizedlist>
+    </note>
+    <para>The overarching steps to build &PRODUCT; are:.</para>
+    <itemizedlist>
+        <listitem><para>Install the prerequisites and setup your environment</para></listitem>
+        <listitem><para>Understand that various Maven profiles and build targets</para></listitem>
+        <listitem><para>Deploy and test your build </para></listitem>
+        <listitem><para>If needed, learn how to build binaries</para></listitem>
+    </itemizedlist>
+
+    <note>
+        <para>Learning Maven is outside the scope of this documentation.</para>
+        <para>Go to the Maven website at <ulink url="http://maven.apache.org/guides/getting-started/index.html">http://maven.apache.org/guides/getting-started/index.html</ulink></para>
+    </note>
+
+</section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/source-prereqs.xml
----------------------------------------------------------------------
diff --git a/en-US/source-prereqs.xml b/en-US/source-prereqs.xml
new file mode 100644
index 0000000..2e40a58
--- /dev/null
+++ b/en-US/source-prereqs.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<section id="sect-source-prereq">
+    <title>Prerequisites for building Apache CloudStack</title>
+    <para>
+       There are a number of prerequisites needed to build &PRODUCT;. This
+       document assumes compilation on a Linux system that uses RPMs or DEBs
+       for package management. 
+    </para>
+    <para>
+       You will need, at a minimum, the following to compile &PRODUCT;:
+       <orderedlist>
+          <listitem><para>Maven (version 3)</para></listitem>
+          <listitem><para>Java (OpenJDK 1.6 or Java 7/OpenJDK 1.7)</para></listitem>
+          <listitem><para>Apache Web Services Common Utilities (ws-commons-util)</para></listitem> 
+          <listitem><para>MySQL</para></listitem>
+          <listitem><para>MySQLdb (provides Python database API)</para></listitem>
+          <listitem><para>Tomcat 6 (not 6.0.35)</para></listitem>
+          <listitem><para>genisoimage</para></listitem>
+          <listitem><para>rpmbuild or dpkg-dev</para></listitem>
+       </orderedlist>
+    </para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/source.xml
----------------------------------------------------------------------
diff --git a/en-US/source.xml b/en-US/source.xml
new file mode 100644
index 0000000..ea30000
--- /dev/null
+++ b/en-US/source.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="sect-source">
+    <title>Building from Source</title>
+    <para>The official &PRODUCT; release is always in source code form. You will likely be able to find "convenience binaries," the source is the canonical release. In this section, we'll cover acquiring the source release and building that so that you can deploy it using Maven or create Debian packages or RPMs.</para>
+    <para>Note that building and deploying directly from source is typically not the most efficient way to deploy an IaaS. However, we will cover that method as well as building RPMs or Debian packages for deploying &PRODUCT;.</para>
+    <para>The instructions here are likely version-specific. That is, the method for building from source for the 4.0.x series is different from the 4.1.x series.</para>
+    <para>If you are working with a unreleased version of &PRODUCT;, see the INSTALL.md file in the top-level directory of the release.</para>
+    <xi:include href="getting-release.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="verifying-source.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="source-prereqs.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="extracting-source.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="build-deb.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="build-rpm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  
+    <xi:include href="build-nonoss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  
+</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/ssl.xml
----------------------------------------------------------------------
diff --git a/en-US/ssl.xml b/en-US/ssl.xml
new file mode 100644
index 0000000..9aeb2f9
--- /dev/null
+++ b/en-US/ssl.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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="ssl">
+    <title>SSL (Optional)</title>
+    <para>&PRODUCT; provides HTTP access in its default installation. There are a number of technologies and sites which choose to implement SSL. As a result, we have left &PRODUCT; to expose HTTP under the assumption that a site will implement its typical practice.</para>
+    <para>&PRODUCT; uses Tomcat as its servlet container. For sites that would like &PRODUCT; to terminate the SSL session, Tomcat’s SSL access may be enabled. Tomcat SSL configuration is described at http://tomcat.apache.org/tomcat-6.0-doc/ssl-howto.html.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/standard-events.xml
----------------------------------------------------------------------
diff --git a/en-US/standard-events.xml b/en-US/standard-events.xml
new file mode 100644
index 0000000..9c10f87
--- /dev/null
+++ b/en-US/standard-events.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="standard-events">
+    <title>Standard Events</title>
+    <para>The events log records three types of standard events.</para>
+    <itemizedlist>
+        <listitem><para>INFO. This event is generated when an operation has been successfully performed.</para></listitem>
+        <listitem><para>WARN. This event is generated in the following circumstances.</para>
+        <itemizedlist>
+            <listitem><para>When a network is disconnected while monitoring a template download.</para></listitem>
+            <listitem><para>When a template download is abandoned.</para></listitem>
+            <listitem><para>When an issue on the storage server causes the volumes to fail over to the mirror storage server.</para></listitem>
+        </itemizedlist>          
+        </listitem>
+        <listitem><para>ERROR. This event is generated when an operation has not been successfully performed</para></listitem>
+    </itemizedlist>
+ 
+	</section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/static-nat.xml
----------------------------------------------------------------------
diff --git a/en-US/static-nat.xml b/en-US/static-nat.xml
new file mode 100644
index 0000000..4225d6e
--- /dev/null
+++ b/en-US/static-nat.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="static-nat">
+    <title>Static NAT</title>
+    <para>A static NAT rule maps a public IP address to the private IP address of a VM in order to allow Internet traffic into the VM. The public IP address always remains the same, which is why it is called “static” NAT. This section tells how to enable or disable static NAT for a particular IP address.</para>
+    <xi:include href="enable-disable-static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/sticky-session-policies-for-lb-rules.xml
----------------------------------------------------------------------
diff --git a/en-US/sticky-session-policies-for-lb-rules.xml b/en-US/sticky-session-policies-for-lb-rules.xml
new file mode 100644
index 0000000..0978085
--- /dev/null
+++ b/en-US/sticky-session-policies-for-lb-rules.xml
@@ -0,0 +1,41 @@
+<?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="sticky-session-policies-for-lb-rules">
+  <title>Sticky Session Policies for Load Balancer Rules</title>
+  <para>Sticky sessions are used in Web-based applications to ensure continued availability of
+    information across the multiple requests in a user's session. For example, if a shopper is
+    filling a cart, you need to remember what has been purchased so far. The concept of "stickiness"
+    is also referred to as persistence or maintaining state.</para>
+  <para>Any load balancer rule defined in &PRODUCT; can have a stickiness policy. The policy
+    consists of a name, stickiness method, and parameters. The parameters are name-value pairs or
+    flags, which are defined by the load balancer vendor. The stickiness method could be load
+    balancer-generated cookie, application-generated cookie, or source-based. In the source-based
+    method, the source IP address is used to identify the user and locate the user’s stored data. In
+    the other methods, cookies are used. The cookie generated by the load balancer or application is
+    included in request and response URLs to create persistence. The cookie name can be specified by
+    the administrator or automatically generated. A variety of options are provided to control the
+    exact behavior of cookies, such as how they are generated and whether they are cached.</para>
+  <para>For the most up to date list of available stickiness methods, see the &PRODUCT; UI or call
+    listNetworks and check the SupportedStickinessMethods capability.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/stop-restart-management-server.xml
----------------------------------------------------------------------
diff --git a/en-US/stop-restart-management-server.xml b/en-US/stop-restart-management-server.xml
new file mode 100644
index 0000000..74a687c
--- /dev/null
+++ b/en-US/stop-restart-management-server.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="stop-restart-management-server">
+    <title>Stopping and Restarting the Management Server</title>
+    <para>The root administrator will need to stop and restart the Management Server from time to time.</para>
+    <para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud..</para>
+    <para>To stop the Management Server, issue the following command at the operating system prompt on the Management Server node:</para>
+    <programlisting># service cloudstack-management stop</programlisting>
+    <para>To start the Management Server:</para>
+    <programlisting># service cloudstack-management start</programlisting>
+    <para>To stop the Management Server:</para>
+    <programlisting># service cloudstack-management stop</programlisting>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/stopped-vm.xml
----------------------------------------------------------------------
diff --git a/en-US/stopped-vm.xml b/en-US/stopped-vm.xml
new file mode 100644
index 0000000..7024be7
--- /dev/null
+++ b/en-US/stopped-vm.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="stopped-vm">
+    <title>Stopped VM</title>
+    <para>&PRODUCT; now supports creating a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A VM can now be deployed in two ways: create and start a VM (the default method); or create a VM and leave it in the stopped state.</para>
+    <para>A new request parameter, startVM, is introduced in the deployVm API to support the stopped VM feature.</para>
+    <para>The possible values are:</para>
+    <itemizedlist>
+        <listitem><para>true - The VM starts as a part of the VM deployment.</para></listitem>
+        <listitem><para>false - The VM is left in the stopped state at the end of the VM deployment.</para></listitem>
+    </itemizedlist>
+    <para>The default value is true.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/stopping-and-starting-vms.xml
----------------------------------------------------------------------
diff --git a/en-US/stopping-and-starting-vms.xml b/en-US/stopping-and-starting-vms.xml
new file mode 100644
index 0000000..25c1f49
--- /dev/null
+++ b/en-US/stopping-and-starting-vms.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="stopping-and-starting-vms">
+	<title>Stopping and Starting VMs</title>
+    <para>Once a VM instance is created, you can stop, restart, or delete it as needed. In the &PRODUCT; UI, click Instances, select the VM, and use the Stop, Start, Reboot, and Destroy buttons.</para>
+</section>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/storage-nw-topology-req.xml
----------------------------------------------------------------------
diff --git a/en-US/storage-nw-topology-req.xml b/en-US/storage-nw-topology-req.xml
new file mode 100644
index 0000000..a594bab
--- /dev/null
+++ b/en-US/storage-nw-topology-req.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="storage-nw-topology-req">
+  <title>Storage Network Topology Requirements</title>
+  <para>The secondary storage NFS export is mounted by the secondary storage VM. Secondary storage
+    traffic goes over the management traffic network, even if there is a separate storage network.
+    Primary storage traffic goes over the storage network, if available. If you choose to place
+    secondary storage NFS servers on the storage network, you must make sure there is a route from
+    the management traffic network to the storage network.</para>
+</section>


Mime
View raw message