incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [24/52] [partial] Revised en-US/network-setup.xml to include the correct file.
Date Thu, 08 Nov 2012 06:13:10 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/aws-ec2-supported-commands.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/aws-ec2-supported-commands.html b/docs/tmp/en-US/html/aws-ec2-supported-commands.html
deleted file mode 100644
index 845cb40..0000000
--- a/docs/tmp/en-US/html/aws-ec2-supported-commands.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.6. Supported AWS API Calls</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-timeouts.html" title="10.5. Using Timeouts to Ensure AWS API Command Completion" /><link rel="next" href="networks.html" title="Chapter 11. Managing Networks and Traffic" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.p
 ng" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-timeouts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="networks.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-supported-commands" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-supported-commands">10.6. Supported AWS API Calls</h2></div></div></div><div class="para">
-		The following Amazon EC2 commands are supported by CloudStack when the AWS API compatibility feature is enabled. For a few commands, there are differences between the CloudStack and Amazon EC2 versions, and these differences are noted. The underlying SOAP call for each command is also given, for those who have built tools using those calls.
-	</div><div class="table"><h6>Table 10.1. Elastic IP API mapping</h6><div class="table-contents"><table summary="Elastic IP API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-allocate-address
-					</td><td align="left">
-						AllocateAddress
-					</td><td align="left">
-						associateIpAddress
-					</td></tr><tr><td align="left">
-						ec2-associate-address
-					</td><td align="left">
-						AssociateAddress
-					</td><td align="left">
-						enableStaticNat
-					</td></tr><tr><td align="left">
-						ec2-describe-addresses
-					</td><td align="left">
-						DescribeAddresses
-					</td><td align="left">
-						listPublicIpAddresses
-					</td></tr><tr><td align="left">
-						ec2-diassociate-address
-					</td><td align="left">
-						DisassociateAddress
-					</td><td align="left">
-						disableStaticNat
-					</td></tr><tr><td align="left">
-						ec2-release-address
-					</td><td align="left">
-						ReleaseAddress
-					</td><td align="left">
-						disassociateIpAddress
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.2. Availability Zone API mapping</h6><div class="table-contents"><table summary="Availability Zone API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-describe-availability-zones
-					</td><td align="left">
-						DescribeAvailabilityZones
-					</td><td align="left">
-						listZones
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.3. Images API mapping</h6><div class="table-contents"><table summary="Images API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-create-image
-					</td><td align="left">
-						CreateImage
-					</td><td align="left">
-						createTemplate
-					</td></tr><tr><td align="left">
-						ec2-deregister
-					</td><td align="left">
-						DeregisterImage
-					</td><td align="left">
-						DeleteTemplate
-					</td></tr><tr><td align="left">
-						ec2-describe-images
-					</td><td align="left">
-						DescribeImages
-					</td><td align="left">
-						listTemplates
-					</td></tr><tr><td align="left">
-						ec2-register
-					</td><td align="left">
-						RegisterImage
-					</td><td align="left">
-						registerTemplate
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.4. Image Attributes API mapping</h6><div class="table-contents"><table summary="Image Attributes API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-describe-image-attribute
-					</td><td align="left">
-						DescribeImageAttribute
-					</td><td align="left">
-						listTemplatePermissions
-					</td></tr><tr><td align="left">
-						ec2-modify-image-attribute
-					</td><td align="left">
-						ModifyImageAttribute
-					</td><td align="left">
-						updateTemplatePermissions
-					</td></tr><tr><td align="left">
-						ec2-reset-image-attribute
-					</td><td align="left">
-						ResetImageAttribute
-					</td><td align="left">
-						updateTemplatePermissions
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.5. Instances API mapping</h6><div class="table-contents"><table summary="Instances API mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-describe-instances
-					</td><td align="left">
-						DescribeInstances
-					</td><td align="left">
-						listVirtualMachines
-					</td></tr><tr><td align="left">
-						ec2-run-instances
-					</td><td align="left">
-						RunInstances
-					</td><td align="left">
-						deployVirtualMachine
-					</td></tr><tr><td align="left">
-						ec2-reboot-instances
-					</td><td align="left">
-						RebootInstances
-					</td><td align="left">
-						rebootVirtualMachine
-					</td></tr><tr><td align="left">
-						ec2-start-instances
-					</td><td align="left">
-						StartInstances
-					</td><td align="left">
-						startVirtualMachine
-					</td></tr><tr><td align="left">
-						ec2-stop-instances
-					</td><td align="left">
-						StopInstances
-					</td><td align="left">
-						stopVirtualMachine
-					</td></tr><tr><td align="left">
-						ec2-terminate-instances
-					</td><td align="left">
-						TerminateInstances
-					</td><td align="left">
-						destroyVirtualMachine
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.6. Instance Attributes Mapping</h6><div class="table-contents"><table summary="Instance Attributes Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-describe-instance-attribute
-					</td><td align="left">
-						DescribeInstanceAttribute
-					</td><td align="left">
-						listVirtualMachines
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.7. Keys Pairs Mapping</h6><div class="table-contents"><table summary="Keys Pairs Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-add-keypair
-					</td><td align="left">
-						CreateKeyPair
-					</td><td align="left">
-						createSSHKeyPair
-					</td></tr><tr><td align="left">
-						ec2-delete-keypair
-					</td><td align="left">
-						DeleteKeyPair
-					</td><td align="left">
-						deleteSSHKeyPair
-					</td></tr><tr><td align="left">
-						ec2-describe-keypairs
-					</td><td align="left">
-						DescribeKeyPairs
-					</td><td align="left">
-						listSSHKeyPairs
-					</td></tr><tr><td align="left">
-						ec2-import-keypair
-					</td><td align="left">
-						ImportKeyPair
-					</td><td align="left">
-						registerSSHKeyPair
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.8. Passwords API Mapping</h6><div class="table-contents"><table summary="Passwords API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-get-password
-					</td><td align="left">
-						GetPasswordData
-					</td><td align="left">
-						getVMPassword
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.9. Security Groups API Mapping</h6><div class="table-contents"><table summary="Security Groups API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-authorize
-					</td><td align="left">
-						AuthorizeSecurityGroupIngress
-					</td><td align="left">
-						authorizeSecurityGroupIngress
-					</td></tr><tr><td align="left">
-						ec2-add-group
-					</td><td align="left">
-						CreateSecurityGroup
-					</td><td align="left">
-						createSecurityGroup
-					</td></tr><tr><td align="left">
-						ec2-delete-group
-					</td><td align="left">
-						DeleteSecurityGroup
-					</td><td align="left">
-						deleteSecurityGroup
-					</td></tr><tr><td align="left">
-						ec2-describe-group
-					</td><td align="left">
-						DescribeSecurityGroups
-					</td><td align="left">
-						listSecurityGroups
-					</td></tr><tr><td align="left">
-						ec2-revoke
-					</td><td align="left">
-						RevokeSecurityGroupIngress
-					</td><td align="left">
-						revokeSecurityGroupIngress
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.10. Snapshots API Mapping</h6><div class="table-contents"><table summary="Snapshots API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-create-snapshot
-					</td><td align="left">
-						CreateSnapshot
-					</td><td align="left">
-						createSnapshot
-					</td></tr><tr><td align="left">
-						ec2-delete-snapshot
-					</td><td align="left">
-						DeleteSnapshot
-					</td><td align="left">
-						deleteSnapshot
-					</td></tr><tr><td align="left">
-						ec2-describe-snapshots
-					</td><td align="left">
-						DescribeSnapshots
-					</td><td align="left">
-						listSnapshots
-					</td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><h6>Table 10.11. Volumes API Mapping</h6><div class="table-contents"><table summary="Volumes API Mapping" border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><thead><tr><th align="left">
-						EC2 command
-					</th><th align="left">
-						SOAP call
-					</th><th align="left">
-						CloudStack API call
-					</th></tr></thead><tbody><tr><td align="left">
-						ec2-attach-volume
-					</td><td align="left">
-						AttachVolume
-					</td><td align="left">
-						attachVolume
-					</td></tr><tr><td align="left">
-						ec2-create-volume
-					</td><td align="left">
-						CreateVolume
-					</td><td align="left">
-						createVolume
-					</td></tr><tr><td align="left">
-						ec2-delete-volume
-					</td><td align="left">
-						DeleteVolume
-					</td><td align="left">
-						deleteVolume
-					</td></tr><tr><td align="left">
-						ec2-describe-volume
-					</td><td align="left">
-						DescribeVolume
-					</td><td align="left">
-						listVolumes
-					</td></tr><tr><td align="left">
-						ec2-detach-volume
-					</td><td align="left">
-						DetachVolume
-					</td><td align="left">
-						detachVolume
-					</td></tr></tbody></table></div></div><br class="table-break" /></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-timeouts.html"><strong>Prev</strong>10.5. Using Timeouts to Ensure AWS API Command Co...</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="networks.html"><strong>Next</strong>Chapter 11. Managing Networks and Traffic</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/aws-ec2-timeouts.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/aws-ec2-timeouts.html b/docs/tmp/en-US/html/aws-ec2-timeouts.html
deleted file mode 100644
index 7527498..0000000
--- a/docs/tmp/en-US/html/aws-ec2-timeouts.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.5. Using Timeouts to Ensure AWS API Command Completion</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-user-setup.html" title="10.4. AWS API User Setup Steps" /><link rel="next" href="aws-ec2-supported-commands.html" title="10.6. Supported AWS API Calls" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/imag
 e_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-user-setup.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-supported-commands.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-timeouts" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-timeouts">10.5. Using Timeouts to Ensure AWS API Command Completion</h2></div></div></div><div class="para">
