cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [8/22] adding docs
Date Mon, 16 Jul 2012 22:44:06 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/added-cloudPlatform-error-codes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-cloudPlatform-error-codes.xml b/docs/en-US/added-cloudPlatform-error-codes.xml
new file mode 100644
index 0000000..05ac883
--- /dev/null
+++ b/docs/en-US/added-cloudPlatform-error-codes.xml
@@ -0,0 +1,114 @@
+<section id="added-cloudPlatform-error-codes">
+		<title>Added CloudPlatform Error Codes</title>
+			<para>You can now find the CloudPlatform-specific error code in the exception response for each type of exception. The following list of error codes is added to the new class named CSExceptionErrorCode.  These codes are applicable in CloudPlatform 3.0.3 and later versions.</para>
+	<informaltable frame="all">
+		<tgroup cols="3" align="left" colsep="1" rowsep="1">
+			<colspec colname="c1" />
+			<colspec colname="c2" />
+			<colspec colname="c3" />
+				<tbody>
+					<row>
+						<entry><para>4250 : "com.cloud.utils.exception.CloudRuntimeException"</para></entry>
+						<entry><para>4255 : "com.cloud.utils.exception.ExceptionUtil"</para></entry>
+						<entry><para>4260 : "com.cloud.utils.exception.ExecutionException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4265 : "com.cloud.utils.exception.HypervisorVersionChangedException"</para></entry>
+						<entry><para>4270 : "com.cloud.utils.exception.RuntimeCloudException"</para></entry>
+						<entry><para>4275 : "com.cloud.exception.CloudException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4280 : "com.cloud.exception.AccountLimitException"</para></entry>
+						<entry><para>4285 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+						<entry><para>4290 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4295 : "com.cloud.exception.CloudExecutionException"</para></entry>
+						<entry><para>4300 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+						<entry><para>4305 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4310 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+						<entry><para>4315 : "com.cloud.exception.HAStateException"</para></entry>
+						<entry><para>4320 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4325 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+						<entry><para>4330 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+						<entry><para>4335 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4340 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+						<entry><para>4345 : "com.cloud.exception.InternalErrorException"</para></entry>
+						<entry><para>4350 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4355 : "com.cloud.exception.ManagementServerException"</para></entry>
+						<entry><para>4360 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+						<entry><para>4365 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4370 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+						<entry><para>4375 : "com.cloud.exception.ResourceInUseException"</para></entry>
+						<entry><para>4380 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4385 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+						<entry><para>4390 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+						<entry><para>4395 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4400 : "com.cloud.exception.AccountLimitException"</para></entry>
+						<entry><para>4405 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+						<entry><para>4410 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4415 : "com.cloud.exception.CloudException"</para></entry>
+						<entry><para>4420 : "com.cloud.exception.CloudExecutionException"</para></entry>
+						<entry><para>4425 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4430 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+						<entry><para>4435 : "com.cloud.exception.ConnectionException"</para></entry>
+						<entry><para>4440 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4445 : "com.cloud.exception.DiscoveryException"</para></entry>
+						<entry><para>4450 : "com.cloud.exception.HAStateException"</para></entry>
+						<entry><para>4455 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4460 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+						<entry><para>4465 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+						<entry><para>4470 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4475 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+						<entry><para>4480 : "com.cloud.exception.InsufficientVirtualNetworkCapcityException"</para></entry>
+						<entry><para>4485 : "com.cloud.exception.InternalErrorException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4490 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+						<entry><para>4495 : "com.cloud.exception.ManagementServerException"</para></entry>
+						<entry><para>4500 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4505 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+						<entry><para>4510 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+						<entry><para>4515 : "com.cloud.exception.ResourceInUseException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4520 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+						<entry><para>4525 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+						<entry><para>4530 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+					</row>
+					<row>
+						<entry><para>4535 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+						<entry><para>9999 : "com.cloud.api.ServerApiException"</para></entry>
+						<entry><para></para></entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</informaltable>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/adding-IP-addresses-for-the-public-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/adding-IP-addresses-for-the-public-network.xml b/docs/en-US/adding-IP-addresses-for-the-public-network.xml
new file mode 100644
index 0000000..5012651
--- /dev/null
+++ b/docs/en-US/adding-IP-addresses-for-the-public-network.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="adding-IP-addresses-for-the-public-network">
+	<title>Adding IP Addresses for the Public Network</title>
+	<para>These instructions assume you have already logged in to the CloudPlatform UI.</para>
+	<orderedlist>
+		<listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the desired zone .</para></listitem>
+		<listitem><para>Click the Network tab.</para></listitem>
+		<listitem><para>In the Public node of the diagram, click Configure.</para></listitem>
+		<listitem><para>Click the IP Ranges tab.</para></listitem>
+		<listitem><para>Provide the following information:</para>
+		<itemizedlist>
+			<listitem><para>Gateway. The gateway in use for these IP addresses</para></listitem>
+			<listitem><para>Netmask. The netmask associated with this IP range</para></listitem>
+			<listitem><para>VLAN. The VLAN that will be used for public traffic</para></listitem>
+			<listitem><para>Start IP/End IP. A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
+		</itemizedlist>
+		</listitem>
+		<listitem><para>Click Add.</para></listitem>
+	</orderedlist>
+	
+	
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/admin-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/admin-alerts.xml b/docs/en-US/admin-alerts.xml
new file mode 100644
index 0000000..ebb68c1
--- /dev/null
+++ b/docs/en-US/admin-alerts.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="admin-alerts">
+    <title>Administrator Alerts</title>
+    <para>The system provides alerts and events to help with the management of the cloud. Alerts are notices to an administrator, generally delivered by e-mail, notifying the administrator that an error has occurred in the cloud. Alert behavior is configurable.</para>
+    <para>Events track all of the user and administrator actions in the cloud. For example, every guest VM start creates an associated event. Events are stored in the Management Server’s database.</para>
+    <para>Emails will be sent to administrators under the following circumstances:</para>
+    <itemizedlist>
+        <listitem><para>The Management Server cluster runs low on CPU, memory, or storage resources</para></listitem>
+        <listitem><para>The Management Server loses heartbeat from a Host for more than 3 minutes</para></listitem>
+        <listitem><para>The Host cluster runs low on CPU, memory, or storage resources</para></listitem>
+        </itemizedlist>
+    
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/admin-guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/admin-guide.xml b/docs/en-US/admin-guide.xml
new file mode 100644
index 0000000..a4fbb42
--- /dev/null
+++ b/docs/en-US/admin-guide.xml
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="admin-guide">
+	<title>Administrator Guide</title>
+    <xi:include href="whats-in-this-adminguide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-working-with-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="vm-lifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="accessing-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="stopping-and-starting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-vm-name-os-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-service-offering-for-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="manual-live-migration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="deleting-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <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" />
+    <xi:include href="secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="best-practices-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="secondary-storage-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-secondary-storage-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="changing-secondary-storage-servers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="using-swift-for-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-new-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="upload-existing-volume-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="upload-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="private-public-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="attaching-volume.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="detach-move-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="resizing-volumes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="volume-deletion-garbage-collection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="incremental-snapshots-backup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="volume-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="snapshot-restore.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-traffic.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="using-multiple-guest-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-additional-guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="change-network-offering-on-guest-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-virtual-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="isolated-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="shared-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-ingress-egress-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="runtime-allocation-virtual-network-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="enable-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-load-balancer-rule.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="sticky-session-policies-for-lb-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="guest-ip-ranges.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="acquire-new-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="release-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="enable-disable-static-nat.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ip-forwarding-firewalling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="firewall-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="port-forwarding.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ip-load-balancing.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-password-management-to-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="configure-vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="tuning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="cloudplatform-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml
new file mode 100644
index 0000000..cd8a4da
--- /dev/null
+++ b/docs/en-US/advanced-zone-configuration.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="advanced-zone-configuration">
+	<title>Advanced Zone Configuration</title>
+    <para>TODO</para>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-physical-network-configuration.xml b/docs/en-US/advanced-zone-physical-network-configuration.xml
new file mode 100644
index 0000000..73fadec
--- /dev/null
+++ b/docs/en-US/advanced-zone-physical-network-configuration.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="advanced-zone-physical-network-configuration">
+	<title>Advanced Zone Physical Network Configuration</title>
+	<para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para>
+					
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/alerts.xml b/docs/en-US/alerts.xml
new file mode 100644
index 0000000..81f5f7f
--- /dev/null
+++ b/docs/en-US/alerts.xml
@@ -0,0 +1,31 @@
+	<section id="alerts">
+		<title>Alerts</title>
+		<para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
+		<programlisting>MEMORY = 0</programlisting>
+		<programlisting>CPU = 1</programlisting>
+		<programlisting>STORAGE =2</programlisting>
+		<programlisting>STORAGE_ALLOCATED = 3</programlisting>
+		<programlisting>PUBLIC_IP = 4</programlisting>
+		<programlisting>PRIVATE_IP = 5</programlisting>
+		<programlisting>HOST = 6</programlisting>
+		<programlisting>USERVM = 7</programlisting>
+		<programlisting>DOMAIN_ROUTER = 8</programlisting>
+		<programlisting>CONSOLE_PROXY = 9</programlisting>
+		<programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
+		<programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
+		<programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
+		<programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
+		<programlisting>USERVM_MIGRATE = 16</programlisting>
+		<programlisting>VLAN = 17</programlisting>
+		<programlisting>SSVM = 18</programlisting>
+		<programlisting>USAGE_SERVER_RESULT = 19</programlisting>
+		<programlisting>STORAGE_DELETE = 20;</programlisting>
+		<programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
+		<programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
+		<programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
+		<programlisting>LOCAL_STORAGE = 24;</programlisting>
+		<programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/allocators.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/allocators.xml b/docs/en-US/allocators.xml
new file mode 100644
index 0000000..99c9e57
--- /dev/null
+++ b/docs/en-US/allocators.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="allocators">
+    <title>Allocators</title>
+    <para>CloudPlatform enables administrators to write custom allocators that will choose the Host to place a new guest and the storage host from which to allocate guest virtual disk images.</para>
+   </section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/api-reference.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/api-reference.xml b/docs/en-US/api-reference.xml
new file mode 100644
index 0000000..c4ca74b
--- /dev/null
+++ b/docs/en-US/api-reference.xml
@@ -0,0 +1,8 @@
+	<section id="api-reference">
+		<title>API Reference Documentation</title>
+		<para>2.2 API Reference:</para>
+		<para><ulink url="http://download.cloud.com/support/downloads.html/">http://download.cloud.com/support/downloads.html/</ulink></para>
+		<para>3.0 API Reference:</para>
+		<para><ulink url="http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/">http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/</ulink></para>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/appendix-a-time-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/appendix-a-time-zones.xml b/docs/en-US/appendix-a-time-zones.xml
new file mode 100644
index 0000000..8cd904e
--- /dev/null
+++ b/docs/en-US/appendix-a-time-zones.xml
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="appendix-a-time-zones">
+	<title>Appendix A—Time Zones</title>
+	<para>The following time zone identifiers are accepted by CloudPlatform. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table.</para>
+						<informaltable>
+							<tgroup cols="3" align="left" colsep="1" rowsep="1">
+							<tbody>
+									<row>
+										<entry><para>Etc/GMT+12</para></entry>
+										<entry><para>America/La_Paz</para></entry>
+										<entry><para>Asia/Jerusalem</para></entry>
+										
+									</row>
+									<row>
+										<entry><para>Etc/GMT+11</para></entry>
+										<entry><para>America/Santiago</para></entry>
+										<entry><para>Europe/Minsk</para></entry>
+									
+									</row>
+									<row>
+										<entry><para>Pacific/Samoa</para></entry>
+										<entry><para>America/St_Johns</para></entry>
+										<entry><para>Europe/Moscow</para></entry>
+									</row>
+									<row>
+										<entry><para>Pacific/Honolulu</para></entry>
+										<entry><para>America/Araguaina</para></entry>
+										<entry><para>Africa/Nairobi</para></entry>
+									</row>
+								<row>
+									<entry><para>US/Alaska</para></entry>
+									<entry><para>America/Los_Angeles</para></entry>
+									<entry><para>Mexico/BajaNorte</para></entry>
+								</row>
+								<row>
+									<entry><para>US/Arizona</para></entry>
+									<entry><para>US/Mountain</para></entry>
+									<entry><para>America/Chihuahua</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>America/Chicago</para></entry>
+									<entry><para>America/Costa_Rica</para></entry>
+									<entry><para>America/Mexico_City</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>Canada/Saskatchewan</para></entry>
+									<entry><para>America/Bogota</para></entry>
+									<entry><para>America/New_York</para></entry>
+								</row>
+								<row>
+									<entry><para>America/Caracas</para></entry>
+									<entry><para>America/Asuncion</para></entry>
+									<entry><para>America/Cuiaba</para></entry>
+								</row>
+								<row>
+									<entry><para>America/Halifax</para></entry>
+									<entry><para>America/Argentina/Buenos_Aires</para></entry>
+									<entry><para>America/Cayenne</para></entry>
+								</row>
+								<row>
+									<entry><para>America/Godthab</para></entry>
+									<entry><para>America/Montevideo</para></entry>
+									<entry><para>Etc/GMT+2</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>Atlantic/Azores</para></entry>
+									<entry><para>Atlantic/Cape_Verde</para></entry>
+									<entry><para>Africa/Casablanca</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>Etc/UTC</para></entry>
+									<entry><para>Atlantic/Reykjavik</para></entry>
+									<entry><para>Europe/London</para></entry>
+								</row>
+								<row>
+									<entry><para>CET</para></entry>
+									<entry><para>Europe/Bucharest</para></entry>
+									<entry><para>Africa/Johannesburg</para></entry>
+								</row>
+								<row>
+									<entry><para>Asia/Beirut</para></entry>
+									<entry><para>Africa/Cairo</para></entry>
+									<entry><para>Asia/Karachi</para></entry>
+								</row>
+								<row>
+									<entry><para>Asia/Kolkata</para></entry>
+									<entry><para>Asia/Bangkok</para></entry>
+									<entry><para>Asia/Shanghai</para></entry>
+								</row>
+								<row>
+									<entry><para>Asia/Kuala_Lumpur</para></entry>
+									<entry><para>Australia/Perth</para></entry>
+									<entry><para>Asia/Taipei</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>Asia/Tokyo</para></entry>
+									<entry><para>Asia/Seoul</para></entry>
+									<entry><para>Australia/Adelaide</para></entry>
+									
+								</row>
+								<row>
+									<entry><para>Australia/Darwin</para></entry>
+									<entry><para>Australia/Brisbane</para></entry>
+									<entry><para>Australia/Canberra</para></entry>
+								</row>
+								<row>
+									<entry><para>Pacific/Guam</para></entry>
+									<entry><para>Pacific/Auckland</para></entry>
+									<entry></entry>
+								</row>
+							</tbody>
+							</tgroup>
+						</informaltable>
+				
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/asynchronous-commands-example.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/asynchronous-commands-example.xml b/docs/en-US/asynchronous-commands-example.xml
new file mode 100644
index 0000000..3bc65b6
--- /dev/null
+++ b/docs/en-US/asynchronous-commands-example.xml
@@ -0,0 +1,88 @@
+<section id="asynchronous-commands-example">
+	<title>Example</title>
+		<para>
+			The following shows an example of using an asynchronous command. Assume the API command:</para>
+		<programlisting>command=deployVirtualMachine&amp;zoneId=1&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=1
+		</programlisting>
+		<para>CloudStack will immediately return a job ID and any other additional data.</para>
+		<programlisting>
+		 &lt;deployvirtualmachineresponse&gt; 
+  			&lt;jobid&gt;1&lt;/jobid&gt;
+ 		    &lt;id&gt;100&lt;/id&gt;
+		 &lt;/deployvirtualmachineresponse&gt;
+		</programlisting>
+		<para>Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.</para>
+	    <programlisting>command=queryAsyncJobResult&amp;jobId=1</programlisting>
+		<para>Three possible results could come from this query.</para>
+		<para>Job is still pending:</para>
+	    <programlisting>
+	     &lt;queryasyncjobresult&gt; 
+  			&lt;jobid&gt;1&lt;/jobid&gt;
+  			&lt;jobstatus&gt;0&lt;/jobstatus&gt;
+  			&lt;jobprocstatus&gt;1&lt;/jobprocstatus&gt;
+		 &lt;/queryasyncjobresult&gt;
+		</programlisting>
+		<para>Job has succeeded:</para>
+	    <programlisting>
+	    	&lt;queryasyncjobresultresponse cloud-stack-version="3.0.1.6"&gt;
+  				&lt;jobid&gt;1&lt;/jobid&gt;
+  				&lt;jobstatus&gt;1&lt;/jobstatus&gt;
+  				&lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+ 				&lt;jobresultcode&gt;0&lt;/jobresultcode&gt;
+  				&lt;jobresulttype&gt;object&lt;/jobresulttype&gt;
+  				&lt;jobresult&gt;
+				    &lt;virtualmachine&gt;
+				    &lt;id&gt;450&lt;/id&gt;
+				    &lt;name&gt;i-2-450-VM&lt;/name&gt;
+				    &lt;displayname&gt;i-2-450-VM&lt;/displayname&gt;
+				    &lt;account&gt;admin&lt;/account&gt;
+				    &lt;domainid&gt;1&lt;/domainid&gt;
+				    &lt;domain&gt;ROOT&lt;/domain&gt;
+				    &lt;created&gt;2011-03-10T18:20:25-0800&lt;/created&gt;
+				    &lt;state&gt;Running&lt;/state&gt;
+				    &lt;haenable&gt;false&lt;/haenable&gt;
+				    &lt;zoneid&gt;1&lt;/zoneid&gt;
+				    &lt;zonename&gt;San Jose 1&lt;/zonename&gt;
+				    &lt;hostid&gt;2&lt;/hostid&gt;
+				    &lt;hostname&gt;905-13.sjc.lab.vmops.com&lt;/hostname&gt;
+				    &lt;templateid&gt;1&lt;/templateid&gt;
+				    &lt;templatename&gt;CentOS 5.3 64bit LAMP&lt;/templatename&gt;
+				    &lt;templatedisplaytext&gt;CentOS 5.3 64bit LAMP&lt;/templatedisplaytext&gt;
+				    &lt;passwordenabled&gt;false&lt;/passwordenabled&gt;
+				    &lt;serviceofferingid&gt;1&lt;/serviceofferingid&gt;
+				    &lt;serviceofferingname&gt;Small Instance&lt;/serviceofferingname&gt;
+				    &lt;cpunumber&gt;1&lt;/cpunumber&gt;
+				    &lt;cpuspeed&gt;500&lt;/cpuspeed&gt;
+				    &lt;memory&gt;512&lt;/memory&gt;
+				    &lt;guestosid&gt;12&lt;/guestosid&gt;
+				    &lt;rootdeviceid&gt;0&lt;/rootdeviceid&gt;
+				    &lt;rootdevicetype&gt;NetworkFilesystem&lt;/rootdevicetype&gt;
+				    &lt;nic&gt;
+				      &lt;id&gt;561&lt;/id&gt;
+				      &lt;networkid&gt;205&lt;/networkid&gt;
+				      &lt;netmask&gt;255.255.255.0&lt;/netmask&gt;
+				      &lt;gateway&gt;10.1.1.1&lt;/gateway&gt;
+				      &lt;ipaddress&gt;10.1.1.225&lt;/ipaddress&gt;
+				      &lt;isolationuri&gt;vlan://295&lt;/isolationuri&gt;
+				      &lt;broadcasturi&gt;vlan://295&lt;/broadcasturi&gt;
+				      &lt;traffictype&gt;Guest&lt;/traffictype&gt;
+				      &lt;type&gt;Virtual&lt;/type&gt;
+				      &lt;isdefault&gt;true&lt;/isdefault&gt;
+				    &lt;/nic&gt;
+				    &lt;hypervisor&gt;XenServer&lt;/hypervisor&gt;
+				   &lt;/virtualmachine&gt;
+				 &lt;/jobresult&gt;
+			&lt;/queryasyncjobresultresponse&gt;
+	    </programlisting>
+		<para>Job has failed:</para>
+    	<programlisting>
+    		&lt;queryasyncjobresult&gt;
+  				&lt;jobid&gt;1&lt;/jobid&gt; 
+  				&lt;jobstatus&gt;2&lt;/jobstatus&gt; 
+	  			&lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+	  			&lt;jobresultcode&gt;551&lt;/jobresultcode&gt;
+	  			&lt;jobresulttype&gt;text&lt;/jobresulttype&gt;
+	  			&lt;jobresult&gt;Unable to deploy virtual machine id = 100 due to not enough capacity&lt;/jobresult&gt; 
+			&lt;/queryasyncjobresult&gt;
+		</programlisting>	
+	</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/asynchronous-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/asynchronous-commands.xml b/docs/en-US/asynchronous-commands.xml
new file mode 100644
index 0000000..8a6255b
--- /dev/null
+++ b/docs/en-US/asynchronous-commands.xml
@@ -0,0 +1,15 @@
+<section id="asynchronous-commands">
+		<title>Asynchronous Commands</title>
+	<para>Starting in CloudStack 2.x, the notion of asynchronous commands has been introduced. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume.  They differ from synchronous commands by the following:
+		</para>
+		<itemizedlist>
+			<listitem><para>They are identified in the API Reference by an (A).</para></listitem>
+			<listitem><para>They will immediately return a job ID to refer to the job that will be responsible in processing the command.</para></listitem>
+			<listitem><para>If executed as a "create" resource command, it will return the resource ID as well as the job ID.</para>
+				<para>You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.</para>
+			</listitem>
+		</itemizedlist>
+		<xi:include href="job-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<xi:include href="asynchronous-commands-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/attach-iso-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attach-iso-to-vm.xml b/docs/en-US/attach-iso-to-vm.xml
new file mode 100644
index 0000000..4db9db0
--- /dev/null
+++ b/docs/en-US/attach-iso-to-vm.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="attach-iso-to-vm">
+	<title>Attaching an ISO to a VM</title>
+	<orderedlist>
+		<listitem><para>In the left navigation, click Instances.</para></listitem>
+		<listitem><para>Choose the virtual machine you want to work with.</para></listitem>
+		<listitem><para>Click the Attach ISO button <inlinemediaobject>
+			<imageobject>
+				<imagedata fileref="./images/iso-icon.png" />
+			</imageobject>
+			<textobject><phrase>iso.png: Depicts adding an iso image</phrase></textobject>
+		</inlinemediaobject></para></listitem>
+		<listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
+		<listitem><para>Click OK</para></listitem>
+	</orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attaching-volume.xml b/docs/en-US/attaching-volume.xml
new file mode 100644
index 0000000..e818a47
--- /dev/null
+++ b/docs/en-US/attaching-volume.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="attaching-volume">
+	<title>Attaching a Volume</title>
+	<para>You can attach a volume to a guest VM to provide extra disk storage. Attach a volume when you first create a new volume, when you are moving an existing volume from one VM to another, or after you have migrated a volume from one storage pool to another.</para>
+		<orderedlist>
+			<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+			<listitem><para>In the left navigation, click Storage.</para></listitem>
+			<listitem><para>In Select View, choose Volumes.</para></listitem>
+			<listitem><para>4.	Click the volume name in the Volumes list, then click the Attach Disk button<inlinemediaobject>
+				<imageobject>
+					<imagedata fileref="./images/attach-disk-icon.png" />
+				</imageobject>
+				<textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+			</inlinemediaobject>
+				</para></listitem>
+			<listitem><para>In the Instance popup, choose the VM to which you want to attach the volume. You will only see instances to which you are allowed to attach volumes; for example, a user will see only instances created by that user, but the administrator will have more choices.</para>
+				<para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para></listitem> 
+			<listitem><para>When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/automatic-snapshot-creation-retention.xml b/docs/en-US/automatic-snapshot-creation-retention.xml
new file mode 100644
index 0000000..9bf6b34
--- /dev/null
+++ b/docs/en-US/automatic-snapshot-creation-retention.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="automatic-snapshot-creation-retention">
+	<title>Automatic Snapshot Creation and Retention</title>
+	<para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>,
+			<emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold"
+			>KVM</emphasis>)</para>
+	<para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
+	<para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be
+		retained. Older snapshots that exceed the retention limit are automatically deleted. This
+		user-defined limit must be equal to or lower than the global limit set by the CloudPlatform
+		administrator. See  <xref linkend="globally-configured-limits"/>. The limit applies only to
+		those snapshots that are taken as part of an automatic recurring snapshot policy. Additional
+		manual snapshots can be created and retained.</para>
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/basic-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml
new file mode 100644
index 0000000..5c5d176
--- /dev/null
+++ b/docs/en-US/basic-zone-configuration.xml
@@ -0,0 +1,128 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="basic-zone-configuration">
+	<title>Basic Zone Configuration</title>
+    <orderedlist>
+        <listitem><para>After you select Basic in the Add Zone wizard and click Next, you will be asked to enter the following details. Then click Next.</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Name.</emphasis> A name for the zone.</para></listitem>
+                <listitem><para><emphasis role="bold">DNS 1 and 2.</emphasis> These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.</para></listitem>
+                <listitem><para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis> These are DNS servers for use by system VMs in the zone (these are VMs used by &PRODUCT; itself, such as virtual routers, console proxies, and Secondary Storage VMs.) These DNS servers will be accessed via the management traffic network interface of the System VMs. The private IP address you provide for the pods must have a route to the internal DNS server named here.</para></listitem>
+                <listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Introduced in version 3.0.1) Choose the hypervisor for the first cluster in the zone. You can add clusters with different hypervisors later, after you finish adding the zone.</para></listitem>
+                <listitem><para><emphasis role="bold">Network Offering.</emphasis> Your choice here determines what network services will be available on the network for guest VMs.</para>
+                    <informaltable frame="all">
+                        <tgroup cols="2" align="left" colsep="1" rowsep="1">
+                            <colspec colname="c1" />
+                            <colspec colname="c2" />
+                            <thead>
+                                <row>
+                                    <entry><para>Network Offering</para></entry>
+                                    <entry><para>Description</para></entry>
+                                </row>
+                            </thead>
+                            <tbody>
+                                <row>
+                                    <entry><para>DefaultSharedNetworkOfferingWithSGService</para></entry>
+                                    <entry><para>If you want to enable security groups for guest traffic isolation, choose this. (See Using Security Groups to Control Traffic to VMs.)</para></entry>
+                                </row>
+                                <row>
+                                    <entry><para>DefaultSharedNetworkOffering</para></entry>
+                                    <entry><para>If you do not need security groups, choose this.</para></entry>
+                                </row>                                
+                                <row>
+                                    <entry><para>DefaultSharedNetscalerEIPandELBNetworkOffering</para></entry>
+                                    <entry><para>If you have installed a Citrix NetScaler appliance as part of your zone network, and you will be using its Elastic IP and Elastic Load Balancing features, choose this. With the EIP and ELB features, a basic zone with security groups enabled can offer 1:1 static NAT and load balancing.</para></entry>
+                                </row>
+                            </tbody>
+                        </tgroup>
+                    </informaltable>
+                </listitem>
+                <listitem><para><emphasis role="bold">Network Domain.</emphasis> (Optional) If you want to assign a special domain name to the guest VM network, specify the DNS suffix.</para></listitem>
+                <listitem><para><emphasis role="bold">Public.</emphasis> A public zone is available to all users. A zone that is not public will be assigned to a particular domain.  Only users in that domain will be allowed to create guest VMs in this zone.</para></listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>Choose which traffic types will be carried by the physical network.</para>
+            <para>The traffic types are management, public, guest, and storage traffic. For more information about the types, roll over the icons to display their tool tips, or see Basic Zone Network Traffic Types. This screen starts out with some traffic types already assigned. To add more, drag and drop traffic types onto the network. You can also change the network name if desired.</para>
+        </listitem>
+        <listitem><para>3.	(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on the physical network. These labels must match the labels you have already defined on the hypervisor host. To assign each label, click the Edit button under the traffic type icon. A popup dialog appears where you can type the label, then click OK.</para>
+            <para>These traffic labels will be defined only for the hypervisor selected for the first cluster. For all other hypervisors, the labels can be configured after the zone is created.</para>
+            <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you must specify the corresponding Ethernet port profile names as network traffic label for each traffic type on the physical network. For more information on Nexus dvSwitch, see Configuring a vSphere Cluster with Nexus 1000v Virtual Switch.</para>
+        </listitem>
+        <listitem><para>Click Next.</para></listitem>
+        <listitem><para>(NetScaler only) If you chose the network offering for NetScaler, you have an additional screen to fill out. Provide the requested details to set up the NetScaler, then click Next.</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">IP address.</emphasis> The NSIP (NetScaler IP) address of the NetScaler device.</para></listitem>
+                <listitem><para><emphasis role="bold">Username/Password.</emphasis> The authentication credentials to access the device. &PRODUCT; uses these credentials to access the device.</para></listitem>
+                <listitem><para><emphasis role="bold">Type.</emphasis> NetScaler device type that is being added. It could be NetScaler VPX, NetScaler MPX, or NetScaler SDX. For a comparison of the types, see About Using a NetScaler Load Balancer.</para></listitem>
+                <listitem><para><emphasis role="bold">Public interface.</emphasis> Interface of NetScaler that is configured to be part of the public network.</para></listitem>
+                <listitem><para><emphasis role="bold">Private interface.</emphasis> Interface of NetScaler that is configured to be part of the private network.</para></listitem>
+                <listitem><para><emphasis role="bold">Number of retries.</emphasis> Number of times to attempt a command on the device before considering the operation failed. Default is 2.</para></listitem>
+                <listitem><para><emphasis role="bold">Capacity.</emphasis> Number of guest networks/accounts that will share this NetScaler device.</para></listitem>
+                <listitem><para><emphasis role="bold">Dedicated.</emphasis> When marked as dedicated, this device will be dedicated to a single account. When Dedicated is checked, the value in the Capacity field has no significance – implicitly, its value is 1.</para></listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>(NetScaler only) Configure the IP range for public traffic. The IPs in this range will be used for the static NAT capability which you enabled by selecting the network offering for NetScaler with EIP and ELB. Enter the following details, then click Add. If desired, you can repeat this step to add more IP ranges. When done, click Next.</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Gateway.</emphasis> The gateway in use for these IP addresses.</para></listitem>
+                <listitem><para><emphasis role="bold">Netmask.</emphasis> The netmask associated with this IP range.</para></listitem>
+                <listitem><para><emphasis role="bold">VLAN.</emphasis> The VLAN that will be used for public traffic.</para></listitem>
+                <listitem><para><emphasis role="bold">Start IP/End IP.</emphasis> A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest VMs.</para></listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>In a new zone, &PRODUCT; adds the first pod for you. You can always add more pods later. For an overview of what a pod is, see <xref linkend="about-pods" />.</para>
+            <para>To configure the first pod, enter the following, then click Next:</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Pod Name.</emphasis> A name for the pod.</para></listitem>
+                <listitem><para><emphasis role="bold">Reserved system gateway.</emphasis> The gateway for the hosts in that pod.</para></listitem>
+                <listitem><para><emphasis role="bold">Reserved system 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>Configure the network for guest traffic. Provide the following, then click Next:</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Guest gateway.</emphasis> The gateway that the guests should use.</para></listitem>
+                <listitem><para><emphasis role="bold">Guest netmask.</emphasis> The netmask in use on the subnet the guests will use.</para></listitem>
+                <listitem><para><emphasis role="bold">Guest start IP/End IP.</emphasis> Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests.</para>
+                    <itemizedlist>
+                        <listitem><para>We strongly recommend the use of multiple NICs. If multiple NICs are used, they may be in a different subnet.</para></listitem>
+                        <listitem><para>If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.</para></listitem>
+                    </itemizedlist>
+                </listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>In a new pod, &PRODUCT; adds the first cluster for you. You can always add more clusters later. For an overview of what a cluster is, see About Clusters.</para>
+            <para>To configure the first cluster, enter the following, then click Next:</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0 only; in 3.0.1, this field is read only) Choose the type of hypervisor software that all hosts in this cluster will run. If you choose VMware, additional fields appear so you can give information about a vSphere cluster. For vSphere servers, we recommend creating the cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add Cluster: vSphere.</para></listitem>
+                <listitem><para><emphasis role="bold">Cluster name.</emphasis> Enter a name for the cluster.  This can be text of your choosing and is not used by &PRODUCT;.</para></listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>In a new cluster, &PRODUCT; adds the first host for you. You can always add more hosts later. For an overview of what a host is, see About Hosts.</para>
+            <note><para>When you add a hypervisor host to &PRODUCT;, the host must not have any VMs already running.</para></note>
+            <para>Before you can configure the host, you need to install the hypervisor software on the host. You will need to know which version of the hypervisor software version is supported by &PRODUCT; and what additional configuration is required to ensure the host will work with &PRODUCT;. To find these installation details, see:</para>
+            <itemizedlist>
+                <listitem><para>Citrix XenServer Installation and Configuration</para></listitem>
+                <listitem><para>VMware vSphere Installation and Configuration</para></listitem>
+                <listitem><para>KVM vSphere Installation and Configuration</para></listitem>
+                <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
+            </itemizedlist>
+            <para>To configure the first host, enter the following, then click Next:</para>
+            <itemizedlist>
+                <listitem><para><emphasis role="bold">Host Name.</emphasis> The DNS name or IP address of the host.</para></listitem>
+                <listitem><para><emphasis role="bold">Username.</emphasis> The username is root.</para></listitem>
+                <listitem><para><emphasis role="bold">Password.</emphasis> This is the password for the user named above (from your XenServer or KVM install).</para></listitem>
+                <listitem><para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to categorize hosts for ease of maintenance. For example, you can set this to the cloud's HA tag (set in the ha.tag global configuration parameter) if you want this host to be used only for VMs with the "high availability" feature enabled. For more information, see HA-Enabled Virtual Machines as well as HA for Hosts.</para></listitem>
+            </itemizedlist>
+        </listitem>
+        <listitem><para>In a new cluster, CloudPlatform adds the first primary storage server for you. You can always add more servers later. For an overview of what primary storage is, see About Primary Storage.</para>
+            <para>To configure the first primary storage server, enter the following, then click Next:</para>
+            <itemizedlist>
+                <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. The remaining fields in the screen vary depending on what you choose here.</para></listitem>
+            </itemizedlist>
+        </listitem>
+    </orderedlist>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/basic-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-physical-network-configuration.xml b/docs/en-US/basic-zone-physical-network-configuration.xml
new file mode 100644
index 0000000..dac86b3
--- /dev/null
+++ b/docs/en-US/basic-zone-physical-network-configuration.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="basic-zone-physical-network-configuration">
+	<title>Basic Zone Physical Network Configuration</title>
+	<para>In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to CloudPlatform, you set up the guest network through the Add Zone screens.</para>
+					
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/best-practices-for-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-for-vms.xml b/docs/en-US/best-practices-for-vms.xml
new file mode 100644
index 0000000..000f676
--- /dev/null
+++ b/docs/en-US/best-practices-for-vms.xml
@@ -0,0 +1,6 @@
+<section id="vm-lifecycle">
+	<title>VM Lifecycle</title>
+	<para>The CloudPlatform administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudPlatform global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this
  number of VMs, use the CloudPlatform UI to disable allocation of more VMs to the cluster..</para>
