diff --git a/docs/en-US/cloudstack_plugin_niciranvp.xml b/docs/en-US/cloudstack_plugin_niciranvp.xml
index 55c7ad781c8..c535c7cb891 100644
--- a/docs/en-US/cloudstack_plugin_niciranvp.xml
+++ b/docs/en-US/cloudstack_plugin_niciranvp.xml
@@ -49,6 +49,6 @@
-
+
diff --git a/docs/en-US/plugin-niciranvp-devicemanagement.xml b/docs/en-US/plugin-niciranvp-devicemanagement.xml
new file mode 100644
index 00000000000..2423ce3925d
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-devicemanagement.xml
@@ -0,0 +1,47 @@
+
+
+%BOOK_ENTITIES;
+
+%xinclude;
+]>
+
+
+ Device-management
+ In CloudStack 4.0.x each 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 using the "addNiciraNVPDevice" API call. The plugin is now enabled on the physical network and any guest networks created on that network will be provisioned using the Nicra NVP Controller.
+ The plugin introduces a set of new API calls to manage the devices, see below or refer to the API reference.
+
+ addNiciraNvpDevice
+
+
+ physicalnetworkid: the UUID of the physical network on which the device is configured
+ hostname: the IP address of the NVP controller
+ username: the username for access to the NVP API
+ password: the password for access to the NVP API
+ transportzoneuuid: the UUID of the transportzone
+
+
+ deleteNiciraNVPDevice
+
+
+ nvpdeviceid: the UUID of the device
+
+
+ listNiciraNVPDevices
+
+
+
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-features.xml b/docs/en-US/plugin-niciranvp-features.xml
index b96e2d50d61..cdcda9e2aa6 100644
--- a/docs/en-US/plugin-niciranvp-features.xml
+++ b/docs/en-US/plugin-niciranvp-features.xml
@@ -23,4 +23,7 @@
Features of the Nicira NVP Plugin
In CloudStack release 4.0.x this plugin supports the Connectivity service. This service is responsible for creating Layer 2 networks supporting the networks created by Guests. In other words when an tennant creates a new network, instead of the traditional VLAN a logical network will be created by sending the appropriate calls to the Nicira NVP Controller.
+ The plugin has been tested with Nicira NVP versions 2.1.0, 2.2.0 and 2.2.1
+ In CloudStack 4.0.x only the XenServer hypervisor is supported for use in combination with Nicira NVP
+ In CloudStack 4.0.x the UI components for this plugin are not complete, configuration is done by sending commands to the API
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-preparations.xml b/docs/en-US/plugin-niciranvp-preparations.xml
new file mode 100644
index 00000000000..95a25bdca26
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-preparations.xml
@@ -0,0 +1,36 @@
+
+
+%BOOK_ENTITIES;
+
+%xinclude;
+]>
+
+
+ Prerequisites
+ Before enabling the Nicira NVP plugin the NVP Controller needs to be configured. Please review the NVP User Guide on how to do that.
+ CloudStack 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.
+ The Guest traffic type should be configured with the traffic label that matches the name of the Integration Bridge on XenServer. See the Nicira NVP User Guide for more details on how to set this up in XenServer.
+ Make sure you have the following information ready:
+
+ The IP address of the NVP Controller
+ The username to access the API
+ The password to access the API
+ The UUID of the Transport Zone that contains the hypervisors in this Zone
+ The UUID of the Physical Network that will used for the Guest networks
+
+
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-provider.xml b/docs/en-US/plugin-niciranvp-provider.xml
new file mode 100644
index 00000000000..d81db99d9c0
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-provider.xml
@@ -0,0 +1,42 @@
+
+
+%BOOK_ENTITIES;
+
+%xinclude;
+]>
+
+
+ Enabling the service provider
+ To allow CloudStack to use the Nicira NVP Plugin the network service provider needs to be enabled on the physical network. The following sequence of API calls will enable the network service provider
+
+ addNetworkServiceProvider
+
+
+ name = "NiciraNVP"
+ physicalnetworkid = <the uuid of the physical network>
+
+
+ updateNetworkServiceProvider
+
+
+ id = <the provider uuid returned by the previous call>
+ state = "Enabled"
+
+
+
+
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-revisions.xml b/docs/en-US/plugin-niciranvp-revisions.xml
new file mode 100644
index 00000000000..6e455cafaf7
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-revisions.xml
@@ -0,0 +1,45 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+
+
+ Revision History
+
+
+
+ 0-0
+ Wed Oct 03 2012
+
+ Hugo
+ Trippaers
+ hugo@apache.org
+
+
+
+ Documentation created for 4.0.x version of the NVP Plugin
+
+
+
+
+
+
diff --git a/docs/en-US/plugin-niciranvp-tables.xml b/docs/en-US/plugin-niciranvp-tables.xml
new file mode 100644
index 00000000000..4f816550b30
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-tables.xml
@@ -0,0 +1,51 @@
+
+
+%BOOK_ENTITIES;
+
+%xinclude;
+]>
+
+
+ Database tables
+ The following tables are added to the cloud database for the Nicira NVP Plugin
+
+ nicira_nvp_nic_map, contains a mapping from nic to logical switch port
+
+
+ id
+ logicalswitch, uuid of the logical switch this port is connected to
+ logicalswitchport, uuid of the logical switch port for this nic
+ nic, the CloudStack uuid for this nic, reference to the nics table
+
+
+
+
+ external_nicira_nvp_devices, contains all configured devices
+
+
+ id
+ uuid
+ physical_network_id, the physical network this device is configured on
+ provider_name, set to "NiciraNvp"
+ device_name, display name for this device
+ host_id, reference to the host table with the device configuration
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-troubleshooting.xml b/docs/en-US/plugin-niciranvp-troubleshooting.xml
index 6c78beb7351..0e86e5dbbe7 100644
--- a/docs/en-US/plugin-niciranvp-troubleshooting.xml
+++ b/docs/en-US/plugin-niciranvp-troubleshooting.xml
@@ -22,8 +22,7 @@
-->
Troubleshooting the Nicira NVP Plugin
-
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-usage.xml b/docs/en-US/plugin-niciranvp-usage.xml
index 4164cee794c..041e10e671b 100644
--- a/docs/en-US/plugin-niciranvp-usage.xml
+++ b/docs/en-US/plugin-niciranvp-usage.xml
@@ -22,9 +22,8 @@
-->
Using the Nicira NVP Plugin
-
\ No newline at end of file
diff --git a/docs/en-US/plugin-niciranvp-uuidreferences.xml b/docs/en-US/plugin-niciranvp-uuidreferences.xml
new file mode 100644
index 00000000000..c912971736b
--- /dev/null
+++ b/docs/en-US/plugin-niciranvp-uuidreferences.xml
@@ -0,0 +1,30 @@
+
+
+%BOOK_ENTITIES;
+
+%xinclude;
+]>
+
+
+ UUID References
+ The plugin maintains several references in the CloudStack database to items created on the NVP Controller.
+ Every guest network this 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.
+ 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
+ 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.
+
+
\ No newline at end of file