-		The Amazon EC2 command-line tools have a default connection timeout. When used with CloudStack, a longer timeout might be needed for some commands. If you find that commands are not completing due to timeouts, you can gain more time for commands to finish by overriding the default timeouts on individual commands. You can add the following optional command-line parameters to any CloudStack-supported EC2 command:
-	</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="50%" /><col align="left" class="c2" width="50%" /></colgroup><tbody><tr><td align="left">
-						
-<pre class="programlisting">--connection-timeout <em class="replaceable"><code>TIMEOUT</code></em></pre>
-					</td><td align="left">
-						Specifies a connection timeout (in seconds). Example: 
-<pre class="programlisting">--connection-timeout 30</pre>
-
-					</td></tr><tr><td align="left">
-						
-<pre class="programlisting">--request-timeout <em class="replaceable"><code>TIMEOUT</code></em></pre>
-					</td><td align="left">
-						Specifies a request timeout (in seconds). Example: 
-<pre class="programlisting">--request-timeout 45</pre>
-
-					</td></tr></tbody></table></div><div class="para">
-		Example:
-	</div><pre class="programlisting">ec2-run-instances 2 –z us-test1 –n 1-3 --connection-timeout 120 --request-timeout 120</pre></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-user-setup.html"><strong>Prev</strong>10.4. AWS API User Setup Steps</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-supported-commands.html"><strong>Next</strong>10.6. Supported AWS API Calls</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/aws-ec2-user-setup.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/aws-ec2-user-setup.html b/docs/tmp/en-US/html/aws-ec2-user-setup.html
deleted file mode 100644
index 6ce0d4f..0000000
--- a/docs/tmp/en-US/html/aws-ec2-user-setup.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.4. AWS API User Setup Steps</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="aws-interface-compatibility.html" title="Chapter 10. Amazon Web Service Interface Compatibility" /><link rel="prev" href="aws-ec2-configuration.html" title="10.3. Enabling the AWS API Compatible Interface" /><link rel="next" href="aws-ec2-timeouts.html" title="10.5. Using Timeouts to Ensure AWS API Command Completion" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/
 images/image_left.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-configuration.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-timeouts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="aws-ec2-user-setup" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="aws-ec2-user-setup">10.4. AWS API User Setup Steps</h2></div></div></div><div class="para">
