http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/secondary-storage-add.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage-add.xml b/en-US/secondary-storage-add.xml
deleted file mode 100644
index 4f06987..0000000
--- a/en-US/secondary-storage-add.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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>Adding Secondary Storage</title>
-    <note><para>Be sure there is nothing stored on the server. Adding the 
server to &PRODUCT; will destroy any existing data.</para></note>
-    <para/>
-    <para>When you create a new zone, the first secondary storage is added as 
part of that procedure. You can add secondary storage servers at any time to 
add more servers to an existing zone.</para>
-    <orderedlist>
-        <listitem><para>To prepare for the zone-based Secondary Staging Store, 
you should have created and mounted an NFS share during Management Server 
installation.</para></listitem>
-        <listitem><para>Make sure you prepared the system VM template during 
Management Server installation.</para></listitem>
-        <listitem><para>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><emphasis role="bold">Name</emphasis>: Give 
the storage a descriptive name.</para></listitem>
-                <listitem><para><emphasis role="bold">Provider</emphasis>: 
Choose the type of storage provider (such as S3,
-            Swift, or NFS). NFS can be used for zone-based storage, and the 
others for region-wide
-            object storage. Depending on which provider you choose, additional 
fields will appear.
-            Fill in all the required fields for your selected provider. For 
more information,
-            consult the provider's documentation (such as the S3 or Swift 
website). </para>
-          <para>For Hyper-V, select SMB/CIFS.</para>
-                <warning><para>You can use only a single region-wide object 
storage account per region.
-                For example, you can not mix both Swift and S3, or use S3 
accounts from multiple different users.</para></warning><para/></listitem>
-                <listitem><para><emphasis role="bold">Create NFS Secondary 
Staging Store</emphasis>: Be sure this box is
-            checked, unless the zone already contains a secondary staging 
store. This would only be
-            the case if you are upgrading an existing NFS secondary storage 
into an object storage,
-            as described in <phrase condition="install"><xref 
linkend="upgrading-to-object-storage"
-              />.</phrase>
-            <phrase condition="admin">Upgrading from NFS to Object Storage in 
the Installation
-              Guide.</phrase> In this case, you can skip the rest of the 
fields described below
-            (Zone, NFS Server, and Path).</para>
-                <warning><para>If you are setting up a new zone, be sure the 
box is checked.
-                    This checkbox and the three fields below it must be filled 
in.
-                    Even when object storage (such as S3) is used as the 
secondary storage provider, an NFS
-                    staging storage in each zone is still 
required.</para></warning><para/></listitem>
-                <listitem>
-          <para><emphasis role="bold">Zone</emphasis>: The zone where the NFS 
Secondary Staging
-            Store is to be located.</para>
-        </listitem>
-              <listitem>
-                <para><emphasis role="bold">Server.</emphasis> The IP address 
or DNS name of
-                  the storage device.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">Path.</emphasis> The exported path 
from the
-                  server.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">SMB Username</emphasis>: 
Applicable only if you select
-            SMB/CIFS provider. The username of the account which has the 
necessary permissions to
-            the SMB shares. The user must be part of the Hyper-V administrator 
group.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">SMB Password</emphasis>: 
Applicable only if you select
-            SMB/CIFS provider. The password associated with the account.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">SMB Domain</emphasis>: Applicable 
only if you select
-            SMB/CIFS provider. The Active Directory domain that the SMB share 
is a part of.</para>
-              </listitem>
-                <listitem><para><emphasis role="bold">NFS server</emphasis>: 
The name of the zone's Secondary Staging
-            Store.</para></listitem>
-                <listitem><para><emphasis role="bold">Path</emphasis>: The 
path to the zone's Secondary Staging Store.</para></listitem>
-            </itemizedlist>
-        </listitem>
-    </orderedlist>
-    <section id="secondary-staging-store">
-        <title>Adding an NFS Secondary Staging Store for Each Zone</title>
-        <para>You can skip this section if you are upgrading an existing zone 
from NFS to object storage.
-          You only need to perform the steps below when setting up a new zone 
that does not yet have its NFS server.</para>
-        <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>To prepare for the zone-based Secondary Staging 
Store, you should have created and mounted an NFS share during Management 
Server installation.</para></listitem>
-            <listitem><para>Make sure you prepared the system VM template 
during Management Server installation.</para></listitem><listitem><para>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>
-  <xi:include href="s3-ss-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/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
deleted file mode 100644
index c2d8a9c..0000000
--- a/en-US/secondary-storage-outage-and-data-loss.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="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/f42520a5/en-US/secondary-storage-vm.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage-vm.xml b/en-US/secondary-storage-vm.xml
deleted file mode 100644
index 34015c3..0000000
--- a/en-US/secondary-storage-vm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/f42520a5/en-US/secondary-storage.xml
----------------------------------------------------------------------
diff --git a/en-US/secondary-storage.xml b/en-US/secondary-storage.xml
deleted file mode 100644
index 4a01c27..0000000
--- a/en-US/secondary-storage.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index bfae188..0000000
--- a/en-US/security-groups-advanced-zones.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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/f42520a5/en-US/security-groups.xml
----------------------------------------------------------------------
diff --git a/en-US/security-groups.xml b/en-US/security-groups.xml
deleted file mode 100644
index 6b36650..0000000
--- a/en-US/security-groups.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/f42520a5/en-US/security-req.xml
----------------------------------------------------------------------
diff --git a/en-US/security-req.xml b/en-US/security-req.xml
deleted file mode 100644
index a4869b4..0000000
--- a/en-US/security-req.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 164235f..0000000
--- a/en-US/send-projects-membership-invitation.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/separate_storage_network.xml
----------------------------------------------------------------------
diff --git a/en-US/separate_storage_network.xml 
b/en-US/separate_storage_network.xml
deleted file mode 100644
index c3f6330..0000000
--- a/en-US/separate_storage_network.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!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/f42520a5/en-US/service-offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/service-offerings.xml b/en-US/service-offerings.xml
deleted file mode 100644
index 5283c05..0000000
--- a/en-US/service-offerings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 8265ae5..0000000
--- a/en-US/set-database-buffer-pool-size.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 8ec1325..0000000
--- a/en-US/set-global-project-resource-limits.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 0cc2475..0000000
--- a/en-US/set-monitor-total-vm-limits-per-host.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index a0f64ea..0000000
--- a/en-US/set-per-project-resource-limits.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index dd9cfe9..0000000
--- a/en-US/set-projects-creator-permissions.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 669ca25..0000000
--- a/en-US/set-resource-limits-for-projects.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/f42520a5/en-US/set-up-invitations.xml
----------------------------------------------------------------------
diff --git a/en-US/set-up-invitations.xml b/en-US/set-up-invitations.xml
deleted file mode 100644
index 180c041..0000000
--- a/en-US/set-up-invitations.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index c22babc..0000000
--- a/en-US/set-up-network-for-users.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/f42520a5/en-US/set-usage-limit.xml
----------------------------------------------------------------------
diff --git a/en-US/set-usage-limit.xml b/en-US/set-usage-limit.xml
deleted file mode 100644
index 5e2d770..0000000
--- a/en-US/set-usage-limit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index 2159b75..0000000
--- a/en-US/set-zone-vlan-run-vm-max.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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/f42520a5/en-US/shared-networks.xml
----------------------------------------------------------------------
diff --git a/en-US/shared-networks.xml b/en-US/shared-networks.xml
deleted file mode 100644
index b8a86f1..0000000
--- a/en-US/shared-networks.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index a2f897f..0000000
--- a/en-US/signing-api-calls-python.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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":"[email protected]","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":"[email protected]","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/f42520a5/en-US/signing-api-requests.xml
----------------------------------------------------------------------
diff --git a/en-US/signing-api-requests.xml b/en-US/signing-api-requests.xml
deleted file mode 100644
index 92ff79e..0000000
--- a/en-US/signing-api-requests.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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/f42520a5/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
deleted file mode 100644
index dda96df..0000000
--- a/en-US/site-to-site-vpn.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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. You can also establish a secure connection 
between two VPC setups
-    or high availability zones in your environment. 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>
-    <listitem>
-      <para>&PRODUCT; virtual routers</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>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="create-passive-vpn-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/f42520a5/en-US/small_scale_deployment.xml
----------------------------------------------------------------------
diff --git a/en-US/small_scale_deployment.xml b/en-US/small_scale_deployment.xml
deleted file mode 100644
index bba2b9a..0000000
--- a/en-US/small_scale_deployment.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!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/f42520a5/en-US/snapshot-performance-vmware.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-performance-vmware.xml 
b/en-US/snapshot-performance-vmware.xml
deleted file mode 100644
index c26d66d..0000000
--- a/en-US/snapshot-performance-vmware.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/f42520a5/en-US/snapshot-restore.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-restore.xml b/en-US/snapshot-restore.xml
deleted file mode 100644
index b2f60f4..0000000
--- a/en-US/snapshot-restore.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/f42520a5/en-US/snapshot-throttling.xml
----------------------------------------------------------------------
diff --git a/en-US/snapshot-throttling.xml b/en-US/snapshot-throttling.xml
deleted file mode 100644
index 6bda437..0000000
--- a/en-US/snapshot-throttling.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>

Reply via email to