You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jz...@apache.org on 2013/01/11 22:02:58 UTC

[12/52] [partial] CLOUDSTACK-961: Added dependencies for building RPMs.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/per-domain-limits.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/per-domain-limits.xml b/docs/tmp/en-US/xml/per-domain-limits.xml
new file mode 100644
index 0000000..525432d
--- /dev/null
+++ b/docs/tmp/en-US/xml/per-domain-limits.xml
@@ -0,0 +1,64 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="per-domain-limits" lang="en-US">
+	<!--  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.
+ --> <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/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/performance-monitoring.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/performance-monitoring.xml b/docs/tmp/en-US/xml/performance-monitoring.xml
new file mode 100644
index 0000000..b8ed62e
--- /dev/null
+++ b/docs/tmp/en-US/xml/performance-monitoring.xml
@@ -0,0 +1,30 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="performance-monitoring" lang="en-US">
+	<!--  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.
+ --> <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/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/physical-network-configuration-settings.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/physical-network-configuration-settings.xml b/docs/tmp/en-US/xml/physical-network-configuration-settings.xml
new file mode 100644
index 0000000..d09aa6d
--- /dev/null
+++ b/docs/tmp/en-US/xml/physical-network-configuration-settings.xml
@@ -0,0 +1,67 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="physical-network-configuration-settings" lang="en-US">
+	<!--  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.
+ --> <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/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-about.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-about.xml b/docs/tmp/en-US/xml/plugin-niciranvp-about.xml
new file mode 100644
index 0000000..d9c42d3
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-about.xml
@@ -0,0 +1,25 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="About-the-Nicira-NVP-Plugin" lang="en-US">
+	<!--  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.
+ --> <title>The Nicira NVP Plugin</title>
+	 <xi:include href="plugin-niciranvp-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="plugin-niciranvp-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-devicemanagement.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-devicemanagement.xml b/docs/tmp/en-US/xml/plugin-niciranvp-devicemanagement.xml
new file mode 100644
index 0000000..b5085a8
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-devicemanagement.xml
@@ -0,0 +1,91 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Device-management" lang="en-US">
+	<!--  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.
+ --> <title>Device-management</title>
+	 <para>
+		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.
+	</para>
+	 <para>
+		The plugin introduces a set of new API calls to manage the devices, see below or refer to the API reference.
+	</para>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				addNiciraNvpDevice
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						physicalnetworkid: the UUID of the physical network on which the device is configured
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						hostname: the IP address of the NVP controller
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						username: the username for access to the NVP API
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						password: the password for access to the NVP API
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						transportzoneuuid: the UUID of the transportzone
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				deleteNiciraNVPDevice
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						nvpdeviceid: the UUID of the device
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				listNiciraNVPDevices
+			</para>
+		</listitem>
+
+	</itemizedlist>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-features.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-features.xml b/docs/tmp/en-US/xml/plugin-niciranvp-features.xml
new file mode 100644
index 0000000..b433a9d
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-features.xml
@@ -0,0 +1,40 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Features-of-the-Nicira-NVP-Plugin" lang="en-US">
+	<!--  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.
+ --> <title>Features of the Nicira NVP Plugin</title>
+	 <para>
+		In CloudStack release 4.0.1-incubating 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.
+	</para>
+	 <para>
+		The plugin has been tested with Nicira NVP versions 2.1.0, 2.2.0 and 2.2.1
+	</para>
+	 <note>
+		<para>
+			In CloudStack 4.0.1-incubating only the XenServer hypervisor is supported for use in combination with Nicira NVP
+		</para>
+	</note>
+	 <note>
+		<para>
+			In CloudStack 4.0.1-incubating the UI components for this plugin are not complete, configuration is done by sending commands to the API
+		</para>
+	</note>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-guide.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-guide.xml b/docs/tmp/en-US/xml/plugin-niciranvp-guide.xml
new file mode 100644
index 0000000..f9331f8
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-guide.xml
@@ -0,0 +1,28 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="niciranvp-plugin-guide" lang="en-US">
+	<!--  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.
+ --> <title>Plugin Guide for the Nicira NVP Plugin</title>
+	 <xi:include href="plugin-niciranvp-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="plugin-niciranvp-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="plugin-niciranvp-troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-introduction.xml b/docs/tmp/en-US/xml/plugin-niciranvp-introduction.xml
new file mode 100644
index 0000000..e2f58a5
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-introduction.xml
@@ -0,0 +1,27 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Introduction-to-the-Nicira-NVP-Plugin" lang="en-US">
+	<!--  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.
+ --> <title>Introduction to the Nicira NVP Plugin</title>
+	 <para>
+		The Nicira NVP plugin allows CloudStack to use the Nicira solution for virtualized network as a provider for CloudStack networks and services.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-preparations.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-preparations.xml b/docs/tmp/en-US/xml/plugin-niciranvp-preparations.xml
new file mode 100644
index 0000000..ca5b022
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-preparations.xml
@@ -0,0 +1,66 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Prerequisites" lang="en-US">
+	<!--  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.
+ --> <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>
+		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.
+	</para>
+	 <note>
+		<para>
+			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.
+		</para>
+	</note>
+	 <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 Physical Network that will used for the Guest networks
+			</para>
+		</listitem>
+
+	</itemizedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-provider.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-provider.xml b/docs/tmp/en-US/xml/plugin-niciranvp-provider.xml
new file mode 100644
index 0000000..eb1d72e
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-provider.xml
@@ -0,0 +1,72 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Enabling-the-service-provider" lang="en-US">
+	<!--  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.
+ --> <title>Enabling the service provider</title>
+	 <para>
+		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
+	</para>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				addNetworkServiceProvider
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						name = "NiciraNVP"
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						physicalnetworkid = &lt;the uuid of the physical network&gt;
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				updateNetworkServiceProvider
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						id = &lt;the provider uuid returned by the previous call&gt;
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						state = "Enabled"
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</itemizedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-revisions.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-revisions.xml b/docs/tmp/en-US/xml/plugin-niciranvp-revisions.xml
new file mode 100644
index 0000000..d1f792e
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-revisions.xml
@@ -0,0 +1,49 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<appendix id="appe-cloudstack-Revision_History" lang="en-US">
+	<!--  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.
+ --> <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>
+
+		</revhistory>
+
+	</simpara>
+</appendix>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-tables.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-tables.xml b/docs/tmp/en-US/xml/plugin-niciranvp-tables.xml
new file mode 100644
index 0000000..34509c3
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-tables.xml
@@ -0,0 +1,106 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Database-tables" lang="en-US">
+	<!--  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.
+ --> <title>Database tables</title>
+	 <para>
+		The following tables are added to the cloud database for the Nicira NVP Plugin
+	</para>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				nicira_nvp_nic_map, contains a mapping from nic to logical switch port
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						id
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						logicalswitch, uuid of the logical switch this port is connected to
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						logicalswitchport, uuid of the logical switch port for this nic
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						nic, the CloudStack uuid for this nic, reference to the nics table
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</itemizedlist>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				external_nicira_nvp_devices, contains all configured devices
+			</para>
+		</listitem>
+		 <listitem>
+			<itemizedlist>
+				<listitem>
+					<para>
+						id
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						uuid
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						physical_network_id, the physical network this device is configured on
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						provider_name, set to "NiciraNvp"
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						device_name, display name for this device
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						host_id, reference to the host table with the device configuration
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</itemizedlist>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-troubleshooting.xml b/docs/tmp/en-US/xml/plugin-niciranvp-troubleshooting.xml
new file mode 100644
index 0000000..045a25b
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-troubleshooting.xml
@@ -0,0 +1,25 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="Troubleshooting-the-Nicira-NVP-Plugin" lang="en-US">
+	<!--  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.
+ --> <title>Troubleshooting the Nicira NVP Plugin</title>
+	 <xi:include href="plugin-niciranvp-uuidreferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="plugin-niciranvp-tables.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-usage.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-usage.xml b/docs/tmp/en-US/xml/plugin-niciranvp-usage.xml
new file mode 100644
index 0000000..d8bf48e
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-usage.xml
@@ -0,0 +1,26 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="Using-the-Nicira-NVP-Plugin" lang="en-US">
+	<!--  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.
+ --> <title>Using the Nicira NVP Plugin</title>
+	 <xi:include href="plugin-niciranvp-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <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" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/plugin-niciranvp-uuidreferences.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/plugin-niciranvp-uuidreferences.xml b/docs/tmp/en-US/xml/plugin-niciranvp-uuidreferences.xml
new file mode 100644
index 0000000..8a22a6e
--- /dev/null
+++ b/docs/tmp/en-US/xml/plugin-niciranvp-uuidreferences.xml
@@ -0,0 +1,39 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="UUID-references" lang="en-US">
+	<!--  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.
+ --> <title>UUID References</title>
+	 <para>
+		The plugin maintains several references in the CloudStack database to items created on the NVP Controller.
+	</para>
+	 <para>
+		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.
+	</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/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/pod-add.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/pod-add.xml b/docs/tmp/en-US/xml/pod-add.xml
new file mode 100644
index 0000000..c637491
--- /dev/null
+++ b/docs/tmp/en-US/xml/pod-add.xml
@@ -0,0 +1,86 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="pod-add" lang="en-US">
+	<!--  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.
+ --> <title>Adding a Pod</title>
+	 <para>
+		When you created a new zone, &PRODUCT; adds the first pod for you. You can add more pods at any time using the procedure in this section.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI. See <xref linkend="log-in" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone to which you want to add a pod.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Compute and Storage tab. In the Pods node of the diagram, click View All.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add Pod.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Enter the following details in the dialog.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name.</emphasis> The name of the pod.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Gateway.</emphasis> The gateway for the hosts in that pod.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Netmask.</emphasis> The network prefix that defines the pod's subnet. Use CIDR notation.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Start/End Reserved System IP.</emphasis> The IP range in the management network that &PRODUCT; uses to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP. For more information, see System Reserved IP Addresses.
+					</para>
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click OK.
+			</para>
+		</listitem>
+
+	</orderedlist>
+</section>
+
+

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

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/primary-storage-add.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/primary-storage-add.xml b/docs/tmp/en-US/xml/primary-storage-add.xml
new file mode 100644
index 0000000..a0b5f20
--- /dev/null
+++ b/docs/tmp/en-US/xml/primary-storage-add.xml
@@ -0,0 +1,191 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="primary-storage-add" lang="en-US">
+	<!--  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.
+ --> <title>Add Primary Storage</title>
+	 <section id="sys-require-primary-storage">
+		<title>System Requirements for Primary Storage</title>
+		 <para>
+			Hardware requirements:
+		</para>
+		 <itemizedlist>
+			<listitem>
+				<para>
+					Any standards-compliant iSCSI or NFS server that is supported by the underlying hypervisor.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					The storage server should be a machine with a large number of disks. The disks should ideally be managed by a hardware RAID controller.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					Minimum required capacity depends on your needs.
+				</para>
+			</listitem>
+
+		</itemizedlist>
+		 <para>
+			When setting up primary storage, follow these restrictions:
+		</para>
+		 <itemizedlist>
+			<listitem>
+				<para>
+					Primary storage cannot be added until a host has been added to the cluster.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					If you do not provision shared primary storage, you must set the global configuration parameter system.vm.local.storage.required to true, or else you will not be able to start VMs.
+				</para>
+			</listitem>
+
+		</itemizedlist>
+
+	</section>
+	
+	 <section id="adding-primary-storage">
+		<title>Adding Primary Stroage</title>
+		 <para>
+			When you create a new zone, the first primary storage is added as part of that procedure. You can add primary storage servers at any time, such as when adding a new cluster or adding more servers to an existing cluster.
+		</para>
+		 <warning>
+			<para>
+				Be sure there is nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.
+			</para>
+		</warning>
+		 <orderedlist>
+			<listitem>
+				<para>
+					Log in to the &PRODUCT; UI (see <xref linkend="log-in" />).
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone in which you want to add the primary storage.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					Click the Compute tab.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					In the Primary Storage node of the diagram, click View All.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					Click Add Primary Storage.
+				</para>
+			</listitem>
+			 <listitem>
+				<para>
+					Provide the following information in the dialog. The information required varies depending on your choice in Protocol.
+				</para>
+				 <itemizedlist>
+					<listitem>
+						<para>
+							<emphasis role="bold">Pod.</emphasis> The pod for the storage device.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Cluster.</emphasis> The cluster for the storage device.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Name.</emphasis> The name of the storage device.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Server (for NFS, iSCSI, or PreSetup).</emphasis> The IP address or DNS name of the storage device.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Server (for VMFS).</emphasis> The IP address or DNS name of the vCenter server.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Path (for NFS).</emphasis> In NFS this is the exported path from the server.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Path (for VMFS).</emphasis> In vSphere this is a combination of the datacenter name and the datastore name. The format is "/" datacenter name "/" datastore name. For example, "/cloud.dc.VM/cluster1datastore".
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Path (for SharedMountPoint).</emphasis> With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">SR Name-Label (for PreSetup).</emphasis> Enter the name-label of the SR that has been set up outside &PRODUCT;.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Target IQN (for iSCSI).</emphasis> In iSCSI this is the IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Lun # (for iSCSI).</emphasis> In iSCSI this is the LUN number. For example, 3.
+						</para>
+					</listitem>
+					 <listitem>
+						<para>
+							<emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device. It should be an equivalent set or superset of the tags on your disk offerings..
+						</para>
+					</listitem>
+
+				</itemizedlist>
+				 <para>
+					The tag sets on primary storage across clusters in a Zone must be identical. For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.
+				</para>
+
+			</listitem>
+			 <listitem>
+				<para>
+					Click OK.
+				</para>
+			</listitem>
+
+		</orderedlist>
+
+	</section>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/primary-storage-outage-and-data-loss.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/primary-storage-outage-and-data-loss.xml b/docs/tmp/en-US/xml/primary-storage-outage-and-data-loss.xml
new file mode 100644
index 0000000..139259f
--- /dev/null
+++ b/docs/tmp/en-US/xml/primary-storage-outage-and-data-loss.xml
@@ -0,0 +1,30 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="primary-storage-outage-and-data-loss" lang="en-US">
+	<!--  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.
+ --> <title>Primary Storage Outage and Data Loss</title>
+	 <para>
+		When a primary storage outage occurs the hypervisor immediately stops all VMs stored on that storage device. Guests that are marked for HA will be restarted as soon as practical when the primary storage comes back on line. With NFS, the hypervisor may allow the virtual machines to continue running depending on the nature of the issue. For example, an NFS hang will cause the guest VMs to be suspended until storage connectivity is restored.Primary storage is not designed to be backed up. Individual volumes in primary storage can be backed up using snapshots.
+	</para>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/primary-storage.xml b/docs/tmp/en-US/xml/primary-storage.xml
new file mode 100644
index 0000000..8ab3f21
--- /dev/null
+++ b/docs/tmp/en-US/xml/primary-storage.xml
@@ -0,0 +1,37 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="primary-storage" lang="en-US">
+	<!--  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.
+ --> <title>Primary Storage</title>
+	 <para>
+		This section gives concepts and technical details about &PRODUCT; primary storage. For information about how to install and configure primary storage through the &PRODUCT; UI, see the Installation Guide.
+	</para>
+	 <para>
+		<xref linkend="about-primary-storage" />
+	</para>
+	 <xi:include href="best-practices-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="runtime-behavior-of-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="hypervisor-support-for-primarystorage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="storage-tags.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="maintenance-mode-for-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/private-public-template.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/private-public-template.xml b/docs/tmp/en-US/xml/private-public-template.xml
new file mode 100644
index 0000000..58e3e27
--- /dev/null
+++ b/docs/tmp/en-US/xml/private-public-template.xml
@@ -0,0 +1,35 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="private-public-template" lang="en-US">
+	<!--  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.
+ --> <title>Private and Public Templates</title>
+	 <para>
+		When a user creates a template, it can be designated private or public.
+	</para>
+	 <para>
+		Private templates are only available to the user who created them. By default, an uploaded template is private.
+	</para>
+	 <para>
+		When a user marks a template as “public,” the template becomes available to all users in all accounts in the user's domain, as well as users in any other domains that have access to the Zone where the template is stored. This depends on whether the Zone, in turn, was defined as private or public. A private Zone is assigned to a single domain, and a public Zone is accessible to any domain. If a public template is created in a private Zone, it is available only to users in the domain assigned to that Zone. If a public template is created in a public Zone, it is available to all users in all domains.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/projects-overview.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/projects-overview.xml b/docs/tmp/en-US/xml/projects-overview.xml
new file mode 100644
index 0000000..c484449
--- /dev/null
+++ b/docs/tmp/en-US/xml/projects-overview.xml
@@ -0,0 +1,38 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="projects-overview" lang="en-US">
+	<!--  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.
+ --> <title>Overview of Projects</title>
+	 <para>
+		Projects are used to organize people and resources. &PRODUCT; users within a single domain can group themselves into project teams so they can collaborate and share virtual resources such as VMs, snapshots, templates, data disks, and IP addresses. &PRODUCT; tracks resource usage per project as well as per user, so the usage can be billed to either a user account or a project. For example, a private cloud within a software company might have all members of the QA department assigned to one project, so the company can track the resources used in testing while the project members can more easily isolate their efforts from other users of the same cloud
+	</para>
+	 <para>
+		You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators. Once you have created a project, you become that project’s administrator, and you can add others within your domain to the project. &PRODUCT; can be set up either so that you can add people directly to a project, or so that you have to send an invitation which the recipient must accept. Project members can view and manage all virtual resources created by anyone in the project (for example, share VMs). A user can be a member of any number of projects and can switch views in the &PRODUCT; UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.
+	</para>
+	 <para>
+		The project administrator can pass on the role to another project member. The project administrator can also add more members, remove members from the project, set new resource limits (as long as they are below the global defaults set by the &PRODUCT; administrator), and delete the project. When the administrator removes a member from the project, resources created by that user, such as VM instances, remain with the project. This brings us to the subject of resource ownership and which resources can be used by a project.
+	</para>
+	 <para>
+		Resources created within a project are owned by the project, not by any particular &PRODUCT; account, and they can be used only within the project. A user who belongs to one or more projects can still create resources outside of those projects, and those resources belong to the user’s account; they will not be counted against the project’s usage or resource limits. You can create project-level networks to isolate traffic within the project and provide network services such as port forwarding, load balancing, VPN, and static NAT. A project can also make use of certain types of resources from outside the project, if those resources are shared. For example, a shared network or public template is available to any project in the domain. A project can get access to a private template if the template’s owner will grant permission. A project can use any service offering or disk offering available in its domain; however, you can not create private service and disk offerings at the pr
 oject level..
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/projects.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/projects.xml b/docs/tmp/en-US/xml/projects.xml
new file mode 100644
index 0000000..4846f57
--- /dev/null
+++ b/docs/tmp/en-US/xml/projects.xml
@@ -0,0 +1,32 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="projects" lang="en-US">
+	<!--  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.
+ --> <title>Using Projects to Organize Users and Resources</title>
+	 <xi:include href="projects-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="accept-membership-invite.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="suspend-project.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="use-project-view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/provisioning-auth-api.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/provisioning-auth-api.xml b/docs/tmp/en-US/xml/provisioning-auth-api.xml
new file mode 100644
index 0000000..c070527
--- /dev/null
+++ b/docs/tmp/en-US/xml/provisioning-auth-api.xml
@@ -0,0 +1,32 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="provisioning-auth-api" lang="en-US">
+	<!--  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.
+ --> <title>Provisioning and Authentication API</title>
+	 <para>
+		&PRODUCT; expects that a customer will have their own user provisioning infrastructure. It provides APIs to integrate with these existing systems where the systems call out to &PRODUCT; to add/remove users..
+	</para>
+	 <para>
+		&PRODUCT; supports pluggable authenticators. By default, &PRODUCT; assumes it is provisioned with the user’s password, and as a result authentication is done locally. However, external authentication is possible as well. For example, see Using an LDAP Server for User Authentication.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/provisioning-steps-overview.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/provisioning-steps-overview.xml b/docs/tmp/en-US/xml/provisioning-steps-overview.xml
new file mode 100644
index 0000000..771c528
--- /dev/null
+++ b/docs/tmp/en-US/xml/provisioning-steps-overview.xml
@@ -0,0 +1,87 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="provisioning-steps-overview" lang="en-US">
+	<!--  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.
+ --> <title>Overview of Provisioning Steps</title>
+	 <para>
+		After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.
+	</para>
+	 <para>
+		To provision the cloud infrastructure, or to scale it up at any time, follow these procedures:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Change the root password. See <xref linkend="changing-root-password" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add a zone. See <xref linkend="zone-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add more pods (optional). See <xref linkend="pod-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add more clusters (optional). See <xref linkend="cluster-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add more hosts (optional). See <xref linkend="host-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add primary storage. See <xref linkend="primary-storage-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Add secondary storage. See <xref linkend="secondary-storage-add" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Initialize and test the new cloud. See <xref linkend="initialize-and-test" />.
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		When you have finished these steps, you will have a deployment with the following basic structure:
+	</para>
+	 <mediaobject>
+		<imageobject>
+			<imagedata fileref="./images/provisioning-overview.png" width="444" />
+		</imageobject>
+		 <textobject>
+			<phrase>provisioning-overview.png: Conceptual overview of a basic deployment</phrase>
+		</textobject>
+
+	</mediaobject>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/provisioning-steps.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/provisioning-steps.xml b/docs/tmp/en-US/xml/provisioning-steps.xml
new file mode 100644
index 0000000..8aa25e4
--- /dev/null
+++ b/docs/tmp/en-US/xml/provisioning-steps.xml
@@ -0,0 +1,36 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="provisioning-steps" lang="en-US">
+	<!--  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.
+ --> <title>Steps to Provisioning Your Cloud Infrastructure</title>
+	 <para>
+		This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.
+	</para>
+	 <xi:include href="provisioning-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="zone-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="pod-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="cluster-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="host-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="primary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="secondary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="initialize-and-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/query-filter.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/query-filter.xml b/docs/tmp/en-US/xml/query-filter.xml
new file mode 100644
index 0000000..0bb7c4a
--- /dev/null
+++ b/docs/tmp/en-US/xml/query-filter.xml
@@ -0,0 +1,114 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="query-filter" lang="en-US">
+	<!--  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.
+ --><title>Query Filter</title>
+	<para>
+		The query filter is used to find a mapped user in the external LDAP server. The query filter should uniquely map the &PRODUCT; user to LDAP user for a meaningful authentication. For more information about query filter syntax, consult the documentation for your LDAP server.
+	</para>
+	<para>
+		The &PRODUCT; query filter wildcards are:
+	</para>
+	 <informaltable>
+		<tgroup align="left" cols="2" colsep="1" rowsep="1">
+			<thead>
+				<row>
+					<entry>
+						<para>
+							Query Filter Wildcard
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							Description
+						</para>
+					</entry>
+
+				</row>
+
+			</thead>
+			 <tbody>
+				<row>
+					<entry>
+						<para>
+							%u
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							User name
+						</para>
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							%e
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							Email address
+						</para>
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							%n
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							First and last name
+						</para>
+					</entry>
+
+				</row>
+
+			</tbody>
+
+		</tgroup>
+
+	</informaltable>
+	<para>
+		The following examples assume you are using Active Directory, and refer to user attributes from the Active Directory schema.
+	</para>
+	<para>
+		If the &PRODUCT; user name is the same as the LDAP user ID:
+	</para>
+	
+<programlisting>(uid=%u)</programlisting>
+	<para>
+		If the &PRODUCT; user name is the LDAP display name:
+	</para>
+	
+<programlisting>(displayName=%u)</programlisting>
+	<para>
+		To find a user by email address:
+	</para>
+	
+<programlisting>(mail=%e)</programlisting>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/re-install-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/re-install-hosts.xml b/docs/tmp/en-US/xml/re-install-hosts.xml
new file mode 100644
index 0000000..11eff5e
--- /dev/null
+++ b/docs/tmp/en-US/xml/re-install-hosts.xml
@@ -0,0 +1,27 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="re-install-hosts" lang="en-US">
+	<!--  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.
+ --> <title>Re-Installing Hosts</title>
+	 <para>
+		You can re-install a host after placing it in maintenance mode and then removing it. If a host is down and cannot be placed in maintenance mode, it should still be removed before the re-install.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/release-ip-address.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/release-ip-address.xml b/docs/tmp/en-US/xml/release-ip-address.xml
new file mode 100644
index 0000000..7f8fe6c
--- /dev/null
+++ b/docs/tmp/en-US/xml/release-ip-address.xml
@@ -0,0 +1,70 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="release-ip-address" lang="en-US">
+	<!--  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.
+ --> <title>Releasing an IP Address</title>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI as an administrator or end user.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, choose Network.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click the name of the network where you want to work with.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click View IP Addresses.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click the IP address you want to release.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Release IP button 
+				<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/release-ip-icon.png" />
+					</imageobject>
+					 <textobject>
+						<phrase>ReleaseIPButton.png: button to release an IP</phrase>
+					</textobject>
+
+				</inlinemediaobject>
+				.
+			</para>
+		</listitem>
+
+	</orderedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/release-ip-for-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/release-ip-for-vpc.xml b/docs/tmp/en-US/xml/release-ip-for-vpc.xml
new file mode 100644
index 0000000..5016062
--- /dev/null
+++ b/docs/tmp/en-US/xml/release-ip-for-vpc.xml
@@ -0,0 +1,126 @@
+<?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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="release-ip-for-vpc" lang="en-US">
+	<!--  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.
+ --> <title>Releasing an IP Address Alloted to a VPC</title>
+	 <para>
+		The IP address is a limited resource. If you no longer need a particular IP, you can disassociate it from its VPC and return it to the pool of available addresses. An IP address can be released from its tier, only when all the networking ( port forwarding, load balancing, or StaticNAT ) rules are removed for this IP address. The released IP address will still belongs to the same VPC.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI as an administrator or end user.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, choose Network.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				In the Select view, select VPC.
+			</para>
+			 <para>
+				All the VPCs that you have created for the account is listed in the page.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Configure button of the VPC whose IP you want to release.
+			</para>
+			 <para>
+				The VPC page is displayed where all the tiers you created are listed in a diagram.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Settings icon.
+			</para>
+			 <para>
+				The following options are displayed.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						IP Addresses
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Gateways
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Site-to-Site VPN
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Network ACLs
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Select IP Addresses.
+			</para>
+			 <para>
+				The IP Addresses page is displayed.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the IP you want to release.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				In the Details tab, click the Release IP button 
+				<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/release-ip-icon.png" />
+					</imageobject>
+					 <textobject>
+						<phrase>release-ip-icon.png: button to release an IP.</phrase>
+					</textobject>
+
+				</inlinemediaobject>
+			</para>
+
+		</listitem>
+
+	</orderedlist>
+</section>
+
+