-		In general, users need not be aware that they are using a translation service provided by CloudStack. They need only send AWS API calls to CloudStack's endpoint, and it will translate the calls to the native API. Users of the Amazon EC2 compatible interface will be able to keep their existing EC2 tools and scripts and use them with their CloudStack deployment, by specifying the endpoint of the management server and using the proper user credentials. In order to do this, each user must perform the following configuration steps:
-	</div><div class="para">
-		<div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					Generate user credentials and register with the service.
-				</div></li><li class="listitem"><div class="para">
-					Set up the environment variables for the EC2 command-line tools.
-				</div></li><li class="listitem"><div class="para">
-					For SOAP access, use the endpoint http://<em class="replaceable"><code>CloudStack-management-server</code></em>:8080/awsapi. The <em class="replaceable"><code>CloudStack-management-server</code></em> can be specified by a fully-qualified domain name or IP address.
-				</div></li></ul></div>
-
-	</div><div class="section" id="aws-ec2-user-registration"><div class="titlepage"><div><div><h3 class="title" id="aws-ec2-user-registration">10.4.1. AWS API User Registration</h3></div></div></div><div class="para">
-			Each user must perform a one-time registration. The user follows these steps:
-		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-					Obtain the following by looking in the CloudStack UI, using the API, or asking the cloud administrator:
-				</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-							The CloudStack server's publicly available DNS name or IP address
-						</div></li><li class="listitem"><div class="para">
-							The user account's API key and Secret key
-						</div></li></ul></div></li><li class="listitem"><div class="para">
-					Generate a private key and a self-signed X.509 certificate. The user substitutes their own desired storage location for /path/to/… below.
-				</div><div class="para">
-					
-<pre class="programlisting">$ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /path/to/private_key.pem -out /path/to/cert.pem</pre>
-
-				</div></li><li class="listitem"><div class="para">
-					Register the mapping from the X.509 certificate to the API/Secret keys. Download the following script from http://download.cloud.com/releases/3.0.3/cloudstack-aws-api-register and run it. Substitute the values that were obtained in step 1 in the URL below.
-				</div><div class="para">
-					
-<pre class="programlisting">$ cloudstack-aws-api-register --apikey=<em class="replaceable"><code>User’s CloudStack API key</code></em> --secretkey=<em class="replaceable"><code>User’s CloudStack Secret key</code></em> --cert=<em class="replaceable"><code>/path/to/cert.pem</code></em> --url=http://<em class="replaceable"><code>CloudStack.server</code></em>:8080/awsapi</pre>
-
-				</div></li></ol></div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-				A user with an existing AWS certificate could choose to use the same certificate with CloudStack, but the public key would be uploaded to the CloudStack management server database.
-			</div></div></div></div><div class="section" id="aws-api-tools-setup"><div class="titlepage"><div><div><h3 class="title" id="aws-api-tools-setup">10.4.2. AWS API Command-Line Tools Setup</h3></div></div></div><div class="para">
-			To use the EC2 command-line tools, the user must perform these steps:
-		</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-					Be sure you have the right version of EC2 Tools. The supported version is available at <a href="http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip">http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip</a>.
-				</div></li><li class="listitem"><div class="para">
-					Set up the environment variables that will direct the tools to the server. As a best practice, you may wish to place these commands in a script that may be sourced before using the AWS API translation feature.
-				</div><pre class="programlisting">$ export EC2_CERT=/path/to/cert.pem
-$ export EC2_PRIVATE_KEY=/path/to/private_key.pem
-$ export EC2_URL=http://<em class="replaceable"><code>CloudStack.server</code></em>:8080/awsapi
-$ export EC2_HOME=/path/to/EC2_tools_directory</pre></li></ol></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="aws-ec2-configuration.html"><strong>Prev</strong>10.3. Enabling the AWS API Compatible Interface</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-timeouts.html"><strong>Next</strong>10.5. Using Timeouts to Ensure AWS API Command Co...</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/aws-interface-compatibility.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/aws-interface-compatibility.html b/docs/tmp/en-US/html/aws-interface-compatibility.html
deleted file mode 100644
index 4b2c57d..0000000
--- a/docs/tmp/en-US/html/aws-interface-compatibility.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 10. Amazon Web Service Interface Compatibility</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="index.html" title="CloudStack Installation Guide" /><link rel="prev" href="multi_site_deployment.html" title="9.5. Multi-Site Deployment" /><link rel="next" href="aws-ec2-introduction.html" title="10.1. Amazon Web Services EC2 Compatible Interface" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a>
 <a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="multi_site_deployment.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-introduction.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="aws-interface-compatibility" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 10. Amazon Web Service Interface Compatibility</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="aws-ec2-introduction.html">10.1. Amazon Web Services EC2 Compatible Interface</a></span></dt><dt><span class="section"><a href="aws-ec2-requirements.html">10.2. System Requirements</a></span></dt><dt><span class="section"><a href="aws-ec2-configuration.html">10.3. Enabling the AWS API Compatible Interface</a></span></dt><dt><span class="section"><a href="aws-ec2-user
 -setup.html">10.4. AWS API User Setup Steps</a></span></dt><dd><dl><dt><span class="section"><a href="aws-ec2-user-setup.html#aws-ec2-user-registration">10.4.1. AWS API User Registration</a></span></dt><dt><span class="section"><a href="aws-ec2-user-setup.html#aws-api-tools-setup">10.4.2. AWS API Command-Line Tools Setup</a></span></dt></dl></dd><dt><span class="section"><a href="aws-ec2-timeouts.html">10.5. Using Timeouts to Ensure AWS API Command Completion</a></span></dt><dt><span class="section"><a href="aws-ec2-supported-commands.html">10.6. Supported AWS API Calls</a></span></dt></dl></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="multi_site_deployment.html"><strong>Prev</strong>9.5. Multi-Site Deployment</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="aws-ec2-introduction.html"><strong>Next</strong>1
 0.1. Amazon Web Services EC2 Compatible Interface</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/basic-zone-physical-network-configuration.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/basic-zone-physical-network-configuration.html b/docs/tmp/en-US/html/basic-zone-physical-network-configuration.html
