cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [27/67] [abbrv] [partial] Removing docs from master
Date Fri, 11 Oct 2013 01:01:30 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/ovm-install.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ovm-install.xml b/docs/en-US/ovm-install.xml
deleted file mode 100644
index fa4a86b..0000000
--- a/docs/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/blob/5586a221/docs/en-US/ovm-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ovm-requirements.xml b/docs/en-US/ovm-requirements.xml
deleted file mode 100644
index 70a8920..0000000
--- a/docs/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/blob/5586a221/docs/en-US/password-storage-engine.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/password-storage-engine.xml b/docs/en-US/password-storage-engine.xml
deleted file mode 100644
index 8bbc96f..0000000
--- a/docs/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/blob/5586a221/docs/en-US/per-domain-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/per-domain-limits.xml b/docs/en-US/per-domain-limits.xml
deleted file mode 100644
index c20e84d..0000000
--- a/docs/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/blob/5586a221/docs/en-US/performance-monitoring.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/performance-monitoring.xml b/docs/en-US/performance-monitoring.xml
deleted file mode 100644
index 70efbf7..0000000
--- a/docs/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/blob/5586a221/docs/en-US/persistent-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/persistent-network.xml b/docs/en-US/persistent-network.xml
deleted file mode 100644
index 1ccc99c..0000000
--- a/docs/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/blob/5586a221/docs/en-US/physical-network-configuration-settings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/physical-network-configuration-settings.xml b/docs/en-US/physical-network-configuration-settings.xml
deleted file mode 100644
index 4ab18b0..0000000
--- a/docs/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/blob/5586a221/docs/en-US/plugin-development.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-development.xml b/docs/en-US/plugin-development.xml
deleted file mode 100644
index 0492877..0000000
--- a/docs/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/blob/5586a221/docs/en-US/plugin-midonet-about.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-about.xml b/docs/en-US/plugin-midonet-about.xml
deleted file mode 100644
index dd9b3ad..0000000
--- a/docs/en-US/plugin-midonet-about.xml
+++ /dev/null
@@ -1,27 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="About-the-MidoNet-Plugin" >
-    <title>The MidoNet Plugin</title>
-    <xi:include href="plugin-midonet-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-midonet-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-features.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-features.xml b/docs/en-US/plugin-midonet-features.xml
deleted file mode 100644
index f242d63..0000000
--- a/docs/en-US/plugin-midonet-features.xml
+++ /dev/null
@@ -1,57 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Features-of-the-MidoNet-Plugin">
-    <title>Features of the MidoNet Plugin</title>
-
-    <note>
-        <para>
-        In &PRODUCT; 4.2.0 only the KVM hypervisor is supported for use in combination with MidoNet.
-        </para>
-    </note>
-
-    <para>In &PRODUCT; release 4.2.0 this plugin supports several services in the Advanced Isolated network mode.
-    </para>
-
-    <para>
-    When tenants create new isolated layer 3 networks, instead of spinning up extra Virtual Router VMs, the relevant L3 elements (routers etc) are created in the MidoNet virtual topology by making the appropriate calls to the MidoNet API. Instead of using VLANs, isolation is provided by MidoNet.
-    </para>
-
-    <para>
-    Aside from the above service (Connectivity), several extra features are supported in the 4.2.0 release:
-    </para>
-
-    <itemizedlist>
-    <listitem><para>DHCP</para></listitem>
-    <listitem><para>Firewall (ingress)</para></listitem>
-    <listitem><para>Source NAT</para></listitem>
-    <listitem><para>Static NAT</para></listitem>
-    <listitem><para>Port Forwarding</para></listitem>
-    </itemizedlist>
-
-    <para>
-    The plugin has been tested with MidoNet version 12.12. (Caddo).
-    </para>
-
-
-
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-introduction.xml b/docs/en-US/plugin-midonet-introduction.xml
deleted file mode 100644
index 7793ecb..0000000
--- a/docs/en-US/plugin-midonet-introduction.xml
+++ /dev/null
@@ -1,26 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Introduction-to-the-MidoNet-Plugin">
-    <title>Introduction to the MidoNet Plugin</title>
-    <para>The MidoNet plugin allows &PRODUCT; to use the MidoNet virtualized networking solution as a provider for &PRODUCT; networks and services. For more information on MidoNet and how it works, see <ulink url="http://www.midokura.com/midonet/">http://www.midokura.com/midonet/</ulink>.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-preparations.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-preparations.xml b/docs/en-US/plugin-midonet-preparations.xml
deleted file mode 100644
index cf78774..0000000
--- a/docs/en-US/plugin-midonet-preparations.xml
+++ /dev/null
@@ -1,90 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Prerequisites">
-    <title>Prerequisites</title>
-
-    <para>In order to use the MidoNet plugin, the compute hosts must be running the MidoNet Agent, and the MidoNet API server must be available. Please consult the MidoNet User Guide for more information. The following section describes the &PRODUCT; side setup.</para>
-
-    <orderedlist>
-      <listitem>
-      <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "MIDO". This network should be enabled for the Guest and Public traffic types.</para>
-    </listitem>
-
-<listitem>
-    <para>Next, we need to set the following &PRODUCT; settings under "Global Settings" in the UI:</para>
-
-<table frame='all'><title>&PRODUCT; settings</title>
-<tgroup cols='3' align='left' colsep='1' rowsep='1'>
-<thead>
-<row>
-  <entry>Setting Name</entry>
-  <entry>Description</entry>
-  <entry>Example</entry>
-</row>
-</thead>
-<tbody>
-<row>
-  <entry>midonet.apiserver.address</entry>
-  <entry>Specify the address at which the Midonet API server can be contacted</entry>
-  <entry>http://192.168.1.144:8081/midolmanj-mgmt</entry>
-</row>
-<row>
-  <entry>midonet.providerrouter.id</entry>
-  <entry>Specifies the UUID of the Midonet provider router</entry>
-  <entry>d7c5e6a3-e2f4-426b-b728-b7ce6a0448e5</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-</listitem>
-
-<listitem>
-  <para>
-  We also want MidoNet to take care of public traffic, so in <emphasis>componentContext.xml</emphasis> we need to replace this line:
-
-  <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru">]]>
-  </programlisting>
-
-  With this:
-
-  <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.MidoNetPublicNetworkGuru">]]>
-  </programlisting>
-</para>
-</listitem>
-</orderedlist>
-
-    <note>
-	    <para>
-	    On the compute host, MidoNet takes advantage of per-traffic type VIF driver support in &PRODUCT; KVM.
-		</para>
-		<para>
-	    In agent.properties, we set the following to make MidoNet take care of Guest and Public traffic:
-
-<programlisting>libvirt.vif.driver.Guest=com.cloud.network.resource.MidoNetVifDriver
-libvirt.vif.driver.Public=com.cloud.network.resource.MidoNetVifDriver</programlisting>
-
-		This is explained further in MidoNet User Guide.
-	    </para>
-	</note>
-
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-provider.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-provider.xml b/docs/en-US/plugin-midonet-provider.xml
deleted file mode 100644
index 904828c..0000000
--- a/docs/en-US/plugin-midonet-provider.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Enabling-the-service-provider">
-    <title>Enabling the MidoNet service provider via the API</title>
-    <para>
-    To enable via the API, use the following API calls:</para>
-    <para><emphasis>addNetworkServiceProvider</emphasis></para>
-    <itemizedlist>
-        <listitem><para>name = "MidoNet"</para></listitem>
-        <listitem><para>physicalnetworkid = &lt;the uuid of the physical network&gt;</para></listitem>
-    </itemizedlist>
-    <para><emphasis>updateNetworkServiceProvider</emphasis></para>
-    <itemizedlist>
-        <listitem><para>id = &lt;the provider uuid returned by the previous call&gt;</para></listitem>
-        <listitem><para>state = "Enabled"</para></listitem>
-    </itemizedlist>
-
-
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-revisions.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-revisions.xml b/docs/en-US/plugin-midonet-revisions.xml
deleted file mode 100644
index 73def23..0000000
--- a/docs/en-US/plugin-midonet-revisions.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix 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.
--->
-
-<appendix id="appe-cloudstack-Revision_History">
-    <title>Revision History</title>
-    <simpara>
-        <revhistory>
-            <revision>
-                <revnumber>0-0</revnumber>
-                <date>Wed Mar 13 2013</date>
-                <author>
-                    <firstname>Dave</firstname>
-                    <surname>Cahill</surname>
-                    <email>dcahill@midokura.com</email>
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Documentation created for 4.2.0 version of the MidoNet Plugin</member>
-                    </simplelist>
-                </revdescription>
-            </revision>
-        </revhistory>
-    </simpara>
-</appendix>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-ui.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-ui.xml b/docs/en-US/plugin-midonet-ui.xml
deleted file mode 100644
index 8ee9850..0000000
--- a/docs/en-US/plugin-midonet-ui.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="plugin-midonet-ui">
-    <title>Enabling the MidoNet service provider via the UI</title>
-    <para>To allow &PRODUCT; to use the MidoNet Plugin the network service provider needs to be enabled on the physical network.
-    </para>
-
-    <para>
-    The steps to enable via the UI are as follows:
-    <orderedlist>
-        <listitem><para>
-        In the left navbar, click Infrastructure
-        </para></listitem>
-
-        <listitem><para>
-        In Zones, click View All
-        </para></listitem>
-
-        <listitem><para>
-        Click the name of the Zone on which you are setting up MidoNet
-        </para></listitem>
-
-        <listitem><para>
-        Click the Physical Network tab
-        </para></listitem>
-
-        <listitem><para>
-        Click the Name of the Network on which you are setting up MidoNet
-        </para></listitem>
-
-        <listitem><para>
-        Click Configure on the Network Service Providers box
-        </para></listitem>
-
-        <listitem><para>
-        Click on the name MidoNet
-        </para></listitem>
-
-        <listitem><para>
-        Click the Enable Provider button in the Network tab
-        </para></listitem>
-
-    </orderedlist>
-    </para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-midonet-usage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-midonet-usage.xml b/docs/en-US/plugin-midonet-usage.xml
deleted file mode 100644
index a314581..0000000
--- a/docs/en-US/plugin-midonet-usage.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Using-the-MidoNet-Plugin" >
-    <title>Using the MidoNet Plugin</title>
-
-    <xi:include href="plugin-midonet-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-midonet-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-midonet-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-about.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-about.xml b/docs/en-US/plugin-niciranvp-about.xml
deleted file mode 100644
index cfab83c..0000000
--- a/docs/en-US/plugin-niciranvp-about.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="About-the-Nicira-NVP-Plugin" >
-    <title>The Nicira NVP Plugin</title>
-    <xi:include href="plugin-niciranvp-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>
-   

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-devicemanagement.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-devicemanagement.xml b/docs/en-US/plugin-niciranvp-devicemanagement.xml
deleted file mode 100644
index 761c39f..0000000
--- a/docs/en-US/plugin-niciranvp-devicemanagement.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Device-management">
-    <title>Device Management</title>
-    <para>In &PRODUCT; a Nicira NVP setup is considered a "device" that can be added and removed from a physical network. To complete the configuration of the Nicira NVP plugin a device needs to be added to the physical network. Press the "Add NVP Controller" button on the provider panel and enter the configuration details.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-add-controller.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of the device configuration popup.</phrase>
-        </textobject>
-    </mediaobject>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-features.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-features.xml b/docs/en-US/plugin-niciranvp-features.xml
deleted file mode 100644
index e439f1b..0000000
--- a/docs/en-US/plugin-niciranvp-features.xml
+++ /dev/null
@@ -1,84 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Features-of-the-Nicira-NVP-Plugin">
-    <title>Features of the Nicira NVP Plugin</title>
-    <para>The following table lists the CloudStack network services provided by the Nicira NVP Plugin.</para>
-    <table>
-        <title>Supported Services</title>
-        <tgroup cols="3">
-        <thead>
-            <row>
-                <entry>Network Service</entry>
-                <entry>CloudStack version</entry>
-                <entry>NVP version</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>&gt;= 4.0</entry>
-                <entry>&gt;= 2.2.1</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-            <row>
-                <entry>Port Forwarding</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <note><para>The Virtual Networking service was originally called 'Connectivity' in CloudStack 4.0</para></note>
-    <para>The following hypervisors are supported by the Nicira NVP Plugin.</para>
-    <table>
-        <title>Supported Hypervisors</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Hypervisor</entry>
-                <entry>CloudStack version</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>XenServer</entry>
-                <entry>&gt;= 4.0</entry>
-            </row>
-            <row>
-                <entry>KVM</entry>
-                <entry>&gt;= 4.1</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <note><para>Please refer to the Nicira NVP configuration guide on how to prepare the hypervisors for Nicira NVP integration.</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-introduction.xml b/docs/en-US/plugin-niciranvp-introduction.xml
deleted file mode 100644
index a06f123..0000000
--- a/docs/en-US/plugin-niciranvp-introduction.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Introduction-to-the-Nicira-NVP-Plugin">
-    <title>Introduction to the Nicira NVP Plugin</title>
-    <para>The Nicira NVP plugin adds Nicira NVP as one of the available SDN implementations in
-        CloudStack. With the plugin an exisiting Nicira NVP setup can be used by CloudStack to
-        implement isolated guest networks and to provide additional services like routing and
-        NAT.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-networkofferings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-networkofferings.xml b/docs/en-US/plugin-niciranvp-networkofferings.xml
deleted file mode 100644
index b30437e..0000000
--- a/docs/en-US/plugin-niciranvp-networkofferings.xml
+++ /dev/null
@@ -1,131 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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>
-    <para>Using the Nicira NVP plugin requires a network offering with Virtual Networking enabled and configured to use the NiciraNvp element. Typical use cases combine services from the Virtual Router appliance and the Nicira NVP plugin.</para>
-    <table>
-        <title>Isolated network offering with regular services from the Virtual Router.</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>VPN</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Firewall</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Load Balancer</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-network-offering.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of a network offering.</phrase>
-        </textobject>
-    </mediaobject>
-    <note><para>The tag in the network offering should be set to the name of the physical network with the NVP provider.</para></note>
-    <para>Isolated network with network services. The virtual router is still required to provide network services like dns and dhcp.</para>
-    <table>
-        <title>Isolated network offering with network services</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-physicalnet.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-physicalnet.xml b/docs/en-US/plugin-niciranvp-physicalnet.xml
deleted file mode 100644
index d320290..0000000
--- a/docs/en-US/plugin-niciranvp-physicalnet.xml
+++ /dev/null
@@ -1,37 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="zone-configuration">
-    <title>Zone Configuration</title>
-    <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "STT". This network should be enabled for the Guest traffic type.</para>
-    <note><para>The Guest traffic type should be configured with the traffic label that matches the name of
-        the Integration Bridge on the hypervisor. See the Nicira NVP User Guide for more details
-        on how to set this up in XenServer or KVM.</para></note>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-physical-network-stt.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of a physical network with the STT isolation type</phrase>
-        </textobject>
-    </mediaobject>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-preparations.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-preparations.xml b/docs/en-US/plugin-niciranvp-preparations.xml
deleted file mode 100644
index 6072559..0000000
--- a/docs/en-US/plugin-niciranvp-preparations.xml
+++ /dev/null
@@ -1,37 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Prerequisites">
-    <title>Prerequisites</title>
-    <para>Before enabling the Nicira NVP plugin the NVP Controller needs to be configured. Please review the NVP User Guide on how to do that.</para>
-    <para>Make sure you have the following information ready:</para>
-    <itemizedlist>
-        <listitem><para>The IP address of the NVP Controller</para></listitem>
-        <listitem><para>The username to access the API</para></listitem>
-        <listitem><para>The password to access the API</para></listitem>
-        <listitem><para>The UUID of the Transport Zone that contains the hypervisors in this Zone</para></listitem>
-        <listitem>
-            <para>The UUID of the Gateway Service used to provide router and NAT services.</para>
-        </listitem>
-    </itemizedlist>
-    <note><para>The gateway service uuid is optional and is used for Layer 3 services only (SourceNat, StaticNat and PortForwarding)</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-provider.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-provider.xml b/docs/en-US/plugin-niciranvp-provider.xml
deleted file mode 100644
index 8694478..0000000
--- a/docs/en-US/plugin-niciranvp-provider.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Enabling-the-service-provider">
-    <title>Enabling the service provider</title>
-    <para>The Nicira NVP provider is disabled by default. Navigate to the "Network Service Providers" configuration of the physical network with the STT isolation type. Navigate to the Nicira NVP provider and press the "Enable Provider" button.</para>
-    <note><para>CloudStack 4.0 does not have the UI interface to configure the Nicira NVP plugin. Configuration needs to be done using the API directly.</para></note>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-enable-provider.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of an enabled Nicira NVP provider</phrase>
-        </textobject>
-    </mediaobject>
-    
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-revisions.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-revisions.xml b/docs/en-US/plugin-niciranvp-revisions.xml
deleted file mode 100644
index b58d333..0000000
--- a/docs/en-US/plugin-niciranvp-revisions.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix 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.
--->
-
-<appendix id="appe-cloudstack-Revision_History">
-    <title>Revision History</title>
-    <simpara>
-        <revhistory>
-            <revision>
-                <revnumber>0-0</revnumber>
-                <date>Wed Oct 03 2012</date>
-                <author>
-                    <firstname>Hugo</firstname>
-                    <surname>Trippaers</surname>
-                    <email>hugo@apache.org</email>
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Documentation created for 4.0.0-incubating version of the NVP Plugin</member>
-                    </simplelist>
-                </revdescription>
-            </revision>
-            <revision>
-                <revnumber>1-0</revnumber>
-                <date>Wed May 22 2013</date>
-                <author>
-                    <firstname>Hugo</firstname>
-                    <surname>Trippaers</surname>
-                    <email>hugo@apache.org</email>
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Documentation updated for &PRODUCT; 4.1.0</member>
-                    </simplelist>
-                </revdescription>
-            </revision>
-        </revhistory>
-    </simpara>
-</appendix>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-tables.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-tables.xml b/docs/en-US/plugin-niciranvp-tables.xml
deleted file mode 100644
index 615f349..0000000
--- a/docs/en-US/plugin-niciranvp-tables.xml
+++ /dev/null
@@ -1,106 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Database-tables">
-    <title>Database tables</title>
-    <para>The following tables are added to the cloud database for the Nicira NVP Plugin</para>
-    <table>
-        <title>nicira_nvp_nic_map</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>logicalswitch</entry>
-                    <entry>uuid of the logical switch this port is connected to</entry>
-                </row>
-                <row>
-                    <entry>logicalswitchport</entry>
-                    <entry>uuid of the logical switch port for this nic</entry>
-                </row>
-                <row>
-                    <entry>nic</entry>
-                    <entry>the &PRODUCT; uuid for this nic, reference to the nics table</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <table>
-        <title>external_nicira_nvp_devices</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>uuid</entry>
-                    <entry>UUID identifying this device</entry>
-                </row>
-                <row>
-                    <entry>physical_network_id</entry>
-                    <entry>the physical network this device is configured on</entry>
-                </row>
-                <row>
-                    <entry>provider_name</entry>
-                    <entry>NiciraNVP</entry>
-                </row>
-                <row>
-                    <entry>device_name</entry>
-                    <entry>display name for this device</entry>
-                </row>
-                <row>
-                    <entry>host_id</entry>
-                    <entry>reference to the host table with the device configuration</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <table>
-        <title>nicira_nvp_router_map</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>logicalrouter_uuid</entry>
-                    <entry>uuid of the logical router</entry>
-                </row>
-                <row>
-                    <entry>network_id</entry>
-                    <entry>id of the network this router is linked to</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <note>
-        <para>nicira_nvp_router_map is only available in &PRODUCT; 4.1 and above</para>
-    </note>
-
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-troubleshooting.xml b/docs/en-US/plugin-niciranvp-troubleshooting.xml
deleted file mode 100644
index 02b0655..0000000
--- a/docs/en-US/plugin-niciranvp-troubleshooting.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Troubleshooting-the-Nicira-NVP-Plugin" >
-    <title>Troubleshooting the Nicira NVP Plugin</title>
-    
-    <xi:include href="plugin-niciranvp-uuidreferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-tables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-ui.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-ui.xml b/docs/en-US/plugin-niciranvp-ui.xml
deleted file mode 100644
index 8b1bbad..0000000
--- a/docs/en-US/plugin-niciranvp-ui.xml
+++ /dev/null
@@ -1,26 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="plugin-niciranvp-ui">
-    <title>Configuring the Nicira NVP plugin from the UI</title>
-    <para>In CloudStack 4.1.0-incubating the Nicira NVP plugin and its resources can be configured in the infrastructure tab of the UI. Navigate to the physical network with STT isolation and configure the network elements. The NiciraNvp is listed here. <!-- TODO add screenshot --></para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-usage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-usage.xml b/docs/en-US/plugin-niciranvp-usage.xml
deleted file mode 100644
index 9f04c38..0000000
--- a/docs/en-US/plugin-niciranvp-usage.xml
+++ /dev/null
@@ -1,33 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Using-the-Nicira-NVP-Plugin" >
-    <title>Configuring the Nicira NVP Plugin</title>
-    
-    <xi:include href="plugin-niciranvp-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-physicalnet.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="plugin-niciranvp-devicemanagement.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="plugin-niciranvp-networkofferings.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-uuidreferences.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-uuidreferences.xml b/docs/en-US/plugin-niciranvp-uuidreferences.xml
deleted file mode 100644
index cb5f1ca..0000000
--- a/docs/en-US/plugin-niciranvp-uuidreferences.xml
+++ /dev/null
@@ -1,30 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="UUID-references">
-    <title>UUID References</title>
-    <para>The plugin maintains several references in the &PRODUCT; database to items created on the NVP Controller.</para>
-    <para>Every guest network that is created will have its broadcast type set to Lswitch and if the network is in state "Implemented", the broadcast URI will have the UUID of the Logical Switch that was created for this network on the NVP Controller.</para>
-    <para>The Nics that are connected to one of the Logical Switches will have their Logical Switch Port UUID listed in the nicira_nvp_nic_map table</para>
-    <note><para>All devices created on the NVP Controller will have a tag set to domain-account of the owner of the network, this string can be used to search for items in the NVP Controller.</para></note>    
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-vpc.xml b/docs/en-US/plugin-niciranvp-vpc.xml
deleted file mode 100644
index a43c5fa..0000000
--- a/docs/en-US/plugin-niciranvp-vpc.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Using-the-Nicira-NVP-Plugin-With_VPC" >
-    <title>Using the Nicira NVP plugin with VPC</title>
-    
-    <xi:include href="plugin-niciranvp-vpcfeatures.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-vpcoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-vpcnetworkoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-vpcfeatures.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-vpcfeatures.xml b/docs/en-US/plugin-niciranvp-vpcfeatures.xml
deleted file mode 100644
index a8d8194..0000000
--- a/docs/en-US/plugin-niciranvp-vpcfeatures.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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="vpc-features">
-    <title>Supported VPC features</title>
-    <para>The Nicira NVP plugin supports &PRODUCT; VPC to a certain extent. Starting with &PRODUCT; version 4.1 VPCs can be deployed using NVP isolated networks.</para>
-    <para>It is not possible to use a Nicira NVP Logical Router for as a VPC Router</para>
-    <para>It is not possible to connect a private gateway using a Nicira NVP Logical Switch</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/plugin-niciranvp-vpcnetworkoffering.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/plugin-niciranvp-vpcnetworkoffering.xml b/docs/en-US/plugin-niciranvp-vpcnetworkoffering.xml
deleted file mode 100644
index 141006e..0000000
--- a/docs/en-US/plugin-niciranvp-vpcnetworkoffering.xml
+++ /dev/null
@@ -1,81 +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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="nvp-vpc-network-offering">
-    <title>VPC Network Offerings</title>
-    <para>The VPC needs specific network offerings with the VPC flag enabled. Otherwise these network offerings are identical to regular network offerings. To allow VPC networks with a Nicira NVP isolated network the offerings need to support the Virtual Networking service with the NiciraNVP provider.</para>
-    <para>In a typical configuration two network offerings need to be created. One with the loadbalancing service enabled and one without loadbalancing.</para>
-    <table>
-        <title>VPC Network Offering with Loadbalancing</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>VPN</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Load Balancer</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>NetworkACL</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    
-</section>


Mime
View raw message