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

[19/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/configure-usage-server.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-usage-server.xml b/docs/tmp/en-US/xml/configure-usage-server.xml
new file mode 100644
index 0000000..583e24f
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-usage-server.xml
@@ -0,0 +1,241 @@
+<?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="configure-usage-server" 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>Configuring the Usage Server</title>
+	 <para>
+		To configure the usage server:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Be sure the Usage Server has been installed. This requires extra steps beyond just installing the &PRODUCT; software. See Installing the Usage Server (Optional) in the Advanced Installation Guide.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Log in to the &PRODUCT; UI as administrator.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Global Settings.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In Search, type usage. Find the configuration parameter that controls the behavior you want to set. See the table below for a description of the available parameters.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In Actions, click the Edit icon.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Type the desired value and click the Save icon.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Restart the Management Server (as usual with any global configuration change) and also the Usage Server:
+			</para>
+			 
+<programlisting># service cloud-management restart
+# service cloud-usage restart
+</programlisting>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		The following table shows the global configuration settings that control the behavior of the Usage Server.
+	</para>
+	 <informaltable>
+		<tgroup align="left" cols="2" colsep="1" rowsep="1">
+			<thead>
+				<row>
+					<entry>
+						<para>
+							Parameter Name
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							Description
+						</para>
+					</entry>
+
+				</row>
+
+			</thead>
+			 <tbody>
+				<row>
+					<entry>
+						<para>
+							enable.usage.server
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							Whether the Usage Server is active.
+						</para>
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							usage.aggregation.timezone
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							Time zone of usage records. Set this if the usage records and daily job execution are in different time zones. For example, with the following settings, the usage job will run at PST 00:15 and generate usage records for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
+						</para>
+						 
+<programlisting>usage.stats.job.exec.time = 00:15    
+usage.execution.timezone = PST
+usage.aggregation.timezone = GMT
+</programlisting>
+						 <para>
+							Valid values for the time zone are specified in <xref linkend="time-zones" />
+						</para>
+						 <para>
+							Default: GMT
+						</para>
+
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							usage.execution.timezone
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							The time zone of usage.stats.job.exec.time. Valid values for the time zone are specified in <xref linkend="time-zones" />
+						</para>
+						 <para>
+							Default: The time zone of the management server.
+						</para>
+
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							usage.sanity.check.interval
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							The number of days between sanity checks. Set this in order to periodically search for records with erroneous data before issuing customer invoices. For example, this checks for VM usage records created after the VM was destroyed, and similar checks for templates, volumes, and so on. It also checks for usage times longer than the aggregation range. If any issue is found, the alert ALERT_TYPE_USAGE_SANITY_RESULT = 21 is sent.
+						</para>
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							usage.stats.job.aggregation.range
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							The time period in minutes between Usage Server processing jobs. For example, if you set it to 1440, the Usage Server will run once per day. If you set it to 600, it will run every ten hours. In general, when a Usage Server job runs, it processes all events generated since usage was last run.
+						</para>
+						 <para>
+							There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. &PRODUCT; assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. &PRODUCT; assumes this "midnight to midnight" is relative to the usage.execution.timezone.
+						</para>
+						 <para>
+							Default: 1440
+						</para>
+
+					</entry>
+
+				</row>
+				 <row>
+					<entry>
+						<para>
+							usage.stats.job.exec.time
+						</para>
+					</entry>
+					 <entry>
+						<para>
+							The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter "10:30".
+						</para>
+						 <para>
+							If usage.stats.job.aggregation.range is also set, and its value is not 1440, then its value will be added to usage.stats.job.exec.time to get the time to run the Usage Server job again. This is repeated until 24 hours have elapsed, and the next day's processing begins again at usage.stats.job.exec.time.
+						</para>
+						 <para>
+							Default: 00:15.
+						</para>
+
+					</entry>
+
+				</row>
+
+			</tbody>
+
+		</tgroup>
+
+	</informaltable>
+	 <para>
+		For example, suppose that your server is in GMT, your user population is predominantly in the East Coast of the United States, and you would like to process usage records every night at 2 AM local (EST) time. Choose these settings:
+	</para>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				enable.usage.server = true
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				usage.execution.timezone = America/New_York
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				usage.stats.job.exec.time = 07:00. This will run the Usage job at 2:00 AM EST. Note that this will shift by an hour as the East Coast of the U.S. enters and exits Daylight Savings Time.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				usage.stats.job.aggregation.range = 1440
+			</para>
+		</listitem>
+
+	</itemizedlist>
+	 <para>
+		With this configuration, the Usage job will run every night at 2 AM EST and will process records for the previous day’s midnight-midnight as defined by the EST (America/New_York) time zone.
+	</para>
+	 <note>
+		<para>
+			Because the special value 1440 has been used for usage.stats.job.aggregation.range, the Usage Server will ignore the data between midnight and 2 AM. That data will be included in the next day's run
+		</para>
+	</note>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/configure-virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-virtual-router.xml b/docs/tmp/en-US/xml/configure-virtual-router.xml
new file mode 100644
index 0000000..2969623
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-virtual-router.xml
@@ -0,0 +1,58 @@
+<?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="configure-virtual-router" 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>Configuring the Virtual Router</title>
+	 <para>
+		You can set the following:
+	</para>
+	 <itemizedlist>
+		<listitem>
+			<para>
+				IP range
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Supported network services
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Default domain name for the network serviced by the virtual router
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Gateway IP address
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				How often &PRODUCT; fetches network usage statistics from &PRODUCT; virtual routers. If you want to collect traffic metering data from the virtual router, set the global configuration parameter router.stats.interval. If you are not using the virtual router to gather network usage statistics, set it to 0.
+			</para>
+		</listitem>
+
+	</itemizedlist>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/configure-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-vpc.xml b/docs/tmp/en-US/xml/configure-vpc.xml
new file mode 100644
index 0000000..798b833
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-vpc.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="configure-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>Configuring a Virtual Private Cloud</title>
+	 <xi:include href="vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="configure-acl.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-gateway-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-vm-to-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="acquire-new-ip-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="release-ip-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="enable-disable-static-nat-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-loadbalancer-rule-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="add-portforward-rule-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="remove-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="remove-vpc.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/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-vpn.xml b/docs/tmp/en-US/xml/configure-vpn.xml
new file mode 100644
index 0000000..44b892f
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-vpn.xml
@@ -0,0 +1,113 @@
+<?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="configure-vpn" 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>Configuring VPN</title>
+	 <para>
+		To set up VPN for the cloud:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI as an administrator or end user.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, click Global Settings.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Set the following global configuration parameters.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						remote.access.vpn.psk.length – Length of the IPSec key.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						remote.access.vpn.user.limit – Maximum number of VPN users per account.
+					</para>
+				</listitem>
+
+			</itemizedlist>
+		</listitem>
+	</orderedlist>
+	 <para>
+		To enable VPN for a particular network:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in as a user or administrator to the &PRODUCT; UI.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, click Network.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click the name of the network you want to work with.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click View IP Addresses.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click one of the displayed IP address names.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Enable VPN button 
+				<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/vpn-icon.png" />
+					</imageobject>
+					 <textobject>
+						<phrase>AttachDiskButton.png: button to attach a volume</phrase>
+					</textobject>
+
+				</inlinemediaobject>
+				.
+			</para>
+			 <para>
+				The IPsec key is displayed in a popup window.
+			</para>
+		</listitem>
+
+	</orderedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/configure-xenserver-dom-memory.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-xenserver-dom-memory.xml b/docs/tmp/en-US/xml/configure-xenserver-dom-memory.xml
new file mode 100644
index 0000000..5e9bea7
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-xenserver-dom-memory.xml
@@ -0,0 +1,29 @@
+<?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="configure-xenserver-dom0-memory" 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>Configure XenServer dom0 Memory</title>
+	 <para>
+		Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0. For instructions on how to do this, see <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/configure-xenserver-dom0-memory.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configure-xenserver-dom0-memory.xml b/docs/tmp/en-US/xml/configure-xenserver-dom0-memory.xml
new file mode 100644
index 0000000..5e9bea7
--- /dev/null
+++ b/docs/tmp/en-US/xml/configure-xenserver-dom0-memory.xml
@@ -0,0 +1,29 @@
+<?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="configure-xenserver-dom0-memory" 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>Configure XenServer dom0 Memory</title>
+	 <para>
+		Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0. For instructions on how to do this, see <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/configuring-projects.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/configuring-projects.xml b/docs/tmp/en-US/xml/configuring-projects.xml
new file mode 100644
index 0000000..669f586
--- /dev/null
+++ b/docs/tmp/en-US/xml/configuring-projects.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="configuring-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>Configuring Projects</title>
+	 <para>
+		Before &PRODUCT; users start using projects, the &PRODUCT; administrator must set up various systems to support them, including membership invitations, limits on project resources, and controls on who can create projects.
+	</para>
+	 <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="set-projects-creator-permissions.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/console-proxy.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/console-proxy.xml b/docs/tmp/en-US/xml/console-proxy.xml
new file mode 100644
index 0000000..80fbf9a
--- /dev/null
+++ b/docs/tmp/en-US/xml/console-proxy.xml
@@ -0,0 +1,53 @@
+<?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="console-proxy" 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>Console Proxy</title>
+	 <para>
+		The Console Proxy is a type of System Virtual Machine that has a role in presenting a console view via the web UI. It connects the user’s browser to the VNC port made available via the hypervisor for the console of the guest. Both the administrator and end user web UIs offer a console connection.
+	</para>
+	 <para>
+		Clicking on a console icon brings up a new window. The AJAX code downloaded into that window refers to the public IP address of a console proxy VM. There is exactly one public IP address allocated per console proxy VM. The AJAX application connects to this IP. The console proxy then proxies the connection to the VNC port for the requested VM on the Host hosting the guest. .
+	</para>
+	 <note>
+		<para>
+			The hypervisors will have many ports assigned to VNC usage so that multiple VNC sessions can occur simultaneously.
+		</para>
+	</note>
+	 <para>
+		There is never any traffic to the guest virtual IP, and there is no need to enable VNC within the guest.
+	</para>
+	 <para>
+		The console proxy VM will periodically report its active session count to the Management Server. The default reporting interval is five seconds. This can be changed through standard Management Server configuration with the parameter consoleproxy.loadscan.interval.
+	</para>
+	 <para>
+		Assignment of guest VM to console proxy is determined by first determining if the guest VM has a previous session associated with a console proxy. If it does, the Management Server will assign the guest VM to the target Console Proxy VM regardless of the load on the proxy VM. Failing that, the first available running Console Proxy VM that has the capacity to handle new sessions is used.
+	</para>
+	 <para>
+		Console proxies can be restarted by administrators but this will interrupt existing console sessions for users.
+	</para>
+	 <para>
+		The console viewing functionality uses a dynamic DNS service under the domain name realhostip.com to assist in providing SSL security to console sessions. The console proxy is assigned a public IP address. In order to avoid browser warnings for mismatched SSL certificates, the URL for the new console window is set to the form of https://aaa-bbb-ccc-ddd.realhostip.com. Customers will see this URL during console session creation. &PRODUCT; includes the realhostip.com SSL certificate in the console proxy VM. Of course, &PRODUCT; cannot know about DNS A records for our customers' public IPs prior to shipping the software. &PRODUCT; therefore runs a dynamic DNS server that is authoritative for the realhostip.com domain. It maps the aaa-bbb-ccc-ddd part of the DNS name to the IP address aaa.bbb.ccc.ddd on lookups. This allows the browser to correctly connect to the console proxy's public IP, where it then expects and receives a SSL certificate for realhostip.com, and SSL is set up witho
 ut browser warnings.
+	</para>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/convert-hyperv-vm-to-template.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/convert-hyperv-vm-to-template.xml b/docs/tmp/en-US/xml/convert-hyperv-vm-to-template.xml
new file mode 100644
index 0000000..1bd6f25
--- /dev/null
+++ b/docs/tmp/en-US/xml/convert-hyperv-vm-to-template.xml
@@ -0,0 +1,173 @@
+<?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="convert-hyperv-vm-to-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>Converting a Hyper-V VM to a Template</title>
+	 <para>
+		To convert a Hyper-V VM to a XenServer-compatible &PRODUCT; template, you will need a standalone XenServer host with an attached NFS VHD SR. Use whatever XenServer version you are using with &PRODUCT;, but use XenCenter 5.6 FP1 or SP2 (it is backwards compatible to 5.6). Additionally, it may help to have an attached NFS ISO SR.
+	</para>
+	 <para>
+		For Linux VMs, you may need to do some preparation in Hyper-V before trying to get the VM to work in XenServer. Clone the VM and work on the clone if you still want to use the VM in Hyper-V. Uninstall Hyper-V Integration Components and check for any references to device names in /etc/fstab:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				From the linux_ic/drivers/dist directory, run make uninstall (where "linux_ic" is the path to the copied Hyper-V Integration Components files).
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Restore the original initrd from backup in /boot/ (the backup is named *.backup0).
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Check /etc/fstab for any partitions mounted by device name. Change those entries (if any) to mount by LABEL or UUID (get that information with the "blkid" command)..
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		The next step is make sure the VM is not running in Hyper-V, then get the VHD into XenServer. There are two options for doing this.
+	</para>
+	 <para>
+		Option one:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Import the VHD using XenCenter. In XenCenter, go to Tools&gt;Virtual Appliance Tools&gt;Disk Image Import.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Choose the VHD, then click Next.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Name the VM, choose the NFS VHD SR under Storage, enable "Run Operating System Fixups" and choose the NFS ISO SR.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Next, then Finish. A VM should be created.
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		Option two
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Run XenConvert, under From choose VHD, under To choose XenServer. Click Next.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Choose the VHD, then click Next.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Input the XenServer host info, then click Next.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Name the VM, then click Next, then Convert. A VM should be created
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		Once you have a VM created from the Hyper-V VHD, prepare it using the following steps:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Boot the VM, uninstall Hyper-V Integration Services, and reboot.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Install XenServer Tools, then reboot.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Prepare the VM as desired. For example, run sysprep on Windows VMs. See <xref linkend="create-windows-template" />
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		Either option above will create a VM in HVM mode. This is fine for Windows VMs, but Linux VMs may not perform optimally. Converting a Linux VM to PV mode will require additional steps and will vary by distribution.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Shut down the VM and copy the VHD from the NFS storage to a web server; for example, mount the NFS share on the web server and copy it, or from the XenServer host use sftp or scp to upload it to the web server.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In &PRODUCT;, create a new template using the following values:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						URL. Give the URL for the VHD
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServer.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Hypervisor. XenServer
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Format. VHD
+					</para>
+				</listitem>
+
+			</itemizedlist>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		The template will be created, and you can create instances from it.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-bare-metal-template.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-bare-metal-template.xml b/docs/tmp/en-US/xml/create-bare-metal-template.xml
new file mode 100644
index 0000000..cd229b0
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-bare-metal-template.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="create-bare-metal-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>Creating a Bare Metal Template</title>
+	 <note>
+		<para>
+			<emphasis role="bold">Beta feature. Untested in &PRODUCT; 3.0.3. Provided without guarantee of performance</emphasis>.
+		</para>
+	</note>
+	 <para>
+		Before you can create a bare metal template, you must have performed several other installation and setup steps to create a bare metal cluster and environment. See Bare Metal Installation in the Installation Guide. It is assumed you already have a directory named "win7_64bit" on your CIFS server, containing the image for the bare metal instance. This directory and image are set up as part of the Bare Metal Installation procedure.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI as an administrator or end user.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation bar, click Templates.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Create Template.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the dialog box, enter the following values.
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name</emphasis>. Short name for the template.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Display Text</emphasis>. Description of the template.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">URL</emphasis>. The directory name which contains image file on your CIFS server. For example, win7_64bit.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Zone</emphasis>. All Zones.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">OS Type</emphasis>. Select the OS type of the ISO image. Choose other if the OS Type of the ISO is not listed or if the ISO is not bootable.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Hypervisor</emphasis>. BareMetal.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Format</emphasis>. BareMetal.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Password Enabled</emphasis>. No.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Public</emphasis>. No.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be more prominent for users to select. Only administrators may make templates featured.
+					</para>
+				</listitem>
+
+			</itemizedlist>
+		</listitem>
+	</orderedlist>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-new-projects.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-new-projects.xml b/docs/tmp/en-US/xml/create-new-projects.xml
new file mode 100644
index 0000000..1d9b545
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-new-projects.xml
@@ -0,0 +1,68 @@
+<?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="create-new-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>Creating a New Project</title>
+	 <para>
+		&PRODUCT; administrators and domain administrators can create projects. If the global configuration parameter allow.user.create.projects is set to true, end users can also create projects.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in as administrator to the &PRODUCT; UI.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation, click Projects.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In Select view, click Projects.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click New Project.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Give the project a name and description for display to users, then click Create Project.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				A screen appears where you can immediately add more members to the project. This is optional. Click Next when you are ready to move on.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Save.
+			</para>
+		</listitem>
+
+	</orderedlist>
+
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-template-from-existing-vm.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-template-from-existing-vm.xml b/docs/tmp/en-US/xml/create-template-from-existing-vm.xml
new file mode 100644
index 0000000..7801997
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-template-from-existing-vm.xml
@@ -0,0 +1,107 @@
+<?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="create-template-from-existing-vm" 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>Creating a Template from an Existing Virtual Machine</title>
+	 <para>
+		Once you have at least one VM set up in the way you want, you can use it as the prototype for other VMs.
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Create and start a virtual machine using any of the techniques given in <xref linkend="creating-vms" />.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Make any desired configuration changes on the running VM, then click Stop.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Wait for the VM to stop. When the status shows Stopped, go to the next step.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Create Template and provide the following:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so choose something descriptive.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">OS Type</emphasis>. This helps &PRODUCT; and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following.
+					</para>
+					 <itemizedlist>
+						<listitem>
+							<para>
+								If the operating system of the stopped VM is listed, choose it.
+							</para>
+						</listitem>
+						 <listitem>
+							<para>
+								If the OS type of the stopped VM is not listed, choose Other.
+							</para>
+						</listitem>
+						 <listitem>
+							<para>
+								If you want to boot from this template in PV mode, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere:
+							</para>
+							 <note>
+								<para>
+									Note: Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
+								</para>
+							</note>
+						</listitem>
+
+					</itemizedlist>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all users of this &PRODUCT; installation. The template will appear in the Community Templates list. See <xref linkend="private-public-template" />.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Password Enabled</emphasis>. Choose Yes if your template has the &PRODUCT; password change script installed. See Adding Password Management to Your Templates.
+					</para>
+				</listitem>
+
+			</itemizedlist>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add.
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		The new template will be visible in the Templates section when the template creation process has been completed. The template is then available when creating a new VM
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-template-from-snapshot.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-template-from-snapshot.xml b/docs/tmp/en-US/xml/create-template-from-snapshot.xml
new file mode 100644
index 0000000..e9da685
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-template-from-snapshot.xml
@@ -0,0 +1,29 @@
+<?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="create-template-from-snapshot" 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>Creating a Template from a Snapshot</title>
+	 <!--     <note><para>Not supported by Oracle VM</para></note>  --> <para>
+		If you do not want to stop the VM in order to use the Create Template menu item (as described in <xref linkend="create-template-from-existing-vm" />), you can create a template directly from any snapshot through the &PRODUCT; UI.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-templates-overview.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-templates-overview.xml b/docs/tmp/en-US/xml/create-templates-overview.xml
new file mode 100644
index 0000000..13f1a7c
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-templates-overview.xml
@@ -0,0 +1,53 @@
+<?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="create-templates-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>Creating Templates: Overview</title>
+	 <para>
+		&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Stop the VM.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Convert the volume into a template.
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into &PRODUCT;
+	</para>
+	 <para>
+		The various techniques for creating templates are described in the next few sections.
+	</para>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-vpn-connection-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-vpn-connection-vpc.xml b/docs/tmp/en-US/xml/create-vpn-connection-vpc.xml
new file mode 100644
index 0000000..eafa4d9
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-vpn-connection-vpc.xml
@@ -0,0 +1,177 @@
+<?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="create-vpn-connection-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>Creating a VPN Connection</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>
+				In the Select view, select VPC.
+			</para>
+			 <para>
+				All the VPCs that you create for the account are listed in the page.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Configure button of the VPC to which you want to deploy the VMs.
+			</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 ASLs
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Select Site-to-Site VPN.
+			</para>
+			 <para>
+				The Site-to-Site VPN page is displayed.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				From the Select View drop-down, ensure that VPN Connection is selected.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click Create VPN Connection.
+			</para>
+			 <para>
+				The Create VPN Connection dialog is displayed:
+			</para>
+			 <mediaobject>
+				<imageobject>
+					<imagedata fileref="./images/create-vpn-connection.png" />
+				</imageobject>
+				 <textobject>
+					<phrase>createvpnconnection.png: creating a vpn connection to the customer gateway.</phrase>
+				</textobject>
+
+			</mediaobject>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Select the desired customer gateway, then click OK to confirm.
+			</para>
+			 <para>
+				Within a few moments, the VPN Connection is displayed.
+			</para>
+			 <para>
+				The following information on the VPN connection is displayed:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						IP Address
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Gateway
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						State
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						IPSec Preshared Key
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						IKE Policy
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						ESP Policy
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</orderedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-vpn-customer-gateway.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-vpn-customer-gateway.xml b/docs/tmp/en-US/xml/create-vpn-customer-gateway.xml
new file mode 100644
index 0000000..9cc0c20
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-vpn-customer-gateway.xml
@@ -0,0 +1,253 @@
+<?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="create-vpn-customer-gateway" 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>Creating and Updating a VPN Customer Gateway</title>
+	 <note>
+		<para>
+			A VPN customer gateway can be connected to only one VPN gateway at a time.
+		</para>
+
+	</note>
+	 <para>
+		To add a VPN Customer Gateway:
+	</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 VPN Customer Gateway.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add site-to-site VPN.
+			</para>
+			 <mediaobject>
+				<imageobject>
+					<imagedata fileref="./images/add-vpn-customer-gateway.png" />
+				</imageobject>
+				 <textobject>
+					<phrase>addvpncustomergateway.png: adding a customer gateway.</phrase>
+				</textobject>
+
+			</mediaobject>
+			 <para>
+				Provide the following information:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name</emphasis>: A unique name for the VPN customer gateway you create.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Gateway</emphasis>: The IP address for the remote gateway.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">CIDR list</emphasis>: The guest CIDR list of the remote subnets. Enter a CIDR or a comma-separated list of CIDRs. Ensure that a guest CIDR list is not overlapped with the VPC’s CIDR, or another guest CIDR. The CIDR must be RFC1918-compliant.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">IPsec Preshared Key</emphasis>: Preshared keying is a method where the endpoints of the VPN share a secret key. This key value is used to authenticate the customer gateway and the VPC VPN gateway to each other.
+					</para>
+					 <note>
+						<para>
+							The IKE peers (VPN end points) authenticate each other by computing and sending a keyed hash of data that includes the Preshared key. If the receiving peer is able to create the same hash independently by using its Preshared key, it knows that both peers must share the same secret, thus authenticating the customer gateway.
+						</para>
+
+					</note>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">IKE Encryption</emphasis>: The Internet Key Exchange (IKE) policy for phase-1. The supported encryption algorithms are AES128, AES192, AES256, and 3DES. Authentication is accomplished through the Preshared Keys.
+					</para>
+					 <note>
+						<para>
+							The phase-1 is the first phase in the IKE process. In this initial negotiation phase, the two VPN endpoints agree on the methods to be used to provide security for the underlying IP traffic. The phase-1 authenticates the two VPN gateways to each other, by confirming that the remote gateway has a matching Preshared Key.
+						</para>
+
+					</note>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">IKE Hash</emphasis>: The IKE hash for phase-1. The supported hash algorithms are SHA1 and MD5.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">IKE DH</emphasis>: A public-key cryptography protocol which allows two parties to establish a shared secret over an insecure communications channel. The 1536-bit Diffie-Hellman group is used within IKE to establish session keys. The supported options are None, Group-5 (1536-bit) and Group-2 (1024-bit).
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">ESP Encryption</emphasis>: Encapsulating Security Payload (ESP) algorithm within phase-2. The supported encryption algorithms are AES128, AES192, AES256, and 3DES.
+					</para>
+					 <note>
+						<para>
+							The phase-2 is the second phase in the IKE process. The purpose of IKE phase-2 is to negotiate IPSec security associations (SA) to set up the IPSec tunnel. In phase-2, new keying material is extracted from the Diffie-Hellman key exchange in phase-1, to provide session keys to use in protecting the VPN data flow.
+						</para>
+
+					</note>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">ESP Hash</emphasis>: Encapsulating Security Payload (ESP) hash for phase-2. Supported hash algorithms are SHA1 and MD5.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Perfect Forward Secrecy</emphasis>: Perfect Forward Secrecy (or PFS) is the property that ensures that a session key derived from a set of long-term public and private keys will not be compromised. This property enforces a new Diffie-Hellman key exchange. It provides the keying material that has greater key material life and thereby greater resistance to cryptographic attacks. The available options are None, Group-5 (1536-bit) and Group-2 (1024-bit). The security of the key exchanges increase as the DH groups grow larger, as does the time of the exchanges.
+					</para>
+					 <note>
+						<para>
+							When PFS is turned on, for every negotiation of a new phase-2 SA the two gateways must generate a new set of phase-1 keys. This adds an extra layer of protection that PFS adds, which ensures if the phase-2 SA’s have expired, the keys used for new phase-2 SA’s have not been generated from the current phase-1 keying material.
+						</para>
+
+					</note>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">IKE Lifetime (seconds)</emphasis>: The phase-1 lifetime of the security association in seconds. Default is 86400 seconds (1 day). Whenever the time expires, a new phase-1 exchange is performed.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">ESP Lifetime (seconds)</emphasis>: The phase-2 lifetime of the security association in seconds. Default is 3600 seconds (1 hour). Whenever the value is exceeded, a re-key is initiated to provide a new IPsec encryption and authentication session keys.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Dead Peer Detection</emphasis>: A method to detect an unavailable Internet Key Exchange (IKE) peer. Select this option if you want the virtual router to query the liveliness of its IKE peer at regular intervals. It’s recommended to have the same configuration of DPD on both side of VPN connection.
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click OK.
+			</para>
+
+		</listitem>
+
+	</orderedlist>
+	 <formalpara>
+		<title>Updating and Removing a VPN Customer Gateway</title>
+		 <para>
+			You can update a customer gateway either with no VPN connection, or related VPN connection is in error state.
+		</para>
+
+	</formalpara>
+	 <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 VPN Customer Gateway.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Select the VPN customer gateway you want to work with.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				To modify the required parameters, click the Edit VPN Customer Gateway button
+				<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/edit-icon.png" />
+					</imageobject>
+					 <textobject>
+						<phrase>edit.png: button to edit a VPN customer gateway</phrase>
+					</textobject>
+
+				</inlinemediaobject>
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				To remove the VPN customer gateway, click the Delete VPN Customer Gateway button
+				<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/delete-button.png" />
+					</imageobject>
+					 <textobject>
+						<phrase>delete.png: button to remove a VPN customer gateway</phrase>
+					</textobject>
+
+				</inlinemediaobject>
+			</para>
+
+		</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/create-vpn-gateway-for-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-vpn-gateway-for-vpc.xml b/docs/tmp/en-US/xml/create-vpn-gateway-for-vpc.xml
new file mode 100644
index 0000000..e0f93db
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-vpn-gateway-for-vpc.xml
@@ -0,0 +1,135 @@
+<?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="create-vpn-gateway-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>Creating a VPN gateway for the VPC</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>
+				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 to which you want to deploy the VMs.
+			</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 Site-to-Site VPN.
+			</para>
+			 <para>
+				If you are creating the VPN gateway for the first time, selecting Site-to-Site VPN prompts you to create a VPN gateway.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				In the confirmation dialog, click Yes to confirm.
+			</para>
+			 <para>
+				Within a few moments, the VPN gateway is created. You will be prompted to view the details of the VPN gateway you have created. Click Yes to confirm.
+			</para>
+			 <para>
+				The following details are displayed in the VPN Gateway page:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						IP Address
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Account
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						Domain
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</orderedlist>
+</section>
+
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml/create-vr-network-offering.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-vr-network-offering.xml b/docs/tmp/en-US/xml/create-vr-network-offering.xml
new file mode 100644
index 0000000..39d85fc
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-vr-network-offering.xml
@@ -0,0 +1,156 @@
+<?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="create-vr-network-offering" 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>Creating and Changing a Virtual Router Network Offering</title>
+	 <para>
+		To create the network offering in association with a virtual router system service offering:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in to the &PRODUCT; UI as a user or admin.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				First, create a system service offering, for example: VRsystemofferingHA.
+			</para>
+			 <para>
+				For more information on creating a system service offering, see <xref linkend="creating-system-service-offerings" />.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				From the Select Offering drop-down, choose Network Offering.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add Network Offering.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				In the dialog, make the following choices:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name</emphasis>. Any desired name for the network offering.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Description</emphasis>. A short description of the offering that can be displayed to users.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Network Rate</emphasis>. Allowed data transfer rate in MB per second.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Traffic Type</emphasis>. The type of network traffic that will be carried on the network.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Guest Type</emphasis>. Choose whether the guest network is isolated or shared. For a description of these terms, see <xref linkend="about-virtual-networks" />.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Specify VLAN</emphasis>. (Isolated guest networks only) Indicate whether a VLAN should be specified when this offering is used.
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Supported Services</emphasis>. Select one or more of the possible network services. For some services, you must also choose the service provider; for example, if you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load balancers that have been configured in the cloud. Depending on which services you choose, additional fields may appear in the rest of the dialog box. For more information, see <xref linkend="creating-network-offerings" />
+					</para>
+
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">System Offering</emphasis>. Choose the system service offering that you want virtual routers to use in this network. In this case, the default “System Offering For Software Router” and the custom “VRsystemofferingHA” are available and displayed.
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click OK and the network offering is created.
+			</para>
+
+		</listitem>
+
+	</orderedlist>
+	 <para>
+		To change the network offering of a guest network to the virtual router service offering:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Select Network from the left navigation pane.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Select the guest network that you want to offer this network service to.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				Click the Edit button.
+			</para>
+
+		</listitem>
+		 <listitem>
+			<para>
+				From the Network Offering drop-down, select the virtual router network offering you have just created.
+			</para>
+
+		</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/create-windows-template.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/create-windows-template.xml b/docs/tmp/en-US/xml/create-windows-template.xml
new file mode 100644
index 0000000..4ed3373
--- /dev/null
+++ b/docs/tmp/en-US/xml/create-windows-template.xml
@@ -0,0 +1,68 @@
+<?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="create-windows-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>Creating a Windows Template</title>
+	 <para>
+		Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.
+	</para>
+	 <note>
+		<para>
+			(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
+		</para>
+	</note>
+	 <para>
+		An overview of the procedure is as follows:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Upload your Windows ISO.
+			</para>
+			 <para>
+				For more information, see <xref linkend="add-iso" />
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Create a VM Instance with this ISO.
+			</para>
+			<para>
+				For more information, see <xref linkend="creating-vms" />
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of Windows Server
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				The preparation steps are complete. Now you can actually create the template as described in Creating the Windows Template.
+			</para>
+		</listitem>
+
+	</orderedlist>
+	 <xi:include href="sysprep-windows-server-2008R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="sysprep-for-windows-server-2003R2.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/creating-compute-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/creating-compute-offerings.xml b/docs/tmp/en-US/xml/creating-compute-offerings.xml
new file mode 100644
index 0000000..022b5cc
--- /dev/null
+++ b/docs/tmp/en-US/xml/creating-compute-offerings.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="creating-compute-offerings" 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>Creating a New Compute Offering</title>
+	 <para>
+		To create a new compute offering:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in with admin privileges to the &PRODUCT; UI.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation bar, click Service Offerings.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In Select Offering, choose Compute Offering.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add Compute Offering.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the dialog, make the following choices:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="bold">Name</emphasis>: Any desired name for the service offering.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Description</emphasis>: A short description of the offering that can be displayed to users
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Storage type</emphasis>: The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold"># of CPU cores</emphasis>: The number of cores which should be allocated to a system VM with this offering
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">CPU (in MHz)</emphasis>: The CPU speed of the cores that the system VM is allocated. For example, “2000” would provide for a 2 GHz clock.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Memory (in MB)</emphasis>: The amount of memory in megabytes that the system VM should be allocated. For example, “2048” would provide for a 2 GB RAM allocation.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Network Rate</emphasis>: Allowed data transfer rate in MB per second.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Offer HA</emphasis>: If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Storage Tags</emphasis>: The tags that should be associated with the primary storage used by the system VM.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Host Tags</emphasis>: (Optional) Any tags that you use to organize your hosts
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">CPU cap</emphasis>: Whether to limit the level of CPU usage even if spare capacity is available.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						<emphasis role="bold">Public</emphasis>: Indicate whether the service offering should be available all domains or only some domains. Choose Yes to make it available to all domains. Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.
+					</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/creating-disk-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml/creating-disk-offerings.xml b/docs/tmp/en-US/xml/creating-disk-offerings.xml
new file mode 100644
index 0000000..88aa0af
--- /dev/null
+++ b/docs/tmp/en-US/xml/creating-disk-offerings.xml
@@ -0,0 +1,95 @@
+<?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="creating-disk-offerings" 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>Creating a New Disk Offering</title>
+	 <para>
+		To create a system service offering:
+	</para>
+	 <orderedlist>
+		<listitem>
+			<para>
+				Log in with admin privileges to the &PRODUCT; UI.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the left navigation bar, click Service Offerings.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In Select Offering, choose Disk Offering.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add Disk Offering.
+			</para>
+		</listitem>
+		 <listitem>
+			<para>
+				In the dialog, make the following choices:
+			</para>
+			 <itemizedlist>
+				<listitem>
+					<para>
+						Name. Any desired name for the system offering.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Description. A short description of the offering that can be displayed to users
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Custom Disk Size. If checked, the user can set their own disk size. If not checked, the root administrator must define a value in Disk Size.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Disk Size. Appears only if Custom Disk Size is not selected. Define the volume size in GB.
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						(Optional)Storage Tags. The tags that should be associated with the primary storage for this disk. Tags are a comma separated list of attributes of the storage. For example "ssd,blue". Tags are also added on Primary Storage. &PRODUCT; matches tags on a disk offering to tags on the storage. If a tag is present on a disk offering that tag (or tags) must also be present on Primary Storage for the volume to be provisioned. If no such primary storage exists, allocation from the disk offering will fail..
+					</para>
+				</listitem>
+				 <listitem>
+					<para>
+						Public. Indicate whether the service offering should be available all domains or only some domains. Choose Yes to make it available to all domains. Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.
+					</para>
+				</listitem>
+
+			</itemizedlist>
+		</listitem>
+		 <listitem>
+			<para>
+				Click Add.
+			</para>
+		</listitem>
+
+	</orderedlist>
+</section>
+
+