deleted file mode 100644
index a94451b..0000000
--- a/docs/tmp/en-US/html/basic-zone-physical-network-configuration.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>15.4. Basic Zone Physical Network Configuration</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="networks.html" title="Chapter 15. Managing Networks and Traffic" /><link rel="prev" href="networking-in-a-zone.html" title="15.3. Networking in a Zone" /><link rel="next" href="advanced-zone-physical-network-configuration.html" title="15.5. Advanced Zone Physical Network Configuration" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.pn
 g" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="networking-in-a-zone.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="advanced-zone-physical-network-configuration.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="basic-zone-physical-network-configuration" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="basic-zone-physical-network-configuration">15.4. Basic Zone Physical Network Configuration</h2></div></div></div><div class="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.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="networking-in-a-zone.html"><strong>Prev</strong>15.3. Networking in a Zone</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="advanced-zone-physical-network-configuration.html"><strong>Next</strong>15.5. Advanced Zone Physical Network Configuration</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/best-practices-templates.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/best-practices-templates.html b/docs/tmp/en-US/html/best-practices-templates.html
deleted file mode 100644
index ccc77c3..0000000
--- a/docs/tmp/en-US/html/best-practices-templates.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>12.3. Best Practices for Templates</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="working-with-templates.html" title="Chapter 12. Working with Templates" /><link rel="prev" href="requirements-templates.html" title="12.2. Requirements for Templates" /><link rel="next" href="default-template.html" title="12.4. The Default Template" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href=
 "http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="requirements-templates.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="default-template.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="best-practices-templates" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="best-practices-templates">12.3. Best Practices for Templates</h2></div></div></div><div class="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.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="requirements-templates.html"><strong>Prev</strong>12.2. Requirements for Templates</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="default-template.html"><strong>Next</strong>12.4. The Default Template</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/best-practices-vm.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/best-practices-vm.html b/docs/tmp/en-US/html/best-practices-vm.html
