cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [28/51] [partial] cloudstack-docs git commit: Remove all old docbook files
Date Thu, 01 Oct 2015 14:04:38 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/management-server-install-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/management-server-install-overview.xml b/en-US/management-server-install-overview.xml
deleted file mode 100644
index 5f46b00..0000000
--- a/en-US/management-server-install-overview.xml
+++ /dev/null
@@ -1,48 +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="management-server-installation-overview">
-    <title>Management Server Installation Overview</title>
-    <para>This section describes installing the Management Server. There are two slightly different installation flows, depending on how many Management Server nodes will be in your cloud:</para>
-    <itemizedlist>
-        <listitem><para>A single Management Server node, with MySQL on the same node.</para></listitem>
-        <listitem><para>Multiple Management Server nodes, with MySQL on a node separate from the Management Servers.</para></listitem>
-    </itemizedlist>
-    <para>In either case, each machine must meet the system requirements described in System Requirements.</para> 
-    <warning><para>For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.</para></warning>
-    <para>The procedure for installing the Management Server is:</para>
-    <orderedlist>
-                <listitem>
-      <para>Prepare the Operating System</para>
-    </listitem>
-    <listitem>
-      <para>(XenServer only) Download and install vhd-util.</para>
-    </listitem>
-                <listitem><para>Install the First Management Server</para></listitem>
-                <listitem><para>Install and Configure the MySQL database</para></listitem>
-                <listitem><para>Prepare NFS Shares</para></listitem>
-                <listitem><para>Prepare and Start Additional Management Servers (optional)</para></listitem>
-                <listitem><para>Prepare the System VM Template</para></listitem>
-            </orderedlist>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/management-server-install-prepare-os.xml
----------------------------------------------------------------------
diff --git a/en-US/management-server-install-prepare-os.xml b/en-US/management-server-install-prepare-os.xml
deleted file mode 100644
index 02453a0..0000000
--- a/en-US/management-server-install-prepare-os.xml
+++ /dev/null
@@ -1,54 +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="prepare-os">
-    <title>Prepare the Operating System</title>
-    <para>The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.</para>
-    <orderedlist>
-        <listitem><para>Log in to your OS as root.</para></listitem>
-        <listitem>
-            <para>Check for a fully qualified hostname.</para>
-            <programlisting language="Bash">hostname --fqdn</programlisting>
-            <para>This should return a fully qualified hostname such as "management1.lab.example.org".  If it does not, edit /etc/hosts so that it does.</para>
-        </listitem>
-        <listitem>
-            <para>Make sure that the machine can reach the Internet.</para>
-            <programlisting language="Bash">ping www.cloudstack.org</programlisting>
-        </listitem>
-        <listitem>
-            <para>Turn on NTP for time synchronization.</para>
-            <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
-            <orderedlist numeration="loweralpha">
-                <listitem>
-                    <para>Install NTP.</para>
-                    <para condition="community">On RHEL or CentOS:</para>
-                    <programlisting language="Bash">yum install ntp</programlisting>
-                    <para condition="community">On Ubuntu:</para>
-                    <programlisting language="Bash">apt-get install openntpd</programlisting>
-                </listitem>
-            </orderedlist>
-        </listitem>
-        <listitem><para>Repeat all of these steps on every host where the Management Server will be installed.</para></listitem>
-    </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/management-server-install-systemvm.xml
----------------------------------------------------------------------
diff --git a/en-US/management-server-install-systemvm.xml b/en-US/management-server-install-systemvm.xml
deleted file mode 100644
index 32098b8..0000000
--- a/en-US/management-server-install-systemvm.xml
+++ /dev/null
@@ -1,80 +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="prepare-system-vm-template">
-  <title>Prepare the System VM Template</title>
-  <para>Secondary storage must be seeded with a template that is used for &PRODUCT; system
-    VMs.</para>
-  <note>
-    <para>When copying and pasting a command, be sure the command has pasted as a single line before
-      executing. Some document viewers may introduce unwanted line breaks in copied text.</para>
-  </note>
-  <orderedlist>
-    <listitem>
-      <para>On the Management Server, run one or more of the following cloud-install-sys-tmplt
-        commands to retrieve and decompress the system VM template. Run the command for each
-        hypervisor type that you expect end users to run in this Zone.</para>
-      <para>If your secondary storage mount point is not named /mnt/secondary, substitute your own
-        mount point name.</para>
-      <para>If you set the &PRODUCT; database encryption type to "web" when you set up the database,
-          you must now add the parameter -s &lt;management-server-secret-key&gt;. See <xref linkend="about-password-encryption" />.</para>
-      <para>This process will require approximately 5 GB of free space on the local file system and
-        up to 30 minutes each time it runs.</para>
-      <itemizedlist>
-        <listitem>
-          <para>For Hyper-V</para>
-          <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2 -h hyperv -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For XenServer:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h xenserver -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For vSphere:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h vmware -s &lt;optional-management-server-secret-key&gt;  -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For KVM:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For LXC:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h lxc -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-      </itemizedlist>
-      <para>On Ubuntu, use the following path instead:</para>
-      <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
-    </listitem>
-    <listitem>
-      <para>If you are using a separate NFS server, perform this step. If you are using the
-        Management Server as the NFS server, you MUST NOT perform this step.</para>
-      <para>When the script has finished, unmount secondary storage and remove the created
-        directory.</para>
-      <programlisting># umount /mnt/secondary
-# rmdir /mnt/secondary</programlisting>
-    </listitem>
-    <listitem>
-      <para>Repeat these steps for each secondary storage server.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/management-server-lb.xml
----------------------------------------------------------------------
diff --git a/en-US/management-server-lb.xml b/en-US/management-server-lb.xml
deleted file mode 100644
index 13f8756..0000000
--- a/en-US/management-server-lb.xml
+++ /dev/null
@@ -1,66 +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="management-server-lb">
-  <title>Management Server Load Balancing</title>
-  <para>&PRODUCT; can use a load balancer to provide a virtual IP for multiple Management
-    Servers. The administrator is responsible for creating the load balancer rules for the
-    Management Servers. The application requires persistence or stickiness across multiple sessions.
-    The following chart lists the ports that should be load balanced and whether or not persistence
-    is required.</para>
-  <para>Even if persistence is not required, enabling it is permitted.</para>
-  <informaltable>
-    <tgroup cols="4" align="left" colsep="1" rowsep="1">
-      <thead>
-        <row>
-          <entry><para>Source Port</para></entry>
-          <entry><para>Destination Port</para></entry>
-          <entry><para>Protocol</para></entry>
-          <entry><para>Persistence Required?</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><para>80 or 443</para></entry>
-          <entry><para>8080 (or 20400 with AJP)</para></entry>
-          <entry><para>HTTP (or AJP)</para></entry>
-          <entry><para>Yes</para></entry>
-        </row>
-        <row>
-          <entry><para>8250</para></entry>
-          <entry><para>8250</para></entry>
-          <entry><para>TCP</para></entry>
-          <entry><para>Yes</para></entry>
-        </row>
-        <row>
-          <entry><para>8096</para></entry>
-          <entry><para>8096</para></entry>
-          <entry><para>HTTP</para></entry>
-          <entry><para>No</para></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-  <para>In addition to above settings, the administrator is responsible for setting the 'host' global
-    config value from the management server IP to load balancer virtual IP address.
-    If the 'host' value is not set to the VIP for Port 8250 and one of your management servers crashes,
-    the UI is still available but the system VMs will not be able to contact the management server.
-  </para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/management-server-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/management-server-overview.xml b/en-US/management-server-overview.xml
deleted file mode 100644
index b8e2d53..0000000
--- a/en-US/management-server-overview.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo 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="management-server-overview">
-    <title>Management Server Overview</title>
-    <para>
-       The Management Server is the &PRODUCT; software that manages cloud
-       resources. By interacting with the Management Server through its UI or
-       API, you can configure and manage your cloud infrastructure.
-    </para>
-    <para>
-       The Management Server runs on a dedicated server or VM. It controls
-       allocation of virtual machines to hosts and assigns storage and IP
-       addresses to the virtual machine instances. The Management Server
-       runs in a Tomcat container and requires a MySQL database for persistence.
-    </para>
-    <para>
-       The machine must meet the system requirements described in System 
-       Requirements.
-    </para>
-    <para>The Management Server:
-    </para>
-        <itemizedlist>
-        <listitem>
-            <para>
-               Provides the web user interface for the administrator and a
-               reference user interface for end users.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Provides the APIs for &PRODUCT;.</para>
-        </listitem>
-        <listitem>
-            <para>Manages the assignment of guest VMs to particular hosts.</para>
-        </listitem>
-        <listitem>
-            <para>
-               Manages the assignment of public and private IP addresses to
-               particular accounts.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Manages the allocation of storage to guests as virtual disks.</para>
-        </listitem>
-        <listitem>
-            <para>
-               Manages snapshots, templates, and ISO images, possibly 
-               replicating them across data centers.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Provides a single point of configuration for the cloud.</para>
-        </listitem>
-        </itemizedlist>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --git a/en-US/manual-live-migration.xml b/en-US/manual-live-migration.xml
deleted file mode 100644
index 1daa6d3..0000000
--- a/en-US/manual-live-migration.xml
+++ /dev/null
@@ -1,56 +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="manual-live-migration">
-	<title>Moving VMs Between Hosts (Manual Live Migration)</title>
-		<para>The &PRODUCT; administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
-		<itemizedlist>
-			<listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
-			<listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>	
-			<listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
-			<listitem><para>(KVM) The VM must not be using local disk storage. (On XenServer and VMware, VM live migration
-				with local disk is enabled by &PRODUCT; support for XenMotion and vMotion.)</para></listitem>
-			<listitem><para>(KVM) The destination host must be in the same cluster as the original host.
-				(On XenServer and VMware, VM live migration from one cluster to another is enabled by &PRODUCT; support for XenMotion and vMotion.)</para></listitem>				
-            <!--            <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem> -->
-		</itemizedlist>
-		<para>To manually live migrate a virtual machine</para>
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation, click Instances.</para></listitem>
-			<listitem><para>Choose the VM that you want to migrate.</para></listitem>
-			<listitem><para>Click the Migrate Instance button.<inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/migrate-instance.png" />
-				</imageobject>
-				<textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
-			</inlinemediaobject>
-				</para></listitem>
-			<listitem><para>From the list of  suitable hosts, choose the one to which you want to move the VM.</para>
-				<note><para>If the VM's storage has to be migrated along with the VM, this will be noted in the host
-					list. &PRODUCT; will take care of the storage migration for you.</para></note>
-				<para/></listitem>
-			<listitem><para>Click OK.</para></listitem>
-		</orderedlist>
-	</section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/marvin.xml
----------------------------------------------------------------------
diff --git a/en-US/marvin.xml b/en-US/marvin.xml
deleted file mode 100644
index 8fd2c96..0000000
--- a/en-US/marvin.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="marvin">
-    <title>Marvin</title>
-    <para>Marvin is the &PRODUCT; automation framework. It originated as a tool for integration testing but is now also used to build DevCloud as well as to provide a Python &PRODUCT; API binding.</para>
-    <note>
-        <para>Marvin's complete documenation is on the wiki at <ulink url="https://cwiki.apache.org/CLOUDSTACK/testing-with-python.html">https://cwiki.apache.org/CLOUDSTACK/testing-with-python.html</ulink></para>
-        <para>The source code is located at <emphasis>tools/marvin</emphasis></para>
-    </note>
-    <xi:include href="building-marvin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/max-result-page-returned.xml
----------------------------------------------------------------------
diff --git a/en-US/max-result-page-returned.xml b/en-US/max-result-page-returned.xml
deleted file mode 100644
index fdbf639..0000000
--- a/en-US/max-result-page-returned.xml
+++ /dev/null
@@ -1,38 +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="max-result-page-returned">
-        <title>Maximum Result Pages Returned</title>
-        <para>
-            For each cloud, there is a default upper limit on the number of results that any API command will return in a single page. This is to help prevent overloading the cloud servers and prevent DOS attacks. For example, if the page size limit is 500 and a command returns 10,000 results, the command will return 20 pages.
-        </para>
-        <para>The default page size limit can be different for each cloud. It is set in the global configuration parameter default.page.size. If your cloud has many users with lots of VMs, you might need to increase the value of this parameter. At the same time, be careful not to set it so high that your site can be taken down by an enormous return from an API call. For more information about how to set global configuration parameters, see "Describe Your Deployment" in the Installation Guide.</para>
-        <para>To decrease the page size limit for an individual API command, override the global setting with the page and pagesize parameters, which are available in any list* command (listCapabilities, listDiskOfferings, etc.).</para>
-        <itemizedlist>
-            <listitem><para>Both parameters must be specified together.</para></listitem>
-            <listitem><para>The value of the pagesize parameter must be smaller than the value of default.page.size. That is, you can not increase the number of possible items in a result page, only decrease it.</para></listitem>
-        </itemizedlist>
-        <para>For syntax information on the list* commands, see the API Reference.</para>
-    </section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/migrate-datadisk-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/en-US/migrate-datadisk-volume-new-storage-pool.xml b/en-US/migrate-datadisk-volume-new-storage-pool.xml
deleted file mode 100644
index 1ed6bbd..0000000
--- a/en-US/migrate-datadisk-volume-new-storage-pool.xml
+++ /dev/null
@@ -1,78 +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="migrate-datadisk-volume-new-storage-pool">
-    <title>Migrating a Data Volume to a New Storage Pool</title>
-    <para>There are two situations when you might want to migrate a disk:</para>
-    <itemizedlist>
-        <listitem><para>Move the disk to new storage, but leave it attached to the same running VM.</para></listitem>
-        <listitem><para>Detach the disk from its current VM, move it to new storage, and attach it to a new VM.</para></listitem>
-    </itemizedlist>
-    <section id="migrate-storage-same-vm">
-        <title>Migrating Storage For a Running VM</title>
-        <para>(Supported on XenServer and VMware)</para>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-            <listitem><para>In the left navigation bar, click Instances, click the VM name, and click View Volumes.</para></listitem>
-            <listitem><para>Click the volume you want to migrate.</para></listitem>
-            <listitem><para>Detach the disk from the VM.
-                See <xref linkend="detach-move-volumes"/> but skip the “reattach” step at the end. You
-                will do that after migrating to new storage.</para></listitem>
-            <listitem><para>Click the Migrate Volume button<inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/migrate-instance.png"/>
-                </imageobject>
-                <textobject>
-                    <phrase>Migrateinstance.png: button to migrate a volume</phrase>
-                </textobject>
-            </inlinemediaobject>
-                and choose the destination from the dropdown list.</para></listitem>
-            <listitem><para>Watch for the volume status to change to Migrating, then back to Ready.</para></listitem>
-        </orderedlist>
-    </section>
-    <section id="migrate-storage-change-vm">
-        <title>Migrating Storage and Attaching to a Different VM</title>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-            <listitem><para>Detach the disk from the VM.
-                See <xref linkend="detach-move-volumes"/> but skip the “reattach” step at the end. You
-                will do that after migrating to new storage.</para></listitem>
-            <listitem><para>Click the Migrate Volume button<inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/migrate-instance.png"/>
-                </imageobject>
-                <textobject>
-                    <phrase>Migrateinstance.png: button to migrate a volume</phrase>
-                </textobject>
-            </inlinemediaobject>
-                and choose the destination from the dropdown list.</para></listitem>
-            <listitem><para>Watch for the volume status to change to Migrating, then back to Ready. You can find the
-                volume by clicking Storage in the left navigation bar. Make sure that Volumes is
-                displayed at the top of the window, in the Select View dropdown.</para></listitem>
-            <listitem><para>Attach the volume to any desired VM running in the same cluster as the new storage server. See
-                <xref linkend="attaching-volume"/>
-            </para></listitem>
-        </orderedlist>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml b/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
deleted file mode 100644
index 3bcaff5..0000000
--- a/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
+++ /dev/null
@@ -1,47 +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="migrate-vm-rootvolume-volume-new-storage-pool">
-	<title>Migrating a VM Root Volume to a New Storage Pool</title>
-	<para>(XenServer, VMware) You can live migrate a VM's root disk from one storage pool to another, without stopping the VM first.</para>
-	<para>(KVM) When migrating the root disk volume, the VM must first be stopped, and users can not access the VM. After migration is complete, the VM can be restarted.</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-		<listitem><para>In the left navigation bar, click Instances, and click the VM name.</para></listitem>
-		<listitem><para>(KVM only) Stop the VM.</para></listitem>
-		<listitem><para>Click the Migrate button <inlinemediaobject>
-			<imageobject>
-				<imagedata fileref="./images/migrate-instance.png"/>
-			</imageobject>
-			<textobject>
-				<phrase>Migrateinstance.png: button to migrate a VM or volume</phrase>
-			</textobject>
-		</inlinemediaobject>
-			and choose the destination from the dropdown list.</para>
-			<note><para>If the VM's storage has to be migrated along with the VM, this will be noted in the host
-				list. &PRODUCT; will take care of the storage migration for you.</para></note><para/></listitem>
-		<listitem><para>Watch for the volume status to change to Migrating, then back to Running (or Stopped, in the case of KVM). This
-			can take some time.</para></listitem>
-		<listitem><para>(KVM only) Restart the VM.</para></listitem>
-	</orderedlist>
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/en-US/minimum-system-requirements.xml b/en-US/minimum-system-requirements.xml
deleted file mode 100644
index b5fcf99..0000000
--- a/en-US/minimum-system-requirements.xml
+++ /dev/null
@@ -1,130 +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="minimum-system-requirements">
-  <title>Minimum System Requirements</title>
-  <section id="management-server-system-requirements">
-    <title>Management Server, Database, and Storage System Requirements</title>
-    <para> The machines that will run the Management Server and MySQL database must meet the
-      following requirements. The same machines can also be used to provide primary and secondary
-      storage, such as via localdisk or NFS. The Management Server may be placed on a virtual
-      machine. </para>
-    <itemizedlist>
-      <listitem>
-        <para>Operating system:</para>
-        <itemizedlist>
-          <listitem>
-            <para>Preferred: CentOS/RHEL 6.3+ or Ubuntu 12.04(.1)</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para>64-bit x86 CPU (more cores results in better performance)</para>
-      </listitem>
-      <listitem>
-        <para>4 GB of memory</para>
-      </listitem>
-      <listitem>
-        <para>250 GB of local disk (more results in better capability; 500 GB recommended)</para>
-      </listitem>
-      <listitem>
-        <para>At least 1 NIC</para>
-      </listitem>
-      <listitem>
-        <para>Statically allocated IP address</para>
-      </listitem>
-      <listitem>
-        <para>Fully qualified domain name as returned by the hostname command</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section id="hypervisor-system-requirements">
-    <title>Host/Hypervisor System Requirements</title>
-    <para>The host is where the cloud services run in the form of guest virtual machines. Each host
-      is one machine that meets the following requirements:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Must support HVM (Intel-VT or AMD-V enabled).</para>
-      </listitem>
-      <listitem>
-        <para>64-bit x86 CPU (more cores results in better performance)</para>
-      </listitem>
-      <listitem>
-        <para>Hardware virtualization support required</para>
-      </listitem>
-      <listitem>
-        <para>4 GB of memory</para>
-      </listitem>
-      <listitem>
-        <para>36 GB of local disk</para>
-      </listitem>
-      <listitem>
-        <para>At least 1 NIC</para>
-      </listitem>
-      <listitem>
-        <note>
-          <para>If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used
-            for these hosts and the DHCP router created by &PRODUCT;.</para>
-        </note>
-      </listitem>
-      <listitem>
-        <para>Latest hotfixes applied to hypervisor software</para>
-      </listitem>
-      <listitem>
-        <para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already
-          running</para>
-      </listitem>
-      <listitem>
-        <para>All hosts within a cluster must be homogeneous. The CPUs must be of the same type,
-          count, and feature flags.</para>
-      </listitem>
-    </itemizedlist>
-    <para>Hosts have additional requirements depending on the hypervisor. See the requirements
-      listed at the top of the Installation section for your chosen hypervisor:</para>
-    <warning>
-      <para>Be sure you fulfill the additional hypervisor requirements and installation steps
-        provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack.
-        For example, the requirements for XenServer are listed under Citrix XenServer
-        Installation.</para>
-    </warning>
-    <para></para>
-    <itemizedlist>
-      <listitem>
-        <para><xref linkend="hypervisor-kvm-requirements"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="system-requirements-xenserver-hosts"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="hyperv-requirements"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="vmware-requirements"/></para>
-      </listitem>
-      <!--            <listitem><para><xref linkend="ovm-requirements"/></para></listitem> -->
-      <listitem>
-        <para><xref linkend="lxc-requirements"/></para>
-      </listitem>
-    </itemizedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/modify-delete-service-offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/modify-delete-service-offerings.xml b/en-US/modify-delete-service-offerings.xml
deleted file mode 100644
index b917af4..0000000
--- a/en-US/modify-delete-service-offerings.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="modify-delete-service-offerings">
-    <title>Modifying or Deleting a Service Offering</title>
-    <para>Service offerings cannot be changed once created. This applies to both compute offerings and disk offerings.</para>
-    <para>A service offering can be deleted. If it is no longer in use, it is deleted immediately and permanently. If the service offering is still in use, it will remain in the database until all the virtual machines referencing it have been deleted. After deletion by the administrator, a service offering will not be available to end users that are creating new instances.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multi_node_management_server.xml
----------------------------------------------------------------------
diff --git a/en-US/multi_node_management_server.xml b/en-US/multi_node_management_server.xml
deleted file mode 100644
index 1ff713d..0000000
--- a/en-US/multi_node_management_server.xml
+++ /dev/null
@@ -1,36 +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="multi_node_management_server">
-    <title>Multi-Node Management Server</title>
-    <para>The &PRODUCT; Management Server is deployed on one or more front-end servers connected to a single MySQL database. Optionally a pair of hardware load balancers distributes requests from the web. A backup management server set may be deployed using MySQL replication at a remote site to add DR capabilities.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/multi-node-management-server.png" />
-        </imageobject>
-        <textobject><phrase>Multi-Node Management Server</phrase></textobject>
-    </mediaobject>
-    <para>The administrator must decide the following.</para>
-    <itemizedlist>
-        <listitem><para>Whether or not load balancers will be used.</para></listitem>
-        <listitem><para>How many Management Servers will be deployed.</para></listitem>
-        <listitem><para>Whether MySQL replication will be deployed to enable disaster recovery.</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multi_node_overview.xml
----------------------------------------------------------------------
diff --git a/en-US/multi_node_overview.xml b/en-US/multi_node_overview.xml
deleted file mode 100644
index 1eee037..0000000
--- a/en-US/multi_node_overview.xml
+++ /dev/null
@@ -1,43 +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="multi_node_installation_overview">
-        <title>Management Server Multi-Node Installation Overview</title>
-        <para>
-            This section describes installing multiple Management Servers and installing MySQL on a node separate from the Management Servers. The machines must meet the system requirements described in System Requirements.
-        </para>
-        <warning><para>For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.</para></warning>
-        <para>
-            The procedure for a multi-node installation is:
-        </para>
-            <orderedlist>
-                <listitem><para>Prepare the Operating System</para></listitem>
-                <listitem><para>Install the First Management Server</para></listitem>
-                <listitem><para>Install and Configure the Database</para></listitem>
-                <listitem><para>Prepare NFS Shares</para></listitem>
-                <listitem><para>Prepare and Start Additional Management Servers</para></listitem>
-                <listitem><para>Prepare the System VM Template</para></listitem>
-            </orderedlist>
-    </section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multi_site_deployment.xml
----------------------------------------------------------------------
diff --git a/en-US/multi_site_deployment.xml b/en-US/multi_site_deployment.xml
deleted file mode 100644
index 8ad94aa..0000000
--- a/en-US/multi_site_deployment.xml
+++ /dev/null
@@ -1,50 +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="multi_site_deployment">
-    <title>Multi-Site Deployment</title>
-    <para>The &PRODUCT; platform scales well into multiple sites through the use of zones. The following diagram shows an example of a multi-site deployment.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/multi-site-deployment.png" />
-        </imageobject>
-        <textobject><phrase>Example Of A Multi-Site Deployment</phrase></textobject>
-    </mediaobject>
-    <para>Data Center 1 houses the primary Management Server as well as zone 1. The MySQL database is replicated in real time to the secondary Management Server installation in Data Center 2.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/separate-storage-network.png" />
-        </imageobject>
-        <textobject><phrase>Separate Storage Network</phrase></textobject>
-    </mediaobject>
-    <para>This diagram illustrates a setup with a separate storage network. Each server has four NICs, two connected to pod-level network switches and two connected to storage network switches.</para>
-    <para>There are two ways to configure the storage network:</para>
-    <itemizedlist>
-        <listitem><para> Bonded NIC and redundant switches can be deployed for NFS.  In NFS deployments, redundant switches and bonded NICs still result in one network (one CIDR block+ default gateway address).</para></listitem>
-        <listitem><para> iSCSI can take advantage of two separate storage networks (two CIDR blocks each with its own default gateway). Multipath iSCSI client can failover and load balance between separate storage networks.</para></listitem>
-    </itemizedlist>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nic-bonding-and-multipath-io.png" />
-        </imageobject>
-        <textobject><phrase>NIC Bonding And Multipath I/O</phrase></textobject>
-    </mediaobject>
-    <para> This diagram illustrates the differences between NIC bonding and Multipath I/O (MPIO). NIC bonding configuration involves only one network. MPIO involves two separate networks.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multiple-ip-nic.xml
----------------------------------------------------------------------
diff --git a/en-US/multiple-ip-nic.xml b/en-US/multiple-ip-nic.xml
deleted file mode 100644
index 344dc8d..0000000
--- a/en-US/multiple-ip-nic.xml
+++ /dev/null
@@ -1,95 +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="multiple-ip-nic">
-  <title>Configuring Multiple IP Addresses on a Single NIC</title>
-  <para>&PRODUCT; provides you the ability to associate multiple private IP addresses per guest VM
-    NIC. In addition to the primary IP, you can assign additional IPs to the guest VM NIC. This
-    feature is supported on all the network configurations&mdash;Basic, Advanced, and VPC. Security
-    Groups, Static NAT and Port forwarding services are supported on these additional IPs. </para>
-  <para>As always, you can specify an IP from the guest subnet; if not specified, an IP is
-    automatically picked up from the guest VM subnet. You can view the IPs associated with for each
-    guest VM NICs on the UI. You can apply NAT on these additional guest IPs by using network
-    configuration option in the &PRODUCT; UI. You must specify the NIC to which the IP should be
-    associated.</para>
-  <para>This feature is supported on XenServer, KVM, and VMware hypervisors. Note that Basic zone
-    security groups are not supported on VMware.</para>
-  <section id="usecases-mip">
-    <title>Use Cases</title>
-    <para>Some of the use cases are described below:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Network devices, such as firewalls and load balancers, generally work best when they
-          have access to multiple IP addresses on the network interface.</para>
-      </listitem>
-      <listitem>
-        <para>Moving private IP addresses between interfaces or instances. Applications that are
-          bound to specific IP addresses can be moved between instances. </para>
-      </listitem>
-      <listitem>
-        <para>Hosting multiple SSL Websites on a single instance. You can install multiple SSL
-          certificates on a single instance, each associated with a distinct IP address.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section id="guideline-nic">
-    <title>Guidelines</title>
-    <para>To prevent IP conflict, configure different subnets when multiple networks are connected
-      to the same VM.</para>
-  </section>
-  <section id="workflow-rn">
-    <title>Assigning Additional IPs to a VM</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in to the &PRODUCT; UI.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation bar, click Instances.</para>
-      </listitem>
-      <listitem>
-        <para>Click the name of the instance you want to work with.</para>
-      </listitem>
-      <listitem>
-        <para>In the Details tab, click NICs.</para>
-      </listitem>
-      <listitem>
-        <para>Click View Secondary IPs.</para>
-      </listitem>
-      <listitem>
-        <para>Click Acquire New Secondary IP, and click Yes in the confirmation dialog.</para>
-        <para>You need to configure the IP on the guest VM NIC manually. &PRODUCT; will not
-          automatically configure the acquired IP address on the VM. Ensure that the IP address
-          configuration persist on VM reboot.</para>
-        <para>Within a few moments, the new IP address should appear with the state Allocated. You
-          can now use the IP address in Port Forwarding or StaticNAT rules.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="caveats">
-    <title>Port Forwarding and StaticNAT Services Changes</title>
-    <para>Because multiple IPs can be associated per NIC, you are allowed to select a desired IP for
-      the Port Forwarding and StaticNAT services. The default is the primary IP. To enable this
-      functionality, an extra optional parameter 'vmguestip' is added to the Port forwarding and
-      StaticNAT APIs (enableStaticNat, createIpForwardingRule) to indicate on what IP address NAT
-      need to be configured. If vmguestip is passed, NAT is configured on the specified private IP
-      of the VM. if not passed, NAT is configured on the primary IP of the VM.</para>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multiple-ip-range.xml
----------------------------------------------------------------------
diff --git a/en-US/multiple-ip-range.xml b/en-US/multiple-ip-range.xml
deleted file mode 100644
index 42e0c2a..0000000
--- a/en-US/multiple-ip-range.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="multiple-ip-range">
-  <title>About Multiple IP Ranges</title>
-  <note>
-    <para>The feature can only be implemented on IPv4 addresses.</para>
-  </note>
-  <para>&PRODUCT; provides you with the flexibility to add guest IP ranges from different subnets in
-    Basic zones and security groups-enabled Advanced zones. For security groups-enabled Advanced
-    zones, it implies multiple subnets can be added to the same VLAN. With the addition of this
-    feature, you will be able to add IP address ranges from the same subnet or from a different one
-    when IP address are exhausted. This would in turn allows you to employ higher number of subnets
-    and thus reduce the address management overhead. To support this feature, the capability of
-      <code>createVlanIpRange</code> API is extended to add IP ranges also from a different
-    subnet.</para>
-  <para>Ensure that you manually configure the gateway of the new subnet before adding the IP range.
-    Note that &PRODUCT; supports only one gateway for a subnet; overlapping subnets are not
-    currently supported.</para>
-  <para>Use the <code>deleteVlanRange</code> API to delete IP ranges. This operation fails if an IP
-    from the remove range is in use. If the remove range contains the IP address on which the DHCP
-    server is running, &PRODUCT; acquires a new IP from the same subnet. If no IP is available in
-    the subnet, the remove operation fails.</para>
-  <para>This feature is supported on KVM, xenServer, and VMware hypervisors.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/multiple-system-vm-vmware.xml
----------------------------------------------------------------------
diff --git a/en-US/multiple-system-vm-vmware.xml b/en-US/multiple-system-vm-vmware.xml
deleted file mode 100644
index 014dfa1..0000000
--- a/en-US/multiple-system-vm-vmware.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="multiple-system-vm-vmware">
-    <title>Multiple System VM Support for VMware</title>
-    <para>Every &PRODUCT; zone has single System VM for template processing tasks such as downloading templates, uploading templates, and uploading ISOs. In a zone where VMware is being used, additional System VMs can be launched to process VMware-specific tasks such as taking snapshots and creating private templates. The &PRODUCT; management server launches additional System VMs for VMware-specific tasks as the load increases. The management server monitors and weights all commands sent to these System VMs and performs dynamic load balancing and scaling-up of more System VMs.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-offering-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/en-US/network-offering-usage-record-format.xml b/en-US/network-offering-usage-record-format.xml
deleted file mode 100644
index a1b0da9..0000000
--- a/en-US/network-offering-usage-record-format.xml
+++ /dev/null
@@ -1,43 +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="network-offering-usage-record-format">
-    <title>Network Offering Usage Record Format</title>
-    <itemizedlist>
-            <listitem><para>account – name of the account</para></listitem>
-            <listitem><para>accountid – ID of the account</para></listitem>
-            <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
-            <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
-            <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
-            <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
-            <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
-            <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
-            <listitem><para>usageid – ID of the network offering</para></listitem>
-            <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
-            <listitem><para>offeringid – Network offering ID</para></listitem>
-            <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
-            <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
-            <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
-        </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/network-offerings.xml b/en-US/network-offerings.xml
deleted file mode 100644
index 8c685bf..0000000
--- a/en-US/network-offerings.xml
+++ /dev/null
@@ -1,87 +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="network-offerings">
-  <title>Network Offerings</title>
-  <note>
-    <para>For the most up-to-date list of supported network services, see the &PRODUCT; UI or call
-      listNetworkServices.</para>
-  </note>
-  <para>A network offering is a named set of network services, such as:</para>
-  <itemizedlist>
-    <listitem>
-      <para>DHCP</para>
-    </listitem>
-    <listitem>
-      <para>DNS</para>
-    </listitem>
-    <listitem>
-      <para>Source NAT</para>
-    </listitem>
-    <listitem>
-      <para>Static NAT</para>
-    </listitem>
-    <listitem>
-      <para>Port Forwarding</para>
-    </listitem>
-    <listitem>
-      <para>Load Balancing</para>
-    </listitem>
-    <listitem>
-      <para>Firewall</para>
-    </listitem>
-    <listitem>
-      <para>VPN</para>
-    </listitem>
-    <listitem>
-      <para>(Optional) Name one of several available providers to use for a given service, such as
-        Juniper for the firewall</para>
-    </listitem>
-    <listitem>
-      <para>(Optional) Network tag to specify which physical network to use</para>
-    </listitem>
-  </itemizedlist>
-  <para>When creating a new VM, the user chooses one of the available network offerings, and that
-    determines which network services the VM can use.</para>
-  <para>The &PRODUCT; administrator can create any number of custom network offerings, in addition
-    to the default network offerings provided by &PRODUCT;. By creating multiple custom network
-    offerings, you can set up your cloud to offer different classes of service on a single
-    multi-tenant physical network. For example, while the underlying physical wiring may be the same
-    for two tenants, tenant A may only need simple firewall protection for their website, while
-    tenant B may be running a web server farm and require a scalable firewall solution, load
-    balancing solution, and alternate networks for accessing the database backend.</para>
-  <note>
-    <para>If you create load balancing rules while using a network service offering that includes an
-      external load balancer device such as NetScaler, and later change the network service offering
-      to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual
-      router for each of your existing load balancing rules so that they continue to
-      function.</para>
-  </note>
-  <para>When creating a new virtual network, the &PRODUCT; administrator chooses which network
-    offering to enable for that network. Each virtual network is associated with one network
-    offering. A virtual network can be upgraded or downgraded by changing its associated network
-    offering. If you do this, be sure to reprogram the physical network to match.</para>
-  <para>&PRODUCT; also has internal network offerings for use by &PRODUCT; system VMs. These network
-    offerings are not visible to users but can be modified by administrators.</para>
-  <xi:include href="creating-network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-rate.xml
----------------------------------------------------------------------
diff --git a/en-US/network-rate.xml b/en-US/network-rate.xml
deleted file mode 100644
index 56fe25c..0000000
--- a/en-US/network-rate.xml
+++ /dev/null
@@ -1,144 +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="network-rate">
-  <title>Network Throttling</title>
-  <para>Network throttling is the process of controlling the network access and bandwidth usage
-    based on certain rules. &PRODUCT; controls this behaviour of the guest networks in the cloud by
-    using the network rate parameter. This parameter is defined as the default data transfer rate in
-    Mbps (Megabits Per Second) allowed in a guest network. It defines the upper limits for network
-    utilization. If the current utilization is below the allowed upper limits, access is granted,
-    else revoked.</para>
-  <para>You can throttle the network bandwidth either to control the usage above a certain limit for
-    some accounts, or to control network congestion in a large cloud environment. The network rate
-    for your cloud can be configured on the following:</para>
-  <itemizedlist>
-    <listitem>
-      <para>Network Offering</para>
-    </listitem>
-    <listitem>
-      <para>Service Offering</para>
-    </listitem>
-    <listitem>
-      <para>Global parameter</para>
-    </listitem>
-  </itemizedlist>
-  <para>If network rate is set to NULL in service offering, the value provided in the
-    vm.network.throttling.rate global parameter is applied. If the value is set to NULL for network
-    offering, the value provided in the network.throttling.rate global parameter is
-    considered.</para>
-  <para>For the default public, storage, and management networks, network rate is set to 0. This
-    implies that the public, storage, and management networks will have unlimited bandwidth by
-    default. For default guest networks, network rate is set to NULL. In this case, network rate is
-    defaulted to the global parameter value.</para>
-  <para>The following table gives you an overview of how network rate is applied on different types
-    of networks in &PRODUCT;.</para>
-  <informaltable>
-    <tgroup cols="2" align="left" colsep="1" rowsep="1">
-      <colspec colwidth="1.0*" colname="1" colnum="1"/>
-      <colspec colwidth="3.18*" colname="2" colnum="2"/>
-      <thead>
-        <row>
-          <entry><para>Networks</para></entry>
-          <entry><para>Network Rate Is Taken from</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><para>Guest network of Virtual Router</para></entry>
-          <entry><para>Guest Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Public network of Virtual Router</para></entry>
-          <entry><para>Guest Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Storage network of Secondary Storage VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Management network of Secondary Storage VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Storage network of Console Proxy VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Management network of Console Proxy VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Storage network of Virtual Router</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Management network of Virtual Router</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Public network of Secondary Storage VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Public network of Console Proxy VM</para></entry>
-          <entry><para>System Network Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Default network of a guest VM</para></entry>
-          <entry><para>Compute Offering</para></entry>
-        </row>
-        <row>
-          <entry><para>Additional networks of a guest VM</para></entry>
-          <entry><para>Corresponding Network Offerings</para></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-  <para>A guest VM must have a default network, and can also have many additional networks.
-    Depending on various parameters, such as the host and virtual switch used, you can observe a
-    difference in the network rate in your cloud. For example, on a VMware host the actual network
-    rate varies based on where they are configured (compute offering, network offering, or both);
-    the network type (shared or isolated); and traffic direction (ingress or egress). </para>
-  <para>The network rate set for a network offering used by a particular network in &PRODUCT; is
-    used for the traffic shaping policy of a port group, for example: port group A, for that
-    network: a particular subnet or VLAN on the actual network. The virtual routers for that network
-    connects to the port group A, and by default instances in that network connects to this port
-    group. However, if an instance is deployed with a compute offering with the network rate set,
-    and if this rate is used for the traffic shaping policy of another port group for the network,
-    for example port group B, then instances using this compute offering are connected to the port
-    group B, instead of connecting to port group A.</para>
-  <para>The traffic shaping policy on standard port groups in VMware only applies to the egress
-    traffic, and the net effect depends on the type of network used in &PRODUCT;. In shared
-    networks, ingress traffic is unlimited for &PRODUCT;, and egress traffic is limited to the rate
-    that applies to the port group used by the instance if any. If the compute offering has a
-    network rate configured, this rate applies to the egress traffic, otherwise the network rate set
-    for the network offering applies. For isolated networks, the network rate set for the network
-    offering, if any, effectively applies to the ingress traffic. This is mainly because the network
-    rate set for the network offering applies to the egress traffic from the virtual router to the
-    instance. The egress traffic is limited by the rate that applies to the port group used by the
-    instance if any, similar to shared networks. </para>
-  <para>For example:</para>
-  <para>Network rate of network offering = 10 Mbps</para>
-  <para>Network rate of compute offering = 200 Mbps</para>
-  <para>In shared networks, ingress traffic will not be limited for &PRODUCT;, while egress traffic
-    will be limited to 200 Mbps. In an isolated network, ingress traffic will be limited to 10 Mbps
-    and egress to 200 Mbps.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-service-providers.xml
----------------------------------------------------------------------
diff --git a/en-US/network-service-providers.xml b/en-US/network-service-providers.xml
deleted file mode 100644
index cf86b24..0000000
--- a/en-US/network-service-providers.xml
+++ /dev/null
@@ -1,132 +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="network-service-providers">
-    <title>Network Service Providers</title>
-    <note><para>For the most up-to-date list of supported network service providers, see the &PRODUCT; UI or call listNetworkServiceProviders.</para></note>
-    <para>A service provider (also called a network element) is hardware or virtual appliance that makes a network service possible; for example, a firewall appliance can be installed in the cloud to provide firewall service. On a single network, multiple providers can provide the same network service. For example, a firewall service may be provided by Cisco or Juniper devices in the same physical network.</para>
-    <para>You can have multiple instances of the same service provider in a network (say, more than one Juniper SRX device).</para>
-    <para>If different providers are set up to provide the same service on the network, the administrator can create network offerings so users can specify which network service provider they prefer (along with the other choices offered in network offerings). Otherwise, &PRODUCT; will choose which provider to use whenever the service is called for. </para>
-    <formalpara>
-        <title>Supported Network Service Providers</title>
-        <para>&PRODUCT; ships with an internal list of the supported service providers, and you can choose from this list when creating a network offering.</para>
-    </formalpara>
-    <informaltable>
-        <tgroup cols="6" align="left" colsep="1" rowsep="1">
-            <colspec colnum="1" colname="c1" colwidth="2.4*"/>
-            <colspec colnum="2" colname="c2" colwidth="1.14*"/>
-            <colspec colnum="3" colname="c3" colwidth="1.23*"/>
-            <colspec colnum="4" colname="c4" colwidth="1.0*"/>
-            <colspec colnum="5" colname="c5" colwidth="1.3*"/>
-            <colspec colnum="6" colname="c6" colwidth="1.3*"/>
-            <thead>
-                <row>
-                    <entry></entry>
-                    <entry><para>Virtual Router</para></entry>
-                    <entry><para>Citrix NetScaler</para></entry>
-                    <entry><para>Juniper SRX</para></entry>
-                    <entry><para>F5 BigIP</para></entry>
-                    <entry><para>Host based (KVM/Xen)</para></entry>
-                    
-                </row>
-            </thead>
-            <tbody>
-                <row>
-                    <entry><para>Remote Access VPN</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    
-                </row>
-                <row>
-                    <entry><para>DNS/DHCP/User Data</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    							
-                </row>
-                <row>
-                    <entry><para>Firewall</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    </row>
-                <row>
-                    <entry><para>Load Balancing</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                 </row>
-                <row>
-                    <entry><para>Elastic IP</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Elastic LB</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Source NAT</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    </row>
-                <row>
-                    <entry><para>Static NAT</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Port Forwarding</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-            </tbody>
-        </tgroup>
-    </informaltable>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-setup.xml
----------------------------------------------------------------------
diff --git a/en-US/network-setup.xml b/en-US/network-setup.xml
deleted file mode 100644
index ceee190..0000000
--- a/en-US/network-setup.xml
+++ /dev/null
@@ -1,35 +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="network-setup">
-  <title>Network Setup</title>
-  <para>Achieving the correct networking setup is crucial to a successful &PRODUCT;
-    installation. This section contains information to help you make decisions and follow the right
-    procedures to get your network set up correctly.</para>
-  <xi:include href="basic-adv-networking.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="vlan-allocation-eg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="hardware-config-eg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="layer2-switch.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="hardware-firewall.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-lb.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="topology-req.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="guest-nw-usage-with-traffic-sentinel.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> 
-  <xi:include href="set-zone-vlan-run-vm-max.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  </chapter>


Mime
View raw message