cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [27/51] [partial] cloudstack-docs git commit: Remove all old docbook files
Date Thu, 01 Oct 2015 14:04:37 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/network-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/en-US/network-usage-record-format.xml b/en-US/network-usage-record-format.xml
deleted file mode 100644
index 34b8f2d..0000000
--- a/en-US/network-usage-record-format.xml
+++ /dev/null
@@ -1,40 +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-usage-record-format">
-    <title>Network Usage Record Format</title>
-    <para>For network usage (bytes sent/received), the following fields exist in a usage record.</para>
-    <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>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 – Device ID (virtual router ID or external device ID)</para></listitem>
-            <listitem><para>type – Device type (domain router, external load balancer, etc.)</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/networking-in-a-pod.xml
----------------------------------------------------------------------
diff --git a/en-US/networking-in-a-pod.xml b/en-US/networking-in-a-pod.xml
deleted file mode 100644
index 5a569bf..0000000
--- a/en-US/networking-in-a-pod.xml
+++ /dev/null
@@ -1,46 +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="networking-in-a-pod">
-	<title>Networking in a Pod</title>
-	<para>The figure below illustrates network setup within a single pod. The hosts are connected to a
-		pod-level switch. At a minimum, the hosts should have one physical uplink to each switch.
-		Bonded NICs are supported as well. The pod-level switch is a pair of redundant gigabit
-		switches with 10 G uplinks.</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/network-singlepod.png" />
-		</imageobject>
-		<textobject>
-			<phrase>networksinglepod.png: diagram showing logical view of network in a pod</phrase>
-		</textobject>
-	</mediaobject>
-	<para>Servers are connected as follows:</para>
-	<itemizedlist>
-	<listitem><para>Storage devices are connected to only the network that carries management traffic.</para></listitem>
-	<listitem><para>Hosts are connected to networks for both management traffic and public traffic. </para></listitem>
-	<listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem>
-	</itemizedlist>
-	<para>We recommend the use of multiple physical Ethernet cards to implement each network interface as well as redundant switch fabric in order to maximize throughput and improve reliability.</para>
-						
-	</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/networking-in-a-zone.xml
----------------------------------------------------------------------
diff --git a/en-US/networking-in-a-zone.xml b/en-US/networking-in-a-zone.xml
deleted file mode 100644
index e50efba..0000000
--- a/en-US/networking-in-a-zone.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="networking-in-a-zone">
-	<title>Networking in a Zone</title>
-	<para>The following figure illustrates the network setup within a single zone.</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/network-setup-zone.png" />
-		</imageobject>
-		<textobject>
-			<phrase>networksetupzone.png: Depicts network setup in a single zone</phrase>
-		</textobject>
-	</mediaobject>
-	<para>A firewall for management traffic operates in the NAT mode. The network typically is assigned IP addresses in the 192.168.0.0/16 Class B private address space. Each pod is assigned IP addresses in the 192.168.*.0/24 Class C private address space.</para>
-	<para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para>
-						
-	</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/networking-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/networking-overview.xml b/en-US/networking-overview.xml
deleted file mode 100644
index a71fe95..0000000
--- a/en-US/networking-overview.xml
+++ /dev/null
@@ -1,34 +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="networking-overview">
-		<title>Networking Overview</title>
-		<para>&PRODUCT; offers two types of networking scenario:
-		</para>
-		<itemizedlist>
-			<listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
-			<listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
-		</itemizedlist>
-		<para>For more details, see Network Setup.</para>
-	</section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/networking_overview.xml
----------------------------------------------------------------------
diff --git a/en-US/networking_overview.xml b/en-US/networking_overview.xml
deleted file mode 100644
index a5f27c3..0000000
--- a/en-US/networking_overview.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="networking_overview">
-        <title>Networking Overview</title>
-        <para>
-            CloudStack offers two types of networking scenario:
-        </para>
-        <itemizedlist>
-            <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
-            <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
-        </itemizedlist>
-        <para>For more details, see Network Setup.</para>
-</section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/networks-for-users-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/networks-for-users-overview.xml b/en-US/networks-for-users-overview.xml
deleted file mode 100644
index 19602c4..0000000
--- a/en-US/networks-for-users-overview.xml
+++ /dev/null
@@ -1,35 +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="networks-for-users-overview">
-    <title>Overview of Setting Up Networking for Users</title>
-    <para>People using cloud infrastructure have a variety of needs and preferences when it comes to the networking services provided by the cloud. As a &PRODUCT; administrator, you can do the following things to set up networking for your users:</para>
-    <itemizedlist>
-        <listitem><para>Set up physical networks in zones</para></listitem>
-        <listitem><para>Set up several different providers for the same service on a single physical network (for example, both Cisco and Juniper firewalls)</para></listitem>
-        <listitem><para>Bundle different types of network services into network offerings, so users can choose the desired network services for any given virtual machine </para></listitem>
-        <listitem><para>Add new network offerings as time goes on so end users can upgrade to a better class of service on their network</para></listitem>
-        <listitem><para>Provide more ways for a network to be accessed by a user, such as through a project of which the user is a member </para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/networks.xml
----------------------------------------------------------------------
diff --git a/en-US/networks.xml b/en-US/networks.xml
deleted file mode 100644
index b28f985..0000000
--- a/en-US/networks.xml
+++ /dev/null
@@ -1,58 +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="networks">
-  <title>Managing Networks and Traffic</title>
-  <para>In a &PRODUCT;, guest VMs can communicate with each other using shared infrastructure with
-    the security and user perception that the guests have a private LAN. The &PRODUCT; virtual
-    router is the main component providing networking features for guest traffic. </para>
-  <xi:include href="guest-traffic.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="networking-in-a-pod.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="networking-in-a-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="basic-zone-physical-network-configuration.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="advanced-zone-physical-network-configuration.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="using-multiple-guest-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="reserved-ip-addresses-non-csvms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="ip-vlan-tenant.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="multiple-ip-nic.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="multiple-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="portable-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="pvlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="external-firewalls-and-load-balancers.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="gslb.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="guest-ip-ranges.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="acquire-new-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="release-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="ip-forwarding-firewalling.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="ip-load-balancing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="inter-vlan-routing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="configure-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="persistent-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/nfs-shares-on-management-server.xml
----------------------------------------------------------------------
diff --git a/en-US/nfs-shares-on-management-server.xml b/en-US/nfs-shares-on-management-server.xml
deleted file mode 100644
index 7ed4b74..0000000
--- a/en-US/nfs-shares-on-management-server.xml
+++ /dev/null
@@ -1,113 +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="nfs-shares-on-management-server">
-    <title>Using the Management Server as the NFS Server</title>
-    <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server.  This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para> 
-    <para>The exact commands for the following steps may vary depending on your operating system version.</para>
-    <orderedlist>
-        <listitem><para>On RHEL/CentOS systems, you'll need to install the nfs-utils package:</para>
-        <programlisting>
-$ sudo yum install nfs-utils</programlisting>
-        </listitem>
-        <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para>
-        <programlisting>
-# mkdir -p /export/primary
-# mkdir -p /export/secondary</programlisting>
-        </listitem>
-        <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash,no_subtree_check. For example:</para>
-            <programlisting># vi /etc/exports</programlisting>
-            <para>Insert the following line.</para>
-            <programlisting>/export  *(rw,async,no_root_squash,no_subtree_check)</programlisting>
-        </listitem>
-        <listitem><para>Export the /export directory.</para>
-            <programlisting># exportfs -a</programlisting>
-        </listitem>
-        <listitem><para>Edit the /etc/sysconfig/nfs file.</para>
-            <programlisting># vi /etc/sysconfig/nfs</programlisting>
-            <para>Uncomment the following lines:</para>
-            <programlisting>
-LOCKD_TCPPORT=32803
-LOCKD_UDPPORT=32769
-MOUNTD_PORT=892
-RQUOTAD_PORT=875
-STATD_PORT=662
-STATD_OUTGOING_PORT=2020</programlisting>
-        </listitem>
-        <listitem><para>Edit the /etc/sysconfig/iptables file.</para>
-            <programlisting># vi /etc/sysconfig/iptables</programlisting>
-            <para>Add the following lines at the beginning of the INPUT chain, where &lt;<emphasis
-          role="italic">NETWORK</emphasis>&gt; is the network that you'll be using:</para>
-            <programlisting>
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p udp --dport 111 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 111 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 2049 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 32803 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p udp --dport 32769 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 892 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p udp --dport 892 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 875 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p udp --dport 875 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p tcp --dport 662 -j ACCEPT
--A INPUT -s &lt;NETWORK&gt; -m state --state NEW -p udp --dport 662 -j ACCEPT                
-            </programlisting>
-        </listitem>
-        <listitem><para>Run the following commands:</para>
-            <programlisting>
-# service iptables restart
-# service iptables save</programlisting>
-        </listitem>
-        <listitem><para>If NFS v4 communication is used between client and server, add your domain to /etc/idmapd.conf on both the hypervisor host and Management Server.</para>
-            <programlisting># vi /etc/idmapd.conf</programlisting>
-            <para>Remove the character # from the beginning of the Domain line in idmapd.conf and replace the value in the file with your own domain. In the example below, the domain is company.com.</para>
-            <programlisting>Domain = company.com</programlisting>
-        </listitem>
-        <listitem><para>Reboot the Management Server host.</para>
-            <para>Two NFS shares called /export/primary and /export/secondary are now set up.</para>
-        </listitem>
-        <listitem><para>It is recommended that you test to be sure the previous steps have been successful.</para>
-            <orderedlist numeration="loweralpha">
-                <listitem><para>Log in to the hypervisor host.</para></listitem>
-                <listitem><para>Be sure NFS and rpcbind are running. The commands might be different depending on your OS. For example:</para>
-                    <programlisting>
-# service rpcbind start
-# service nfs start
-# chkconfig nfs on
-# chkconfig rpcbind on
-# reboot</programlisting>
-                </listitem>
-                <listitem><para>Log back in to the hypervisor host and try to mount the /export directories. For example,
-            substitute your own management server name:</para>
-                    <programlisting>
-# mkdir /primary
-# mount -t nfs &lt;management-server-name&gt;:/export/primary
-# umount /primary
-# mkdir /secondary
-# mount -t nfs &lt;management-server-name&gt;:/export/secondary
-# umount /secondary</programlisting>
-                </listitem>
-            </orderedlist>
-        </listitem>
-    </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/nfs-shares-on-separate-server.xml
----------------------------------------------------------------------
diff --git a/en-US/nfs-shares-on-separate-server.xml b/en-US/nfs-shares-on-separate-server.xml
deleted file mode 100644
index 6e20bb5..0000000
--- a/en-US/nfs-shares-on-separate-server.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="nfs-shares-on-separate-server">
-    <title>Using a Separate NFS Server</title>
-    <para>This section tells how to set up NFS shares for secondary and (optionally) primary storage on an NFS server running on a separate node from the Management Server.</para> 
-    <para>The exact commands for the following steps may vary depending on your operating system version.</para>
-    <warning><para>(KVM only) Ensure that no volume is already mounted at your NFS mount point.</para></warning>
-    <orderedlist>
-        <listitem><para>On the storage server, create an NFS share for secondary storage and, if you are using NFS for primary storage as well, create a second NFS share. For example:</para>
-        <programlisting>
-# mkdir -p /export/primary
-# mkdir -p /export/secondary
-        </programlisting>
-        </listitem>
-        <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash,no_subtree_check. For example:</para>
-            <programlisting># vi /etc/exports</programlisting>
-            <para>Insert the following line.</para>
-            <programlisting>/export  *(rw,async,no_root_squash,no_subtree_check)</programlisting>
-        </listitem>
-        <listitem><para>Export the /export directory.</para>
-            <programlisting># exportfs -a</programlisting>
-        </listitem>
-        <listitem><para>On the management server, create a mount point for secondary storage. For example:</para>
-            <programlisting># mkdir -p /mnt/secondary</programlisting>
-        </listitem>
-        <listitem><para>Mount the secondary storage on your Management Server. Replace the example NFS server name and NFS share paths below with your own.</para>
-            <programlisting># mount -t nfs nfsservername:/nfs/share/secondary /mnt/secondary</programlisting>
-        </listitem>
-    </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/non-contiguous-vlan.xml
----------------------------------------------------------------------
diff --git a/en-US/non-contiguous-vlan.xml b/en-US/non-contiguous-vlan.xml
deleted file mode 100644
index 193b916..0000000
--- a/en-US/non-contiguous-vlan.xml
+++ /dev/null
@@ -1,67 +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="non-contiguous-vlan">
-  <title>Adding Non Contiguous VLAN Ranges</title>
-  <para>&PRODUCT; provides you with the flexibility to add non contiguous VLAN ranges to your
-    network. The administrator can either update an existing VLAN range or add multiple non
-    contiguous VLAN ranges while creating a zone. You can also use the UpdatephysicalNetwork API to
-    extend the VLAN range.</para>
-  <orderedlist>
-    <listitem>
-      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
-    </listitem>
-    <listitem>
-      <para>Ensure that the VLAN range does not already exist.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation, choose Infrastructure. </para>
-    </listitem>
-    <listitem>
-      <para>On Zones, click View More, then click the zone to which you want to work with.</para>
-    </listitem>
-    <listitem>
-      <para>Click Physical Network.</para>
-    </listitem>
-    <listitem>
-      <para>In the Guest node of the diagram, click Configure.</para>
-    </listitem>
-    <listitem>
-      <para>Click Edit <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="./images/edit-icon.png"/>
-          </imageobject>
-          <textobject>
-            <phrase>edit-icon.png: button to edit the VLAN range.</phrase>
-          </textobject>
-        </inlinemediaobject></para>
-      <para>The VLAN Ranges field now is editable.</para>
-    </listitem>
-    <listitem>
-      <para>Specify the start and end of the VLAN range in comma-separated list.</para>
-      <para>Specify all the VLANs you want to use, VLANs not specified will be removed if you are
-        adding new ranges to the existing list. </para>
-    </listitem>
-    <listitem>
-      <para>Click Apply.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/offerings.xml b/en-US/offerings.xml
deleted file mode 100644
index c880a9c..0000000
--- a/en-US/offerings.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="offerings">
-    <title>Service Offerings</title>
-    <para>In this chapter we discuss compute, disk, and system service offerings. Network offerings
-        are discussed in the section on setting up networking for users.</para>
-    <xi:include href="compute-disk-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="system-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="network-rate.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sys-offering-sysvm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/ongoing-config-of-external-firewalls-lb.xml
----------------------------------------------------------------------
diff --git a/en-US/ongoing-config-of-external-firewalls-lb.xml b/en-US/ongoing-config-of-external-firewalls-lb.xml
deleted file mode 100644
index f5864da..0000000
--- a/en-US/ongoing-config-of-external-firewalls-lb.xml
+++ /dev/null
@@ -1,46 +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="ongoing-config-of-external-firewalls-ld">
-  <title>Ongoing Configuration of External Firewalls and Load Balancers</title>
-  <para>Additional user actions (e.g. setting a port forward) will cause further programming of the
-    firewall and load balancer. A user may request additional public IP addresses and forward
-    traffic received at these IPs to specific VMs. This is accomplished by enabling static NAT for a
-    public IP address, assigning the IP to a VM, and specifying a set of protocols and port ranges
-    to open. When a static NAT rule is created, &PRODUCT; programs the zone's external firewall with
-    the following objects:</para>
-  <itemizedlist>
-    <listitem>
-      <para>A static NAT rule that maps the public IP address to the private IP address of a
-        VM.</para>
-    </listitem>
-    <listitem>
-      <para>A security policy that allows traffic within the set of protocols and port ranges that
-        are specified.</para>
-    </listitem>
-    <listitem>
-      <para>A firewall filter counter that measures the number of bytes of incoming traffic to the
-        public IP.</para>
-    </listitem>
-  </itemizedlist>
-  <para>The number of incoming and outgoing bytes through source NAT, static NAT, and load balancing
-    rules is measured and saved on each external element. This data is collected on a regular basis
-    and stored in the &PRODUCT; database.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/over-provisioning-service-offering-limits.xml
----------------------------------------------------------------------
diff --git a/en-US/over-provisioning-service-offering-limits.xml b/en-US/over-provisioning-service-offering-limits.xml
deleted file mode 100644
index e2b3b3d..0000000
--- a/en-US/over-provisioning-service-offering-limits.xml
+++ /dev/null
@@ -1,161 +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="over-provisioning-service-offering-limits">
-    <title>Over-Provisioning and Service Offering Limits</title>
-  <para>(Supported for XenServer, KVM, and VMware)</para>
-  <para>CPU and memory (RAM) over-provisioning factors can be set for each cluster to change the
-    number of VMs that can run on each host in the cluster. This helps optimize the use of
-    resources. By increasing the over-provisioning ratio, more resource capacity will be used. If
-    the ratio is set to 1, no over-provisioning is done.</para>
-  <para>The administrator can also set global default over-provisioning ratios
-    in the cpu.overprovisioning.factor and mem.overprovisioning.factor global configuration variables.
-    The default value of these variables is 1: over-provisioning is turned off by default.
-  </para>
-  <para>Over-provisioning ratios are dynamically substituted in &PRODUCT;'s capacity
-    calculations. For example: </para>
-  <para>Capacity = 2 GB</para>
-  <para>Over-provisioning factor = 2</para>
-  <para>Capacity after over-provisioning = 4 GB</para>
-  <para>With this configuration, suppose you deploy 3 VMs of 1 GB each:</para>
-  <para>Used = 3 GB</para>
-  <para>Free = 1 GB</para>
-  <para>The administrator can specify a memory over-provisioning ratio, and can specify both CPU and
-    memory over-provisioning ratios on a per-cluster basis.</para>
-  <para>In any given cloud, the optimum number of VMs for each host is affected by such things as
-    the hypervisor, storage, and hardware configuration. These may be different for each cluster in
-    the same cloud. A single global over-provisioning setting can not provide the best utilization
-    for all the different clusters in the cloud. It has to be set for the lowest common denominator.
-    The per-cluster setting provides a finer granularity for better utilization of resources, no
-    matter where the &PRODUCT; placement algorithm decides to place a VM.</para>
-  <para>The overprovisioning settings can be used along with dedicated resources (assigning a
-    specific cluster to an account) to effectively offer different levels of service to
-    different accounts. For example, an account paying for a more expensive level of service
-    could be assigned to a dedicated cluster with an over-provisioning ratio of 1, and a
-    lower-paying account to a cluster with a ratio of 2.</para>
-  <para>When a new host is added to a cluster, &PRODUCT; will assume the host has the
-    capability to perform the CPU and RAM over-provisioning which is configured for that
-    cluster. It is up to the administrator to be sure the host is actually suitable for the
-    level of over-provisioning which has been set.</para>
-  <section id="overcommit-limitations">
-    <title>Limitations on Over-Provisioning in XenServer and KVM</title>
-    <itemizedlist>
-      <listitem><para>In XenServer, due to a constraint of this hypervisor, you can not use an
-        over-provisioning factor greater than 4.</para></listitem>
-      <listitem><para>The KVM hypervisor can not manage memory allocation to VMs dynamically.
-        &PRODUCT; sets the minimum and maximum amount of memory that a VM can use.
-        The hypervisor adjusts the memory within the set limits based on the memory contention.</para></listitem>
-    </itemizedlist>    
-  </section>
-  <section id="overcommit-prerequisites">
-    <title>Requirements for Over-Provisioning</title>
-    <para>Several prerequisites are required in order for over-provisioning to function
-      properly. The feature is dependent on the OS type, hypervisor capabilities, and certain
-      scripts. It is the administrator's responsibility to ensure that these requirements are
-      met.</para>
-    <section id="balloon-driver">
-      <title>Balloon Driver</title>
-      <para>All VMs should have a balloon driver installed in them. The hypervisor
-        communicates with the balloon driver to free up and make the memory available to a
-        VM.</para>
-      <formalpara>
-        <title>XenServer</title>
-        <para>The balloon driver can be found as a part of xen pv or PVHVM drivers. The xen
-          pvhvm drivers are included in upstream linux kernels 2.6.36+.</para>
-      </formalpara>
-      <formalpara>
-        <title>VMware</title>
-        <para>The balloon driver can be found as a part of the VMware tools. All the VMs that
-          are deployed in a over-provisioned cluster should have the VMware tools
-          installed.</para>
-      </formalpara>
-      <formalpara>
-        <title>KVM</title>
-        <para>All VMs are required to support the virtio drivers. These drivers are installed
-          in all Linux kernel versions 2.6.25 and greater. The administrator must set
-          CONFIG_VIRTIO_BALLOON=y in the virtio configuration. </para>
-      </formalpara>
-    </section>
-    <section id="memory-ballooning">
-      <title>Hypervisor capabilities</title>
-      <para>The hypervisor must be capable of using the memory ballooning.</para>
-      <formalpara>
-        <title>XenServer</title>
-        <para>The DMC (Dynamic Memory Control) capability of the hypervisor should be enabled.
-          Only XenServer Advanced and above versions have this feature.</para>
-      </formalpara>
-      <formalpara>
-        <title>VMware, KVM</title>
-        <para>Memory ballooning is supported by default.</para>
-      </formalpara>
-    </section>
-  </section>
-  <section id="create-overcommit">
-    <title>Setting Over-Provisioning Ratios</title>
-    <para>There are two ways the root admin can set CPU and RAM over-provisioning ratios. First, the
-      global configuration settings cpu.overprovisioning.factor and mem.overprovisioning.factor will
-      be applied when a new cluster is created. Later, the ratios can be modified for an existing
-      cluster.</para>
-    <para>Only VMs deployed after the change are affected by the new setting.
-      If you want VMs deployed before the change to adopt the new over-provisioning ratio,
-      you must stop and restart the VMs.
-      When this is done, &PRODUCT; recalculates or scales the used and 
-      reserved capacities based on the new over-provisioning ratios,
-      to ensure that &PRODUCT; is correctly tracking the amount of free capacity.</para>
-    <note><para>It is safer not to deploy additional new VMs while the capacity recalculation is underway, in
-        case the new values for available capacity are not high enough to accommodate the new VMs.
-        Just wait for the new used/available values to become available, to be sure there is room
-        for all the new VMs you want.</para></note>
-    <para>To change the over-provisioning ratios for an existing cluster:</para>
-    <orderedlist>
-      <listitem>
-        <para>Log in as administrator to the &PRODUCT; UI.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation bar, click Infrastructure.</para>
-      </listitem>
-      <listitem>
-        <para>Under Clusters, click View All.</para>
-      </listitem>
-      <listitem>
-        <para>Select the cluster you want to work with, and click the Edit button.</para>
-      </listitem>
-      <listitem>
-        <para>Fill in your desired over-provisioning multipliers in the fields CPU overcommit
-          ratio and RAM overcommit ratio. The value which is intially shown in these
-          fields is the default value inherited from the global configuration settings.
-        </para>
-        <note>
-          <para>In XenServer, due to a constraint of this hypervisor, you can not use an
-            over-provisioning factor greater than 4.</para>
-        </note>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="op-service-offering-limits">
-    <title>Service Offering Limits and Over-Provisioning</title>
-    <para>Service offering   limits (e.g. 1 GHz, 1 core) are strictly enforced for core count.  For example, a guest with a service offering of one core will have only one core available to it regardless of other activity on the Host.  </para>
-    <para>Service offering limits for gigahertz are enforced only in the presence of contention for CPU resources.  For example, suppose that a guest was created with a service offering of 1 GHz on a Host that has 2 GHz cores, and that guest is the only guest running on the Host.  The guest will have the full 2 GHz available to it.  When multiple guests are attempting to use the CPU a weighting factor is used to schedule CPU resources.  The weight is based on the clock speed in the service offering.  Guests receive a CPU allocation that is proportionate to the GHz in the service offering.   For example, a guest created from a 2 GHz service offering will receive twice the CPU allocation as a guest created from a 1 GHz service offering. &PRODUCT; does not perform memory over-provisioning.</para>
-  </section>
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/ovm-install.xml
----------------------------------------------------------------------
diff --git a/en-US/ovm-install.xml b/en-US/ovm-install.xml
deleted file mode 100644
index fa4a86b..0000000
--- a/en-US/ovm-install.xml
+++ /dev/null
@@ -1,29 +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="ovm-install">
-	  <title>Installing OVM for &PRODUCT;</title>
-    <para>TODO</para>
-    <xi:include href="ovm-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/ovm-requirements.xml
----------------------------------------------------------------------
diff --git a/en-US/ovm-requirements.xml b/en-US/ovm-requirements.xml
deleted file mode 100644
index 70a8920..0000000
--- a/en-US/ovm-requirements.xml
+++ /dev/null
@@ -1,28 +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="ovm-requirements">
-	<title>System Requirements for OVM</title>
-    <para>TODO</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/password-storage-engine.xml
----------------------------------------------------------------------
diff --git a/en-US/password-storage-engine.xml b/en-US/password-storage-engine.xml
deleted file mode 100644
index 8bbc96f..0000000
--- a/en-US/password-storage-engine.xml
+++ /dev/null
@@ -1,74 +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="password-storage-engine">
-  <title>Changing the Default Password Encryption</title>
-  <para>Passwords are encoded when creating or updating users. &PRODUCT; allows you to determine the
-    default encoding and authentication mechanism for admin and user logins. Two new configurable
-    lists have been introduced&mdash;userPasswordEncoders and userAuthenticators.
-    userPasswordEncoders allows you to configure the order of preference for encoding passwords,
-    whereas userAuthenticators allows you to configure the order in which authentication schemes are
-    invoked to validate user passwords. </para>
-  <para>Additionally, the plain text user authenticator has been modified not to convert supplied
-    passwords to their md5 sums before checking them with the database entries. It performs a simple
-    string comparison between retrieved and supplied login passwords instead of comparing the
-    retrieved md5 hash of the stored password against the supplied md5 hash of the password because
-    clients no longer hash the password. The following method determines what encoding scheme is
-    used to encode the password supplied during user creation or modification. </para>
-  <para>When a new user is created, the user password is encoded by using the first valid encoder
-    loaded as per the sequence specified in the <code>UserPasswordEncoders</code> property in the
-      <filename>ComponentContext.xml</filename> or <filename>nonossComponentContext.xml</filename>
-    files. The order of authentication schemes is determined by the <code>UserAuthenticators</code>
-    property in the same files. If Non-OSS components, such as VMware environments, are to be
-    deployed, modify the <code>UserPasswordEncoders</code> and <code>UserAuthenticators</code> lists
-    in the <filename>nonossComponentContext.xml</filename> file, for OSS environments, such as
-    XenServer or KVM, modify the <filename>ComponentContext.xml</filename> file. It is recommended
-    to make uniform changes across both the files. When a new authenticator or encoder is added, you
-    can add them to this list. While doing so, ensure that the new authenticator or encoder is
-    specified as a bean in both these files. The administrator can change the ordering of both these
-    properties as preferred to change the order of schemes. Modify the following list properties
-    available in <filename>client/tomcatconf/nonossComponentContext.xml.in</filename> or
-      <filename>client/tomcatconf/componentContext.xml.in</filename> as applicable, to the desired
-    order:</para>
-  <programlisting>&lt;property name="UserAuthenticators"&gt;
-         &lt;list&gt;
-            &lt;ref bean="SHA256SaltedUserAuthenticator"/&gt;
-            &lt;ref bean="MD5UserAuthenticator"/&gt;
-            &lt;ref bean="LDAPUserAuthenticator"/&gt;
-            &lt;ref bean="PlainTextUserAuthenticator"/&gt;
-        &lt;/list&gt;
-    &lt;/property&gt;
-    &lt;property name="UserPasswordEncoders"&gt;
-        &lt;list&gt;
-            &lt;ref bean="SHA256SaltedUserAuthenticator"/&gt;
-             &lt;ref bean="MD5UserAuthenticator"/&gt;
-             &lt;ref bean="LDAPUserAuthenticator"/&gt;
-            &lt;ref bean="PlainTextUserAuthenticator"/&gt;
-            &lt;/list&gt;</programlisting>
-  <para>In the above default ordering, SHA256Salt is used first for
-      <code>UserPasswordEncoders</code>. If the module is found and encoding returns a valid value,
-    the encoded password is stored in the user table's password column. If it fails for any reason,
-    the MD5UserAuthenticator will be tried next, and the order continues. For
-      <code>UserAuthenticators</code>, SHA256Salt authentication is tried first. If it succeeds, the
-    user is logged into the Management server. If it fails, md5 is tried next, and attempts
-    continues until any of them succeeds and the user logs in . If none of them works, the user is
-    returned an invalid credential message. </para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/per-domain-limits.xml
----------------------------------------------------------------------
diff --git a/en-US/per-domain-limits.xml b/en-US/per-domain-limits.xml
deleted file mode 100644
index c20e84d..0000000
--- a/en-US/per-domain-limits.xml
+++ /dev/null
@@ -1,40 +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="per-domain-limits">
-    <title>Per-Domain Limits</title>
-    <para>&PRODUCT; allows the configuration of limits on a domain basis. With a domain limit in place, all users still have their account limits. They are additionally limited, as a group, to not exceed the resource limits set on their domain. Domain limits aggregate the usage of all accounts in the domain as well as all accounts in all subdomains of that domain. Limits set at the root domain level apply to the sum of resource usage by the accounts in all domains and sub-domains below that root domain.</para>
-    <para>To set a domain limit:</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
-        <listitem><para>In the left navigation tree, click Domains.</para></listitem>
-        <listitem><para>Select the domain you want to modify. The current domain limits are displayed. A value of -1 shows that there is no limit in place.</para></listitem>
-        <listitem><para>Click the Edit button<inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="./images/edit-icon.png" />
-            </imageobject>
-            <textobject><phrase>editbutton.png: edits the settings.</phrase></textobject>
-        </inlinemediaobject></para></listitem>
-    </orderedlist>    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/performance-monitoring.xml
----------------------------------------------------------------------
diff --git a/en-US/performance-monitoring.xml b/en-US/performance-monitoring.xml
deleted file mode 100644
index 70efbf7..0000000
--- a/en-US/performance-monitoring.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="performance-monitoring">
-    <title>Performance Monitoring</title>
-    <para>Host and guest performance monitoring is available to end users and administrators. This allows the user to monitor their utilization of resources and determine when it is appropriate to choose a more powerful service offering or larger disk.</para>
-   </section>
-      

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/persistent-network.xml
----------------------------------------------------------------------
diff --git a/en-US/persistent-network.xml b/en-US/persistent-network.xml
deleted file mode 100644
index 1ccc99c..0000000
--- a/en-US/persistent-network.xml
+++ /dev/null
@@ -1,100 +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="persistent-network">
-  <title>Persistent Networks</title>
-  <para>The network that you can provision without having to deploy any VMs on it is called a
-    persistent network. A persistent network can be part of a VPC or a non-VPC environment.</para>
-  <para>When you create other types of network, a network is only a database entry until the first
-    VM is created on that network. When the first VM is created, a VLAN ID is assigned and the
-    network is provisioned. Also, when the last VM is destroyed, the VLAN ID is released and the
-    network is no longer available. With the addition of persistent network, you will have the
-    ability to create a network in &PRODUCT; in which physical devices can be deployed without
-    having to run any VMs. Additionally, you can deploy physical devices on that network.</para>
-  <para>One of the advantages of having a persistent network is that you can create a VPC with a tier
-    consisting of only physical devices. For example, you might create a VPC for a three-tier
-    application, deploy VMs for Web and Application tier, and use physical machines for the
-    Database tier. Another use case is that if you are providing services by using physical
-    hardware, you can define the network as persistent and therefore even if all its VMs are
-    destroyed the services will not be discontinued.</para>
-  <section id="persistent-network-consideration">
-    <title>Persistent Network Considerations</title>
-    <itemizedlist>
-      <listitem>
-        <para>Persistent network is designed for isolated networks.</para>
-      </listitem>
-      <listitem>
-        <para>All default network offerings are non-persistent.</para>
-      </listitem>
-      <listitem>
-        <para>A network offering cannot be editable because changing it affects the behavior of the
-          existing networks that were created using this network offering.</para>
-      </listitem>
-      <listitem>
-        <para>When you create a guest network, the network offering that you select defines the
-          network persistence. This in turn depends on whether persistent network is enabled in the
-          selected network offering. </para>
-      </listitem>
-      <listitem>
-        <para>An existing network can be made persistent by changing its network offering to an
-          offering that has the Persistent option enabled. While setting this property, even if the
-          network has no running VMs, the network is provisioned. </para>
-      </listitem>
-      <listitem>
-        <para>An existing network can be made non-persistent by changing its network offering to an
-          offering that has the Persistent option disabled. If the network has no running VMs,
-          during the next network garbage collection run the network is shut down.</para>
-      </listitem>
-      <listitem>
-        <para>When the last VM on a network is destroyed, the network garbage collector checks if
-          the network offering associated with the network is persistent, and shuts down the network
-          only if it is non-persistent.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section id="set-up-persistent-network">
-    <title>Creating a Persistent Guest Network</title>
-    <para>To create a persistent network, perform the following:</para>
-    <orderedlist>
-      <listitem>
-        <para>Create a network offering with the Persistent option enabled.</para>
-        <para condition="admin">See <xref linkend="creating-network-offerings"/>.</para>
-        <para condition="install">See the Administration Guide.</para>
-      </listitem>
-      <listitem>
-        <para>Select Network from the left navigation pane.</para>
-      </listitem>
-      <listitem>
-        <para>Select the guest network that you want to offer this network service to.</para>
-      </listitem>
-      <listitem>
-        <para>Click the Edit button.</para>
-      </listitem>
-      <listitem>
-        <para>From the Network Offering drop-down, select the persistent network offering you have
-          just created.</para>
-      </listitem>
-      <listitem>
-        <para>Click OK.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/physical-network-configuration-settings.xml
----------------------------------------------------------------------
diff --git a/en-US/physical-network-configuration-settings.xml b/en-US/physical-network-configuration-settings.xml
deleted file mode 100644
index 4ab18b0..0000000
--- a/en-US/physical-network-configuration-settings.xml
+++ /dev/null
@@ -1,37 +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="physical-network-configuration-settings">
-    <title>Configurable Characteristics of Physical Networks</title>
-    <para>&PRODUCT; provides configuration settings you can use to set up a physical network in a zone, including:</para>
-    <itemizedlist>
-        <listitem><para>What type of network traffic it carries (guest, public, management, storage)</para></listitem>
-        <listitem><para>VLANs</para></listitem>
-        <listitem><para>Unique name that the hypervisor can use to find that particular network</para></listitem>
-        <listitem><para>Enabled or disabled. When a network is first set up, it is disabled – not in use yet. The administrator sets the physical network to enabled, and it begins to be used. The administrator can later disable the network again, which prevents any new virtual networks from being created on that physical network; the existing network traffic continues even though the state is disabled.</para></listitem>
-        <listitem><para>Speed</para></listitem>
-        <listitem><para>Tags, so network offerings can be matched to physical networks</para></listitem>
-        <listitem><para>Isolation method</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/plugin-development.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-development.xml b/en-US/plugin-development.xml
deleted file mode 100644
index 0492877..0000000
--- a/en-US/plugin-development.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.
--->
-
-<chapter id="plugin-development">
-  <title>Plugin Development</title>
-  <xi:include href="creating-my-first-plugin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/pod-add.xml
----------------------------------------------------------------------
diff --git a/en-US/pod-add.xml b/en-US/pod-add.xml
deleted file mode 100644
index 2a2b087..0000000
--- a/en-US/pod-add.xml
+++ /dev/null
@@ -1,43 +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="pod-add">
-	<title>Adding a Pod</title>
-    <para>When you created a new zone, &PRODUCT; adds the first pod for you. You can add more pods at any time using the procedure in this section.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI. See <xref linkend="log-in"/>.</para></listitem>
-        <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone to which you want to add a pod.</para></listitem>
-        <listitem><para>Click the Compute and Storage tab. In the Pods node of the diagram, click View All.</para></listitem>
-        <listitem><para>Click Add Pod.</para></listitem>
-        <listitem><para>Enter the following details in the dialog.</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Name.</emphasis> The name of the pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Gateway.</emphasis> The gateway for the hosts in that pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Netmask.</emphasis> The network prefix that defines the pod's subnet. Use CIDR notation.</para></listitem>
-                <listitem><para><emphasis role="bold">Start/End Reserved System IP.</emphasis>  The IP range in the management network that &PRODUCT; uses to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. For more information, see System Reserved IP Addresses.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>Click OK.</para></listitem>
-    </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/port-forwarding.xml
----------------------------------------------------------------------
diff --git a/en-US/port-forwarding.xml b/en-US/port-forwarding.xml
deleted file mode 100644
index 1bbba45..0000000
--- a/en-US/port-forwarding.xml
+++ /dev/null
@@ -1,51 +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="port-forwarding">
-	<title>Port Forwarding</title>
-	<para>A port forward service is a set of port forwarding rules that define a policy. A port forward service is then applied to one or more guest VMs. The guest VM then has its inbound network access managed according to the policy defined by the port forwarding service.  You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses to be forwarded.</para>
-	<para>A guest VM can be in any number of port forward services. Port forward services can be defined but have no members. If a guest VM is part of more than one network, port forwarding rules will function only if they are defined on the default network</para>
-	<para>You cannot use port forwarding to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See Security Groups.</para>
-	<para>To set up port forwarding:</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
-		<listitem><para>If you have not already done so, add a public IP address range to a zone in &PRODUCT;. See Adding a Zone and Pod in the Installation Guide.</para></listitem>
-		<listitem><para>Add one or more VM instances to &PRODUCT;.</para></listitem>
-		<listitem><para>In the left navigation bar, click Network.</para></listitem>
-		<listitem><para>Click the name of the guest network where the VMs are running.</para>
-		</listitem>
-		<listitem><para>Choose an existing IP address or acquire a new IP address. See <xref linkend="acquire-new-ip-address"/>. Click the name of the IP address in the list.</para></listitem>
-		<listitem><para>Click the Configuration tab.</para></listitem>
-		<listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem>
-		<listitem><para>Fill in the following:</para>
-		<itemizedlist>
-			<listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be
-						addressed on the IP address you acquired in the previous step.</para></listitem>
-			<listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for
-						forwarded public traffic.</para></listitem>
-			<listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two
-						ports</para></listitem>
-		</itemizedlist></listitem>
-		<listitem><para>Click Add.</para></listitem>		
-	</orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/portable-ip.xml
----------------------------------------------------------------------
diff --git a/en-US/portable-ip.xml b/en-US/portable-ip.xml
deleted file mode 100644
index f9ae395..0000000
--- a/en-US/portable-ip.xml
+++ /dev/null
@@ -1,145 +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="portable-ip">
-  <title>Portable IPs</title>
-  <section id="about-pip">
-    <title>About Portable IP</title>
-    <para>Portable IPs in &PRODUCT; are region-level pool of IPs, which are elastic in nature, that
-      can be transferred across geographically separated zones. As an administrator, you can
-      provision a pool of portable public IPs at region level and are available for user
-      consumption. The users can acquire portable IPs if admin has provisioned portable IPs at the
-      region level they are part of. These IPs can be use for any service within an advanced zone.
-      You can also use portable IPs for EIP services in basic zones. </para>
-    <para>The salient features of Portable IP are as follows:<itemizedlist>
-        <listitem>
-          <para>IP is statically allocated </para>
-        </listitem>
-        <listitem>
-          <para>IP need not be associated with a network </para>
-        </listitem>
-        <listitem>
-          <para>IP association is transferable across networks </para>
-        </listitem>
-        <listitem>
-          <para>IP is transferable across both Basic and Advanced zones </para>
-        </listitem>
-        <listitem>
-          <para>IP is transferable across VPC, non-VPC isolated and shared networks </para>
-        </listitem>
-        <listitem>
-          <para>Portable IP transfer is available only for static NAT. </para>
-        </listitem>
-      </itemizedlist></para>
-    <formalpara>
-      <title>Guidelines</title>
-      <para>Before transferring to another network, ensure that no network rules (Firewall, Static
-        NAT, Port Forwarding, and so on) exist on that portable IP.</para>
-    </formalpara>
-  </section>
-  <section id="config-pip">
-    <title>Configuring Portable IPs</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation, click Regions.</para>
-      </listitem>
-      <listitem>
-        <para>Choose the Regions that you want to work with.</para>
-      </listitem>
-      <listitem>
-        <para>Click View Portable IP.</para>
-      </listitem>
-      <listitem>
-        <para>Click Portable IP Range.</para>
-        <para>The Add Portable IP Range window is displayed.</para>
-      </listitem>
-      <listitem>
-        <para>Specify the following:</para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">Start IP/ End IP</emphasis>: A range of IP addresses that
-              are accessible from the Internet and will be allocated to guest VMs. Enter the first
-              and last IP addresses that define a range that &PRODUCT; can assign to guest
-              VMs.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Gateway</emphasis>: The gateway in use for the Portable IP
-              addresses you are configuring.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Netmask</emphasis>: The netmask associated with the Portable
-              IP range.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">VLAN</emphasis>: The VLAN that will be used for public
-              traffic.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para>Click OK.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="acquire-pip">
-    <title>Acquiring a Portable IP</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation, choose Network.</para>
-      </listitem>
-      <listitem>
-        <para>Click the name of the network where you want to work with.</para>
-      </listitem>
-      <listitem>
-        <para>Click View IP Addresses.</para>
-      </listitem>
-      <listitem>
-        <para>Click Acquire New IP.</para>
-        <para>The Acquire New IP window is displayed.</para>
-      </listitem>
-      <listitem>
-        <para>Specify whether you want cross-zone IP or not.</para>
-      </listitem>
-      <listitem>
-        <para>Click Yes in the confirmation dialog.</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 static NAT rules.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="transfer-pip">
-    <title>Transferring Portable IP</title>
-    <para>An IP can be transferred from one network to another only if Static NAT is enabled.
-      However, when a portable IP is associated with a network, you can use it for any service in
-      the network. </para>
-    <para>To transfer a portable IP across the networks, execute the following API:</para>
-    <programlisting>http://localhost:8096/client/api?command=enableStaticNat&amp;response=json&amp;ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&amp;virtualmachineid=a242c476-ef37-441e-9c7b-b303e2a9cb4f&amp;networkid=6e7cd8d1-d1ba-4c35-bdaf-333354cbd49810 </programlisting>
-    <para>Replace the UUID with appropriate UUID. For example, if you want to transfer a portable IP
-      to network X and VM Y in a network, execute the following:</para>
-    <programlisting>http://localhost:8096/client/api?command=enableStaticNat&amp;response=json&amp;ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&amp;virtualmachineid=Y&amp;networkid=X
-      </programlisting>
-  </section>
-</section>


Mime
View raw message