deleted file mode 100644
index d337f2f..0000000
--- a/docs/tmp/en-US/html/best-practices-vm.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.2. Best Practices for Virtual Machines</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="virtual-machines.html" title="Chapter 10. Working With Virtual Machines" /><link rel="prev" href="about-working-with-vms.html" title="10.1. About Working with Virtual Machines" /><link rel="next" href="vm-lifecycle.html" title="10.3. VM Lifecycle" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" 
 href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="about-working-with-vms.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="vm-lifecycle.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="best-practices-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="best-practices-vm">10.2. Best Practices for Virtual Machines</h2></div></div></div><div class="para">
-		The CloudStack 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 CloudStack 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 CloudStack UI to disable allocation of more VMs to the cluster.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="about-working-with-vms.html"><strong>Prev</strong>10.1. About Working with Virtual Machines</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="vm-lifecycle.html"><strong>Next</strong>10.3. VM Lifecycle</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/change-database-config.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/change-database-config.html b/docs/tmp/en-US/html/change-database-config.html
deleted file mode 100644
index 5d692c1..0000000
--- a/docs/tmp/en-US/html/change-database-config.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>18.2. Changing the Database Configuration</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="manage-cloud.html" title="Chapter 18. Managing the Cloud" /><link rel="prev" href="tagging-resources.html" title="18.1. Using Tags to Organize Resources in the Cloud" /><link rel="next" href="admin-alerts.html" title="18.3. Administrator Alerts" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" hr
 ef="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="tagging-resources.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="admin-alerts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="change-database-config" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="change-database-config">18.2. Changing the Database Configuration</h2></div></div></div><div class="para">