+		
+</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/best-practices-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-primary-storage.xml b/docs/en-US/best-practices-primary-storage.xml
new file mode 100644
index 0000000..4b4ef9a
--- /dev/null
+++ b/docs/en-US/best-practices-primary-storage.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="best-practices-primary-storage">
+		<title>Best Practices for Primary Storage</title>
+		<itemizedlist>
+			<listitem><para>The speed of primary storage will impact guest performance. If possible, choose smaller, higher RPM drives for primary storage.</para></listitem>
+			<listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data</para></listitem>			
+		</itemizedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/best-practices-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-secondary-storage.xml b/docs/en-US/best-practices-secondary-storage.xml
new file mode 100644
index 0000000..27b889d
--- /dev/null
+++ b/docs/en-US/best-practices-secondary-storage.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="best-practices-secondary-storage">
+		<title>Best Practices for Secondary Storage</title>
+		<itemizedlist>
+		    <listitem><para>Each Zone can have one or more secondary storage servers. Multiple secondary storage servers provide increased scalability to the system.</para></listitem>
+		    <listitem><para>Secondary storage has a high read:write ratio and is expected to consist of larger drives with lower IOPS than primary storage.</para></listitem>
+		    <listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data.</para></listitem>		    
+		</itemizedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/best-practices-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-templates.xml b/docs/en-US/best-practices-templates.xml
new file mode 100644
index 0000000..71bc97b
--- /dev/null
+++ b/docs/en-US/best-practices-templates.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="best-practices-templates">
+	<title>Best Practices for Templates</title>
+	<para>If you plan to use large templates (100 GB or larger), be sure you have a 10-gigabit network to support the large templates. A slower network can lead to timeouts and other errors when large templates are used.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/best-practices-virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-virtual-router.xml b/docs/en-US/best-practices-virtual-router.xml
new file mode 100644
index 0000000..07324e8
--- /dev/null
+++ b/docs/en-US/best-practices-virtual-router.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="best-practices-virtual-router">
+    <title>Best Practices for Virtual Routers</title>
+    <itemizedlist>
+        <listitem><para>WARNING: Restarting a virtual router from a hypervisor console deletes all the iptables rules. To work around this issue, stop the virtual router and start it from the CloudPlatform UI.</para></listitem>
+        <listitem><para>WARNING: Do not use the destroyRouter API when only one router is available in the network, because restartNetwork API with the cleanup=false parameter can't recreate it later. If you want to destroy and recreate the single router available in the network, use the restartNetwork API with the cleanup=true parameter.</para></listitem>
+    </itemizedlist>
+    
+    
+    
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
new file mode 100644
index 0000000..04c341b
--- /dev/null
+++ b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="change-console-proxy-ssl-certificate-domain">
+    <title>Changing the Console Proxy SSL Certificate and Domain</title>
+    <para>If the administrator prefers, it is possible for the URL of the customer's console session to show a domain other than realhostip.com. The administrator can customize the displayed domain by selecting a different domain and uploading a new SSL certificate and private key. The domain must run a DNS service that is capable of resolving queries for addresses of the form aaa-bbb-ccc-ddd.your.domain to an IPv4 IP address in the form aaa.bbb.ccc.ddd, for example, 202.8.44.1. To change the console proxy domain, SSL certificate, and private key:</para>
+    <orderedlist>
+        <listitem><para>Set up dynamic name resolution or populate all possible DNS names in your public IP range into your existing DNS server with the format aaa-bbb-ccc-ddd.company.com -> aaa.bbb.ccc.ddd.</para></listitem>
+        <listitem><para>Generate the private key and certificate signing request (CSR). When you are using openssl to generate private/public key pairs and CSRs, for the private key that you are going to paste into the CloudPlatform UI, be sure to convert it into PKCS#8 format.</para>
+        <orderedlist numeration="loweralpha">
+            <listitem><para>Generate a new 2048-bit private key</para><programlisting>openssl genrsa -des3 -out yourprivate.key 2048</programlisting></listitem>
+            <listitem><para>Generate a new certificate CSR</para><programlisting>openssl req -new -key yourprivate.key -out yourcertificate.csr</programlisting></listitem>
+            <listitem><para>Head to the website of your favorite trusted Certificate Authority, purchase an SSL certificate, and submit the CSR. You should receive a valid certificate in return</para></listitem>
+            <listitem><para>Convert your private key format into PKCS#8 encrypted format.</para><programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key</programlisting></listitem>
+            <listitem><para>Convert your PKCS#8 encrypted private key into the PKCS#8 format that is compliant with CloudPlatform</para><programlisting>openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key</programlisting></listitem>
+        </orderedlist>          
+        </listitem>
+        <listitem><para>In the Update SSL Certificate screen of the CloudPlatform UI, paste the following</para>
+        <itemizedlist>
+            <listitem><para>Certificate from step 1(c).</para></listitem>
+            <listitem><para>Private key from step 1(e).</para></listitem>
+            <listitem><para>The desired new domain name; for example, company.com</para></listitem>
+        </itemizedlist>
+        </listitem>
+        <listitem><para>The desired new domain name; for example, company.com</para><para>This stops all currently running console proxy VMs, then restarts them with the new certificate and key. Users might notice a brief interruption in console availability</para></listitem>
+        </orderedlist>
+    <para>The Management Server will generate URLs of the form "aaa-bbb-ccc-ddd.company.com" after this change is made. New console requests will be served with the new DNS domain name, certificate, and key</para>    
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/change-host-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-host-password.xml b/docs/en-US/change-host-password.xml
new file mode 100644
index 0000000..42a852c
--- /dev/null
+++ b/docs/en-US/change-host-password.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="change-host-password">
+    <title>Changing Host Password</title>
+    <para>The password for a XenServer Node, KVM Node, or vSphere Node may be changed in the database.  Note that all Nodes in a Cluster must have the same password.</para>
+    <para> To change a Node's password:</para>
+    <orderedlist>
+        <listitem><para>Identify all hosts in the cluster.</para></listitem>
+        <listitem><para>Change the password on all hosts in the cluster.  Now the password for the host and the password known to CloudPlatform will not match.  Operations on the cluster will fail until the two passwords match.</para>
+        </listitem>
+        <listitem><para>Get the list of host IDs for the host in the cluster where you are changing the password.  You will need to access the database to determine these host IDs.  For each hostname "h" (or vSphere cluster) that you are changing the password for, execute:</para>
+        <programlisting>mysql> select id from cloud.host where name like '%h%';</programlisting>   </listitem>
+        <listitem><para>This should return a single ID.  Record the set of such IDs for these hosts.</para></listitem>        
+        <listitem><para>Update the passwords for the host in the database. In this example, we change the passwords for hosts with IDs 5, 10, and 12 to "password".</para>
+        <programlisting>mysql> update cloud.host set password='password' where id=5 or id=10 or id=12;</programlisting></listitem>
+      </orderedlist>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/change-network-offering-on-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-network-offering-on-guest-network.xml b/docs/en-US/change-network-offering-on-guest-network.xml
new file mode 100644
index 0000000..c2448b9
--- /dev/null
+++ b/docs/en-US/change-network-offering-on-guest-network.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="change-network-offering-on-guest-network">
+	<title>Changing the Network Offering on a Guest Network</title>
+	<para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
+	<itemizedlist>
+		<listitem><para>Log in to the CloudPlatform UI as an administrator or end user. </para></listitem>
+		<listitem><para>2.	If you are changing from a network offering that uses the CloudPlatform virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
+		<listitem><para>In the left navigation, choose Network</para></listitem>
+		<listitem><para>Click the name of the network you want to modify <inlinemediaobject>
+			<imageobject>
+				<imagedata fileref="./images/edit-icon.png" />
+			</imageobject>
+			<textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+		</inlinemediaobject>.</para></listitem>
+		<listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
+		<listitem><para>A prompt appears asking whether you want to keep the existing CIDR. This is to let you know that if you change the network offering, the CIDR will be affected. Choose No to proceed with the change.</para></listitem>
+		<listitem><para>Wait for the update to complete. Don’t try to restart VMs until after the network change is complete.</para></listitem>
+		<listitem><para>If you stopped any VMs in step 2, restart them.</para></listitem>
+	</itemizedlist>
+
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/change-to-behavior-of-list-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-to-behavior-of-list-commands.xml b/docs/en-US/change-to-behavior-of-list-commands.xml
new file mode 100644
index 0000000..2270db2
--- /dev/null
+++ b/docs/en-US/change-to-behavior-of-list-commands.xml
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="change-to-behavior-of-list-commands">
+		<title>Change to Behavior of List Commands</title>
+		<para>There was a major change in how our List* API commands work in CloudStack 3.0 compared to 2.2.x. The rules below apply only for managed resources – those that belong to an account, domain, or project. They are irrelevant for the List* commands displaying unmanaged (system) resources, such as hosts, clusters, and external network resources.</para>
+		<para>When no parameters are passed in to the call, the caller sees only resources owned by the caller (even when the caller is the administrator). Previously, the administrator saw everyone else's resources by default.</para>
+		<para>When accountName and domainId are passed in:</para>
+		<itemizedlist>
+			<listitem><para>The caller sees the resources dedicated to the account specified.</para></listitem>
+			<listitem><para>If the call is executed by a regular user, the user is authorized to specify only the user's own account and domainId.</para></listitem>
+			<listitem><para>If the caller is a domain administrator, CloudStack performs an authorization check to see whether the caller is permitted to view resources for the given account and domainId.</para></listitem>
+		</itemizedlist>
+		<para>When projectId is passed in, only resources belonging to that project are listed.</para>
+		<para>When domainId is passed in, the call returns only resources belonging to the domain specified. To see the resources of subdomains, use the parameter isRecursive=true. Again, the regular user can see only resources owned by that user, the root administrator can list anything, and a domain administrator is authorized to see only resources of the administrator's own domain and subdomains.</para>
+		<para>To see all resources the caller is authorized to see, except for Project resources, use the parameter listAll=true.</para>
+		<para>To see all Project resources the caller is authorized to see, use the parameter projectId=-1.</para>
+		<para>There is one API command that doesn't fall under the rules above completely: the listTemplates command. This command has its own flags defining the list rules:</para>
+		<informaltable frame="all">
+			<tgroup cols="2" align="left" colsep="1" rowsep="1">
+				<colspec colname="c1" />
+				<colspec colname="c2" />
+				<thead>
+					<row>
+						<entry><para>listTemplates Flag</para></entry>
+						<entry><para>Description</para></entry>
+					</row>
+				</thead>
+				<tbody>
+					<row>
+						<entry><para>featured</para></entry>
+						<entry><para>Returns templates that have been marked as featured and public.</para></entry>
+					</row>
+
+						<row>
+							<entry><para>self</para></entry>
+							<entry><para>Returns templates that have been registered or created by the calling user.</para></entry>
+						</row>
+
+						<row>
+							<entry><para>selfexecutable</para></entry>
+							<entry><para>Same as self, but only returns templates that are ready to be deployed with.</para></entry>
+						</row>
+
+						<row>
+							<entry><para>sharedexecutable</para></entry>
+							<entry><para>Ready templates that have been granted to the calling user by another user.</para></entry>
+						</row>
+
+					<row>
+						<entry><para>executable</para></entry>
+						<entry><para>Templates that are owned by the calling user, or public templates, that can be used to deploy a new VM.</para></entry>
+					</row>
+
+						<row>
+							<entry><para>community</para></entry>
+							<entry><para>Returns templates that have been marked as public but not featured.</para></entry>
+						</row>
+
+					<row>
+						<entry><para>all</para></entry>
+						<entry><para>Returns all templates (only usable by admins).</para></entry>
+					</row>
+				</tbody>
+				</tgroup>
+		</informaltable>	
+		<para>The CloudPlatform UI on a general view will display all resources that the logged-in user is authorized to see, except for project resources. To see the project resources, select the project view.</para>
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-root-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-root-password.xml b/docs/en-US/changing-root-password.xml
new file mode 100644
index 0000000..a30b461
--- /dev/null
+++ b/docs/en-US/changing-root-password.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="changing-root-password">
+	<title>Changing the Root Password</title>
+    <para>During installation and ongoing cloud administration, you will need to log in to the UI as the root administrator.
+        The root administrator account manages the &PRODUCT; deployment, including physical infrastructure.
+        The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person.
+        When first installing &PRODUCT;, be sure to change the default password to a new, unique value.</para>
+    <orderedlist>
+        <listitem><para>Open your favorite Web browser and go to this URL. Substitute the IP address of your own Management Server:</para>
+            <programlisting>http://&lt;management-server-ip-address&gt;:8080/client</programlisting>
+        </listitem>
+        <listitem><para>Log in to the UI using the current root user ID and password. The default is admin, password.</para></listitem>
+        <listitem><para>Click Accounts.</para></listitem>
+        <listitem><para>Click the admin account name.</para></listitem>
+        <listitem><para>Click View Users.</para></listitem>
+        <listitem><para>Click the admin user name.</para></listitem>
+        <listitem>
+            <para>Click the Change Password button.
+                <inlinemediaobject>
+                    <imageobject>
+                        <imagedata fileref="./images/change-password.png" />
+                    </imageobject>
+                    <textobject><phrase>change-password.png: button to change a user's password</phrase></textobject>
+                </inlinemediaobject></para>
+        </listitem>
+        <listitem><para>Type the new password, and click OK.</para></listitem>
+    </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-secondary-storage-ip.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-ip.xml b/docs/en-US/changing-secondary-storage-ip.xml
new file mode 100644
index 0000000..21ed977
--- /dev/null
+++ b/docs/en-US/changing-secondary-storage-ip.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>	
+<section id="changing-secondary-storage-ip">
+		<title>Making API Requests</title>
+		<para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
+		<programlisting>
+		# mysql -p
+		mysql> use cloud;
+		mysql> select id from host where type = 'SecondaryStorage';
+		mysql> update host_details set value = 'nfs://192.168.160.20/export/mike-ss1'
+  		where host_id = HOSTID and name = 'orig.url';
+		mysql> update host set name = 'nfs://192.168.160.20/export/mike-ss1' where type
+  		= 'SecondaryStorage' and id = #;
+		mysql> update host set url = 'nfs://192.168.160.20/export/mike-ss1' where type
+ 		 = 'SecondaryStorage' and id = #;
+		mysql> update host set guid = 'nfs://192.168.160.20/export/mike-ss1' where type
+  		= 'SecondaryStorage' and id = #;
+		</programlisting>
+		<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>
+		<para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
+			
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-secondary-storage-servers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml
new file mode 100644
index 0000000..92590f2
--- /dev/null
+++ b/docs/en-US/changing-secondary-storage-servers.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="changing-secondary-storage-serversp">
+	<title>Changing Secondary Storage Servers</title>
+	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
+		<orderedlist>
+			<listitem><para>Stop all running Management Servers.</para></listitem>
+			<listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
+			<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
+			<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
+			<listitem><para>Start the Management Server.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-secondary-storage-serversp.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml
new file mode 100644
index 0000000..889f8b8
--- /dev/null
+++ b/docs/en-US/changing-secondary-storage-serversp.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="changing-secondary-storage-serversp">
+	<title>Changing Secondary Storage Servers</title>
+	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
+		<orderedlist>
+			<listitem><para>Stop all running Management Servers.</para></listitem>
+			<listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
+			<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
+			<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
+			<listitem><para>5.	Start the Management Server.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-service-offering-for-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-service-offering-for-vm.xml b/docs/en-US/changing-service-offering-for-vm.xml
new file mode 100644
index 0000000..c4748f0
--- /dev/null
+++ b/docs/en-US/changing-service-offering-for-vm.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="changing-service-offering-for-vm">
+	<title>Changing the Service Offering for a VM</title>
+		<para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</para>
+		<orderedlist>
+			<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+			<listitem><para>In the left navigation, click Instances.</para></listitem>
+			<listitem><para>Choose the VM that you want to work with.</para></listitem>
+			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
+				<imageobject>
+					<imagedata fileref="./images/stop-instance-icon.png" />
+				</imageobject>
+				<textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
+			</inlinemediaobject>
+				</para></listitem>
+			<listitem><para>Click the Change Service button <inlinemediaobject>
+				<imageobject>
+					<imagedata fileref="./images/change-service-icon.png" />
+				</imageobject>
+				<textobject><phrase>ChangeServiceButton.png: button to change the service of a VM</phrase></textobject>
+			</inlinemediaobject>. The Change service dialog box is displayed.</para></listitem>
+			<listitem><para>Select the offering you want.</para></listitem>
+			<listitem><para>Click OK.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/changing-vm-name-os-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-vm-name-os-group.xml b/docs/en-US/changing-vm-name-os-group.xml
new file mode 100644
index 0000000..810d0e7
--- /dev/null
+++ b/docs/en-US/changing-vm-name-os-group.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="changing-vm-name-os-group">
+	<title>Changing the VM Name, OS, or Group</title>
+	<para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
+	<para>To access a VM through the CloudPlatform UI:</para>
+		<orderedlist>
+			<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+			<listitem><para>In the left navigation, click Instances.</para></listitem>
+			<listitem><para>Select the VM that you want to modify.</para></listitem>
+			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
+				<imageobject>
+					<imagedata fileref="./images/stop-instance-icon.png" />
+				</imageobject>
+				<textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
+			</inlinemediaobject>
+				</para></listitem>
+			<listitem><para>Click Edit <inlinemediaobject>
+				<imageobject>
+					<imagedata fileref="./images/edit.png" />
+				</imageobject>
+				<textobject><phrase>StopButton.png: button to edit the properties of a VM</phrase></textobject>
+			</inlinemediaobject>.</para></listitem>
+			<listitem><para>Make the desired changes to the following:</para></listitem>
+			
+				<listitem><para>Display name: Enter a new display name if you want to change the name of the VM.</para></listitem>
+				<listitem><para>OS Type: Select the desired operating system.</para></listitem>
+				<listitem><para>Group: Enter the group name for the VM.</para></listitem>	
+			
+			<listitem><para>Click Apply.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e874fdb2/docs/en-US/cloud-infrastructure-concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml
new file mode 100644
index 0000000..cdf8ed0
--- /dev/null
+++ b/docs/en-US/cloud-infrastructure-concepts.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<section id="cloud-infrastructure-concepts">
+	<title>Cloud Infrastructure Concepts</title>
+    <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>
\ No newline at end of file


Mime
View raw message