-		The CloudStack Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="tagging-resources.html"><strong>Prev</strong>18.1. Using Tags to Organize Resources in the Clo...</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="admin-alerts.html"><strong>Next</strong>18.3. Administrator Alerts</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/change-host-password.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/change-host-password.html b/docs/tmp/en-US/html/change-host-password.html
deleted file mode 100644
index 464515a..0000000
--- a/docs/tmp/en-US/html/change-host-password.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>11.7. Changing Host Password</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="working-with-hosts.html" title="Chapter 11. Working With Hosts" /><link rel="prev" href="maintain-hypervisors-on-hosts.html" title="11.6. Maintaining Hypervisors on Hosts" /><link rel="next" href="host-allocation.html" title="11.8. Host Allocation" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="right" href="http:/
 /docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="maintain-hypervisors-on-hosts.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="host-allocation.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="change-host-password" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="change-host-password">11.7. Changing Host Password</h2></div></div></div><div class="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.
-	</div><div class="para">
-		To change a Node's password:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Identify all hosts in the cluster.
-			</div></li><li class="listitem"><div class="para">
-				Change the password on all hosts in the cluster. Now the password for the host and the password known to CloudStack will not match. Operations on the cluster will fail until the two passwords match.
-			</div></li><li class="listitem"><div class="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:
-			</div><pre class="programlisting">mysql&gt; select id from cloud.host where name like '%h%';</pre></li><li class="listitem"><div class="para">
-				This should return a single ID. Record the set of such IDs for these hosts.
-			</div></li><li class="listitem"><div class="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".
-			</div><pre class="programlisting">mysql&gt; update cloud.host set password='password' where id=5 or id=10 or id=12;</pre></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="maintain-hypervisors-on-hosts.html"><strong>Prev</strong>11.6. Maintaining Hypervisors on Hosts</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="host-allocation.html"><strong>Next</strong>11.8. Host Allocation</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/changing-service-offering-for-vm.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/changing-service-offering-for-vm.html b/docs/tmp/en-US/html/changing-service-offering-for-vm.html
deleted file mode 100644
index 7db07ec..0000000
--- a/docs/tmp/en-US/html/changing-service-offering-for-vm.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.8. Changing the Service Offering for a VM</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="virtual-machines.html" title="Chapter 10. Working With Virtual Machines" /><link rel="prev" href="changing-vm-name-os-group.html" title="10.7. Changing the VM Name, OS, or Group" /><link rel="next" href="manual-live-migration.html" title="10.9. Moving VMs Between Hosts (Manual Live Migration)" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_le
 ft.png" alt="Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="changing-vm-name-os-group.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="manual-live-migration.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="changing-service-offering-for-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="changing-service-offering-for-vm">10.8. Changing the Service Offering for a VM</h2></div></div></div><div class="para">
-		To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as a user or admin.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Instances.
-			</div></li><li class="listitem"><div class="para">
-				Choose the VM that you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click the Stop button to stop the VM 
-				<span class="inlinemediaobject"><img src="./images/stop-instance-icon.png" alt="StopButton.png: button to stop a VM" /></span>
-
-			</div></li><li class="listitem"><div class="para">
-				Click the Change Service button 
-				<span class="inlinemediaobject"><img src="./images/change-service-icon.png" alt="ChangeServiceButton.png: button to change the service of a VM" /></span>
-				. The Change service dialog box is displayed.
-			</div></li><li class="listitem"><div class="para">
-				Select the offering you want.
-			</div></li><li class="listitem"><div class="para">
-				Click OK.
-			</div></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="changing-vm-name-os-group.html"><strong>Prev</strong>10.7. Changing the VM Name, OS, or Group</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="manual-live-migration.html"><strong>Next</strong>10.9. Moving VMs Between Hosts (Manual Live Migra...</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/changing-vm-name-os-group.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/changing-vm-name-os-group.html b/docs/tmp/en-US/html/changing-vm-name-os-group.html
deleted file mode 100644
index 01ee1a5..0000000
--- a/docs/tmp/en-US/html/changing-vm-name-os-group.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>10.7. Changing the VM Name, OS, or Group</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Admin_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Administrator's Guide" /><link rel="up" href="virtual-machines.html" title="Chapter 10. Working With Virtual Machines" /><link rel="prev" href="stopping-and-starting-vms.html" title="10.6. Stopping and Starting VMs" /><link rel="next" href="changing-service-offering-for-vm.html" title="10.8. Changing the Service Offering for a VM" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt=
 "Product Site" /></a><a class="right" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="stopping-and-starting-vms.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="changing-service-offering-for-vm.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="changing-vm-name-os-group" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="changing-vm-name-os-group">10.7. Changing the VM Name, OS, or Group</h2></div></div></div><div class="para">
-		After a VM is created, you can modify the display name, operating system, and the group it belongs to.
-	</div><div class="para">
-		To access a VM through the CloudStack UI:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as a user or admin.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation, click Instances.
-			</div></li><li class="listitem"><div class="para">
-				Select the VM that you want to modify.
-			</div></li><li class="listitem"><div class="para">
-				Click the Stop button to stop the VM 
-				<span class="inlinemediaobject"><img src="./images/stop-instance-icon.png" alt="StopButton.png: button to stop a VM" /></span>
-
-			</div></li><li class="listitem"><div class="para">
-				Click Edit 
-				<span class="inlinemediaobject"><img src="./images/edit-icon.png" alt="StopButton.png: button to edit the properties of a VM" /></span>
-				.
-			</div></li><li class="listitem"><div class="para">
-				Make the desired changes to the following:
-			</div></li><li class="listitem"><div class="para">
-				Display name: Enter a new display name if you want to change the name of the VM.
-			</div></li><li class="listitem"><div class="para">
-				OS Type: Select the desired operating system.
-			</div></li><li class="listitem"><div class="para">
-				Group: Enter the group name for the VM.
-			</div></li><li class="listitem"><div class="para">
-				Click Apply.
-			</div></li></ol></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="stopping-and-starting-vms.html"><strong>Prev</strong>10.6. Stopping and Starting VMs</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="changing-service-offering-for-vm.html"><strong>Next</strong>10.8. Changing the Service Offering for a VM</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/choosing-a-deployment_architecture.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/choosing-a-deployment_architecture.html b/docs/tmp/en-US/html/choosing-a-deployment_architecture.html
deleted file mode 100644
index 6a426ae..0000000
--- a/docs/tmp/en-US/html/choosing-a-deployment_architecture.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 9. Choosing a Deployment Architecture</title><link rel="stylesheet" type="text/css" href="Common_Content/css/default.css" /><link rel="stylesheet" media="print" href="Common_Content/css/print.css" type="text/css" /><meta name="generator" content="publican 2.8" /><meta name="package" content="Apache_CloudStack-Installation_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack Installation Guide" /><link rel="up" href="index.html" title="CloudStack Installation Guide" /><link rel="prev" href="vmware-install.html" title="8.3. VMware vSphere Installation and Configuration" /><link rel="next" href="small_scale_deployment.html" title="9.1. Small-Scale Deployment" /></head><body><p id="title"><a class="left" href="http://cloudstack.org"><img src="Common_Content/images/image_left.png" alt="Product Site" /></a><a class="rig
 ht" href="http://docs.cloudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="vmware-install.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="small_scale_deployment.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="choosing-a-deployment_architecture" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 9. Choosing a Deployment Architecture</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="small_scale_deployment.html">9.1. Small-Scale Deployment</a></span></dt><dt><span class="section"><a href="large_scale_redundant_setup.html">9.2. Large-Scale Redundant Setup</a></span></dt><dt><span class="section"><a href="separate_storage_network.html">9.3. Separate Storage Network</a></span></dt><dt><span class="section"><a href="multi_node_management_server.html">9.4. Multi-Node Man
 agement Server</a></span></dt><dt><span class="section"><a href="multi_site_deployment.html">9.5. Multi-Site Deployment</a></span></dt></dl></div><div class="para">
-		The architecture used in a deployment will vary depending on the size and purpose of the deployment. This section contains examples of deployment architecture, including a small-scale deployment useful for test and trial deployments and a fully-redundant large-scale setup for production deployments.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="vmware-install.html"><strong>Prev</strong>8.3. VMware vSphere Installation and Configuration</a></li><li class="up"><a accesskey="u" href="#"><strong>Up</strong></a></li><li class="home"><a accesskey="h" href="index.html"><strong>Home</strong></a></li><li class="next"><a accesskey="n" href="small_scale_deployment.html"><strong>Next</strong>9.1. Small-Scale Deployment</a></li></ul></body></html>


Mime
View raw message