You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/12/06 09:09:13 UTC

[87/100] [abbrv] [partial] Revised en-US/network-setup.xml to include the correct file.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/whats-new-in-api-3.0.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/whats-new-in-api-3.0.html b/docs/tmp/en-US/html/whats-new-in-api-3.0.html
deleted file mode 100644
index e9819bd..0000000
--- a/docs/tmp/en-US/html/whats-new-in-api-3.0.html
+++ /dev/null
@@ -1,628 +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>3.2. What's New in the API for 3.0</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="whats-new.html" title="Chapter 3. What's New in the API?" /><link rel="prev" href="whats-new-in-api-4.0.html" title="3.1. What's New in the API for 4.0" /><link rel="next" href="api-calls.html" title="Chapter 4. Calling the CloudStack API" /></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="whats-new-in-api-4.0.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="api-calls.html"><strong>Next</strong></a></li></ul><div class="section" id="whats-new-in-api-3.0"><div class="titlepage"><div><div><h2 class="title" id="whats-new-in-api-3.0">3.2. What's New in the API for 3.0</h2></div></div></div><div xml:lang="en-US" class="section" id="enabling-port-8096" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="enabling-port-8096">3.2.1. Enabling Port 8096</h3></div></div></div><div class="para">
-		Port 8096, which allows API calls without authentication, is closed and disabled by default on any fresh 3.0.1 installations. You can enable 8096 (or another port) for this purpose as follows:
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Ensure that the first Management Server is installed and running.
-			</div></li><li class="listitem"><div class="para">
-				Set the global configuration parameter integration.api.port to the desired port.
-			</div></li><li class="listitem"><div class="para">
-				Restart the Management Server.
-			</div></li><li class="listitem"><div class="para">
-				On the Management Server host machine, create an iptables rule allowing access to that port.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="stopped-vm" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="stopped-vm">3.2.2. Stopped VM</h3></div></div></div><div class="para">
-		CloudStack now supports creating a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A VM can now be deployed in two ways: create and start a VM (the default method); or create a VM and leave it in the stopped state.
-	</div><div class="para">
-		A new request parameter, startVM, is introduced in the deployVm API to support the stopped VM feature.
-	</div><div class="para">
-		The possible values are:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				true - The VM starts as a part of the VM deployment.
-			</div></li><li class="listitem"><div class="para">
-				false - The VM is left in the stopped state at the end of the VM deployment.
-			</div></li></ul></div><div class="para">
-		The default value is true.
-	</div></div><div xml:lang="en-US" class="section" id="change-to-behavior-of-list-commands" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="change-to-behavior-of-list-commands">3.2.3. Change to Behavior of List Commands</h3></div></div></div><div class="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.
-	</div><div class="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.
-	</div><div class="para">
-		When accountName and domainId are passed in:
-	</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				The caller sees the resources dedicated to the account specified.
-			</div></li><li class="listitem"><div class="para">
-				If the call is executed by a regular user, the user is authorized to specify only the user's own account and domainId.
-			</div></li><li class="listitem"><div class="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.
-			</div></li></ul></div><div class="para">
-		When projectId is passed in, only resources belonging to that project are listed.
-	</div><div class="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.
-	</div><div class="para">
-		To see all resources the caller is authorized to see, except for Project resources, use the parameter listAll=true.
-	</div><div class="para">
-		To see all Project resources the caller is authorized to see, use the parameter projectId=-1.
-	</div><div class="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:
-	</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="50%" /><col align="left" class="c2" width="50%" /></colgroup><thead><tr><th align="left">
-						<div class="para">
-							listTemplates Flag
-						</div>
-					</th><th align="left">
-						<div class="para">
-							Description
-						</div>
-					</th></tr></thead><tbody><tr><td align="left">
-						<div class="para">
-							featured
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Returns templates that have been marked as featured and public.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							self
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Returns templates that have been registered or created by the calling user.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							selfexecutable
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Same as self, but only returns templates that are ready to be deployed with.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							sharedexecutable
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Ready templates that have been granted to the calling user by another user.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							executable
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Templates that are owned by the calling user, or public templates, that can be used to deploy a new VM.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							community
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Returns templates that have been marked as public but not featured.
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							all
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Returns all templates (only usable by admins).
-						</div>
-					</td></tr></tbody></table></div><div class="para">
-		The CloudStack 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.
-	</div></div><div xml:lang="en-US" class="section" id="removed-API-commands" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="removed-API-commands">3.2.4. Removed API commands</h3></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				createConfiguration (Adds configuration value)
-			</div></li><li class="listitem"><div class="para">
-				configureSimulator (Configures simulator)
-			</div></li></ul></div></div><div xml:lang="en-US" class="section" id="added-API-commands" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="added-API-commands">3.2.5. Added API commands in 3.0</h3></div></div></div><div class="section" id="added-api-commands-3.0.2"><div class="titlepage"><div><div><h4 class="title" id="added-api-commands-3.0.2">3.2.5.1. Added in 3.0.2</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					changeServiceForSystemVm
-				</div><div class="para">
-					Changes the service offering for a system VM (console proxy or secondary storage). The system VM must be in a "Stopped" state for this command to take effect.
-				</div></li></ul></div></div><div class="section" id="added-api-commands-3.0.1"><div class="titlepage"><div><div><h4 class="title" id="added-api-commands-3.0.1">3.2.5.2. Added in 3.0.1</h4></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-					changeServiceForSystemVm
-				</div><div class="para">
-					Changes the service offering for a system VM (console proxy or secondary storage). The system VM must be in a "Stopped" state for this command to take effect.
-				</div></li></ul></div></div><div class="section" id="added-api-commands-3.0.0"><div class="titlepage"><div><div><h4 class="title" id="added-api-commands-3.0.0">3.2.5.3. Added in 3.0.0</h4></div></div></div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="33%" /><col align="left" class="c2" width="33%" /><col align="left" class="c3" width="33%" /></colgroup><tbody><tr><td align="left">
-							<div class="para">
-								assignVirtualMachine (Move a user VM to another user under same domain.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								restoreVirtualMachine (Restore a VM to original template or specific snapshot)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								createLBStickinessPolicy (Creates a Load Balancer stickiness policy )
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								deleteLBStickinessPolicy (Deletes a LB stickiness policy.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listLBStickinessPolicies (Lists LBStickiness policies.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								ldapConfig (Configure the LDAP context for this site.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								addSwift (Adds Swift.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listSwifts (List Swift.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								migrateVolume (Migrate volume)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								updateStoragePool (Updates a storage pool.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								authorizeSecurityGroupEgress (Authorizes a particular egress rule for this security group)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								revokeSecurityGroupEgress (Deletes a particular egress rule from this security group)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								createNetworkOffering (Creates a network offering.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteNetworkOffering (Deletes a network offering.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								createProject (Creates a project)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								deleteProject (Deletes a project)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								updateProject (Updates a project)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								activateProject (Activates a project)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								suspendProject (Suspends a project)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listProjects (Lists projects and provides detailed information for listed projects)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								addAccountToProject (Adds acoount to a project)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								deleteAccountFromProject (Deletes account from the project)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listProjectAccounts (Lists project's accounts)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listProjectInvitations (Lists an account's invitations to join projects)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								updateProjectInvitation (Accepts or declines project invitation)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteProjectInvitation (Deletes a project invitation)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								updateHypervisorCapabilities (Updates a hypervisor capabilities.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listHypervisorCapabilities (Lists all hypervisor capabilities.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								createPhysicalNetwork (Creates a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deletePhysicalNetwork (Deletes a Physical Network.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listPhysicalNetworks (Lists physical networks)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								updatePhysicalNetwork (Updates a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listSupportedNetworkServices (Lists all network services provided by CloudStack or for the given Provider.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								addNetworkServiceProvider (Adds a network serviceProvider to a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteNetworkServiceProvider (Deletes a Network Service Provider.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listNetworkServiceProviders (Lists network serviceproviders for a given physical network.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								updateNetworkServiceProvider (Updates a network serviceProvider of a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								addTrafficType (Adds traffic type to a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteTrafficType (Deletes traffic type of a physical network)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listTrafficTypes (Lists traffic types of a given physical network.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								updateTrafficType (Updates traffic type of a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listTrafficTypeImplementors (Lists implementors of implementor of a network traffic type or implementors of all network traffic types)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								createStorageNetworkIpRange (Creates a Storage network IP range.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteStorageNetworkIpRange (Deletes a storage network IP Range.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listStorageNetworkIpRange (List a storage network IP range.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								updateStorageNetworkIpRange (Update a Storage network IP range, only allowed when no IPs in this range have been allocated.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listUsageTypes (List Usage Types)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								addF5LoadBalancer (Adds a F5 BigIP load balancer device)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								configureF5LoadBalancer (configures a F5 load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteF5LoadBalancer ( delete a F5 load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listF5LoadBalancers (lists F5 load balancer devices)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listF5LoadBalancerNetworks (lists network that are using a F5 load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								addSrxFirewall (Adds a SRX firewall device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								deleteSrxFirewall ( delete a SRX firewall device)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listSrxFirewalls (lists SRX firewall devices in a physical network)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listSrxFirewallNetworks (lists network that are using SRX firewall device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								addNetscalerLoadBalancer (Adds a netscaler load balancer device)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								deleteNetscalerLoadBalancer ( delete a netscaler load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								configureNetscalerLoadBalancer (configures a netscaler load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								listNetscalerLoadBalancers (lists netscaler load balancer devices)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listNetscalerLoadBalancerNetworks (lists network that are using a netscaler load balancer device)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								createVirtualRouterElement (Create a virtual router element.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-								configureVirtualRouterElement (Configures a virtual router element.)
-							</div>
-						</td></tr><tr><td align="left">
-							<div class="para">
-								listVirtualRouterElements (Lists all available virtual router elements.)
-							</div>
-						</td><td align="left">
-							<div class="para">
-							</div>
-						</td><td align="left">
-							<div class="para">
-							</div>
-						</td></tr></tbody></table></div></div></div><div xml:lang="en-US" class="section" id="added-error-codes" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="added-error-codes">3.2.6. Added CloudStack Error Codes</h3></div></div></div><div class="para">
-		You can now find the CloudStack-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 CloudStack 3.0.3 and later versions.
-	</div><div class="informaltable"><table border="1"><colgroup><col align="left" class="c1" width="33%" /><col align="left" class="c2" width="33%" /><col align="left" class="c3" width="33%" /></colgroup><tbody><tr><td align="left">
-						<div class="para">
-							4250 : "com.cloud.utils.exception.CloudRuntimeException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4255 : "com.cloud.utils.exception.ExceptionUtil"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4260 : "com.cloud.utils.exception.ExecutionException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4265 : "com.cloud.utils.exception.HypervisorVersionChangedException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4270 : "com.cloud.utils.exception.RuntimeCloudException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4275 : "com.cloud.exception.CloudException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4280 : "com.cloud.exception.AccountLimitException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4285 : "com.cloud.exception.AgentUnavailableException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4290 : "com.cloud.exception.CloudAuthenticationException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4295 : "com.cloud.exception.CloudExecutionException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4300 : "com.cloud.exception.ConcurrentOperationException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4305 : "com.cloud.exception.ConflictingNetworkSettingsException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4310 : "com.cloud.exception.DiscoveredWithErrorException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4315 : "com.cloud.exception.HAStateException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4320 : "com.cloud.exception.InsufficientAddressCapacityException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4325 : "com.cloud.exception.InsufficientCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4330 : "com.cloud.exception.InsufficientNetworkCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4335 : "com.cloud.exception.InsufficientServerCapacityException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4340 : "com.cloud.exception.InsufficientStorageCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4345 : "com.cloud.exception.InternalErrorException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4350 : "com.cloud.exception.InvalidParameterValueException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4355 : "com.cloud.exception.ManagementServerException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4360 : "com.cloud.exception.NetworkRuleConflictException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4365 : "com.cloud.exception.PermissionDeniedException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4370 : "com.cloud.exception.ResourceAllocationException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4375 : "com.cloud.exception.ResourceInUseException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4380 : "com.cloud.exception.ResourceUnavailableException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4385 : "com.cloud.exception.StorageUnavailableException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4390 : "com.cloud.exception.UnsupportedServiceException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4395 : "com.cloud.exception.VirtualMachineMigrationException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4400 : "com.cloud.exception.AccountLimitException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4405 : "com.cloud.exception.AgentUnavailableException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4410 : "com.cloud.exception.CloudAuthenticationException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4415 : "com.cloud.exception.CloudException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4420 : "com.cloud.exception.CloudExecutionException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4425 : "com.cloud.exception.ConcurrentOperationException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4430 : "com.cloud.exception.ConflictingNetworkSettingsException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4435 : "com.cloud.exception.ConnectionException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4440 : "com.cloud.exception.DiscoveredWithErrorException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4445 : "com.cloud.exception.DiscoveryException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4450 : "com.cloud.exception.HAStateException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4455 : "com.cloud.exception.InsufficientAddressCapacityException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4460 : "com.cloud.exception.InsufficientCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4465 : "com.cloud.exception.InsufficientNetworkCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4470 : "com.cloud.exception.InsufficientServerCapacityException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4475 : "com.cloud.exception.InsufficientStorageCapacityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4480 : "com.cloud.exception.InsufficientVirtualNetworkCapcityException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4485 : "com.cloud.exception.InternalErrorException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4490 : "com.cloud.exception.InvalidParameterValueException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4495 : "com.cloud.exception.ManagementServerException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4500 : "com.cloud.exception.NetworkRuleConflictException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4505 : "com.cloud.exception.PermissionDeniedException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4510 : "com.cloud.exception.ResourceAllocationException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4515 : "com.cloud.exception.ResourceInUseException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4520 : "com.cloud.exception.ResourceUnavailableException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4525 : "com.cloud.exception.StorageUnavailableException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							4530 : "com.cloud.exception.UnsupportedServiceException"
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							4535 : "com.cloud.exception.VirtualMachineMigrationException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-							9999 : "com.cloud.api.ServerApiException"
-						</div>
-					</td><td align="left">
-						<div class="para">
-						</div>
-					</td></tr></tbody></table></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="whats-new-in-api-4.0.html"><strong>Prev</strong>3.1. What's New in the API for 4.0</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="api-calls.html"><strong>Next</strong>Chapter 4. Calling the CloudStack API</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/whats-new-in-api-4.0.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/whats-new-in-api-4.0.html b/docs/tmp/en-US/html/whats-new-in-api-4.0.html
deleted file mode 100644
index 09e4ebd..0000000
--- a/docs/tmp/en-US/html/whats-new-in-api-4.0.html
+++ /dev/null
@@ -1,538 +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>3.1. What's New in the API for 4.0</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="whats-new.html" title="Chapter 3. What's New in the API?" /><link rel="prev" href="whats-new.html" title="Chapter 3. What's New in the API?" /><link rel="next" href="whats-new-in-api-3.0.html" title="3.2. What's New in the API for 3.0" /></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="htt
 p://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="whats-new.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="whats-new-in-api-3.0.html"><strong>Next</strong></a></li></ul><div class="section" id="whats-new-in-api-4.0"><div class="titlepage"><div><div><h2 class="title" id="whats-new-in-api-4.0">3.1. What's New in the API for 4.0</h2></div></div></div><div xml:lang="en-US" class="section" id="changed-apicommands-4.0" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="changed-apicommands-4.0">3.1.1. Changed API Commands in 4.0.0-incubating</h3></div></div></div><div class="informaltable"><table border="1"><colgroup><col width="33%" align="left" class="1" /><col width="67%" align="left" class="2" /></colgroup><thead><tr><th align="left">
-						<div class="para">
-							API Commands
-						</div>
-					</th><th align="left">
-						<div class="para">
-							Description
-						</div>
-					</th></tr></thead><tbody><tr><td align="left">
-						<div class="para">
-							copyTemplate
-						</div>
-						 <div class="para">
-							prepareTemplate
-						</div>
-						 <div class="para">
-							registerTemplate
-						</div>
-						 <div class="para">
-							updateTemplate
-						</div>
-						 <div class="para">
-							createProject
-						</div>
-						 <div class="para">
-							activateProject
-						</div>
-						 <div class="para">
-							suspendProject
-						</div>
-						 <div class="para">
-							updateProject
-						</div>
-						 <div class="para">
-							listProjectAccounts
-						</div>
-						 <div class="para">
-							createVolume
-						</div>
-						 <div class="para">
-							migrateVolume
-						</div>
-						 <div class="para">
-							attachVolume
-						</div>
-						 <div class="para">
-							detachVolume
-						</div>
-						 <div class="para">
-							uploadVolume
-						</div>
-						 <div class="para">
-							createSecurityGroup
-						</div>
-						 <div class="para">
-							registerIso
-						</div>
-						 <div class="para">
-							copyIso
-						</div>
-						 <div class="para">
-							updateIso
-						</div>
-						 <div class="para">
-							createIpForwardingRule
-						</div>
-						 <div class="para">
-							listIpForwardingRules
-						</div>
-						 <div class="para">
-							createLoadBalancerRule
-						</div>
-						 <div class="para">
-							updateLoadBalancerRule
-						</div>
-						 <div class="para">
-							createSnapshot
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have a single new response parameter, and no other changes.
-						</div>
-						 <div class="para">
-							New response parameter: tags(*)
-						</div>
-						 <div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-								Many other commands also have the new tags(*) parameter in addition to other changes; those commands are listed separately.
-							</div></div></div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							rebootVirtualMachine
-						</div>
-						 <div class="para">
-							attachIso
-						</div>
-						 <div class="para">
-							detachIso
-						</div>
-						 <div class="para">
-							listLoadBalancerRuleInstances
-						</div>
-						 <div class="para">
-							resetPasswordForVirtualMachine
-						</div>
-						 <div class="para">
-							changeServiceForVirtualMachine
-						</div>
-						 <div class="para">
-							recoverVirtualMachine
-						</div>
-						 <div class="para">
-							startVirtualMachine
-						</div>
-						 <div class="para">
-							migrateVirtualMachine
-						</div>
-						 <div class="para">
-							deployVirtualMachine
-						</div>
-						 <div class="para">
-							assignVirtualMachine
-						</div>
-						 <div class="para">
-							updateVirtualMachine
-						</div>
-						 <div class="para">
-							restoreVirtualMachine
-						</div>
-						 <div class="para">
-							stopVirtualMachine
-						</div>
-						 <div class="para">
-							destroyVirtualMachine
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have two new response parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New response parameters: keypair, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listSecurityGroups
-						</div>
-						 <div class="para">
-							listFirewallRules
-						</div>
-						 <div class="para">
-							listPortForwardingRules
-						</div>
-						 <div class="para">
-							listSnapshots
-						</div>
-						 <div class="para">
-							listIsos
-						</div>
-						 <div class="para">
-							listProjects
-						</div>
-						 <div class="para">
-							listTemplates
-						</div>
-						 <div class="para">
-							listLoadBalancerRules
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have the following new parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New request parameter: tags (optional)
-						</div>
-						 <div class="para">
-							New response parameter: tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listF5LoadBalancerNetworks
-						</div>
-						 <div class="para">
-							listNetscalerLoadBalancerNetworks
-						</div>
-						 <div class="para">
-							listSrxFirewallNetworks
-						</div>
-						 <div class="para">
-							updateNetwork
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have three new response parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New response parameters: canusefordeploy, vpcid, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							createZone
-						</div>
-						 <div class="para">
-							updateZone
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have the following new parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New request parameter: localstorageenabled (optional)
-						</div>
-						 <div class="para">
-							New response parameter: localstorageenabled
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listZones
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New response parameter: localstorageenabled
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							rebootRouter
-						</div>
-						 <div class="para">
-							changeServiceForRouter
-						</div>
-						 <div class="para">
-							startRouter
-						</div>
-						 <div class="para">
-							destroyRouter
-						</div>
-						 <div class="para">
-							stopRouter
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have two new response parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New response parameters: vpcid, nic(*)
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							updateAccount
-						</div>
-						 <div class="para">
-							disableAccount
-						</div>
-						 <div class="para">
-							listAccounts
-						</div>
-						 <div class="para">
-							markDefaultZoneForAccount
-						</div>
-						 <div class="para">
-							enableAccount
-						</div>
-
-					</td><td align="left">
-						<div class="para">
-							The commands in this list have three new response parameters, and no other changes.
-						</div>
-						 <div class="para">
-							New response parameters: vpcavailable, vpclimit, vpctotal
-						</div>
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listRouters
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: forvpc (optional), vpcid (optional)
-						</div>
-						 <div class="para">
-							New response parameters: vpcid, nic(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listNetworkOfferings
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: forvpc (optional)
-						</div>
-						 <div class="para">
-							New response parameters: forvpc
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listVolumes
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: details (optional), tags (optional)
-						</div>
-						 <div class="para">
-							New response parameters: tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							addTrafficMonitor
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: excludezones (optional), includezones (optional)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							createNetwork
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: vpcid (optional)
-						</div>
-						 <div class="para">
-							New response parameters: canusefordeploy, vpcid, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listPublicIpAddresses
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: tags (optional), vpcid (optional)
-						</div>
-						 <div class="para">
-							New response parameters: vpcid, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listNetworks
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: canusefordeploy (optional), forvpc (optional), tags (optional), vpcid (optional)
-						</div>
-						 <div class="para">
-							New response parameters: canusefordeploy, vpcid, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							restartNetwork
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New response parameters: vpcid, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							enableStaticNat
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameter: networkid (optional)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							createDiskOffering
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameter: storagetype (optional)
-						</div>
-						 <div class="para">
-							New response parameter: storagetype
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listDiskOfferings
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New response parameter: storagetype
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							updateDiskOffering
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New response parameter: storagetype
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							createFirewallRule
-						</div>
-					</td><td align="left">
-						<div class="para">
-							Changed request parameters: ipaddressid (old version - optional, new version - required)
-						</div>
-						 <div class="para">
-							New response parameter: tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							listVirtualMachines
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New request parameters: isoid (optional), tags (optional), templateid (optional)
-						</div>
-						 <div class="para">
-							New response parameters: keypair, tags(*)
-						</div>
-
-					</td></tr><tr><td align="left">
-						<div class="para">
-							updateStorageNetworkIpRange
-						</div>
-					</td><td align="left">
-						<div class="para">
-							New response parameters: id, endip, gateway, netmask, networkid, podid, startip, vlan, zoneid
-						</div>
-
-					</td></tr></tbody></table></div></div><div xml:lang="en-US" class="section" id="added-API-commands-4.0" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="added-API-commands-4.0">3.1.2. Added API Commands in 4.0.0-incubating</h3></div></div></div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-				createCounter (Adds metric counter)
-			</div></li><li class="listitem"><div class="para">
-				deleteCounter (Deletes a counter)
-			</div></li><li class="listitem"><div class="para">
-				listCounters (List the counters)
-			</div></li><li class="listitem"><div class="para">
-				createCondition (Creates a condition)
-			</div></li><li class="listitem"><div class="para">
-				deleteCondition (Removes a condition)
-			</div></li><li class="listitem"><div class="para">
-				listConditions (List Conditions for the specific user)
-			</div></li><li class="listitem"><div class="para">
-				createTags. Add tags to one or more resources. Example: 
-<pre class="programlisting">command=createTags
-&amp;resourceIds=1,10,12
-&amp;resourceType=userVm
-&amp;tags[0].key=region
-&amp;tags[0].value=canada
-&amp;tags[1].key=city
-&amp;tags[1].value=Toronto</pre>
-			</div></li><li class="listitem"><div class="para">
-				deleteTags. Remove tags from one or more resources. Example: 
-<pre class="programlisting">command=deleteTags
-&amp;resourceIds=1,12
-&amp;resourceType=Snapshot
-&amp;tags[0].key=city</pre>
-			</div></li><li class="listitem"><div class="para">
-				listTags (Show currently defined resource tags)
-			</div></li><li class="listitem"><div class="para">
-				createVPC (Creates a VPC)
-			</div></li><li class="listitem"><div class="para">
-				listVPCs (Lists VPCs)
-			</div></li><li class="listitem"><div class="para">
-				deleteVPC (Deletes a VPC)
-			</div></li><li class="listitem"><div class="para">
-				updateVPC (Updates a VPC)
-			</div></li><li class="listitem"><div class="para">
-				restartVPC (Restarts a VPC)
-			</div></li><li class="listitem"><div class="para">
-				createVPCOffering (Creates VPC offering)
-			</div></li><li class="listitem"><div class="para">
-				updateVPCOffering (Updates VPC offering)
-			</div></li><li class="listitem"><div class="para">
-				deleteVPCOffering (Deletes VPC offering)
-			</div></li><li class="listitem"><div class="para">
-				listVPCOfferings (Lists VPC offerings)
-			</div></li><li class="listitem"><div class="para">
-				createPrivateGateway (Creates a private gateway)
-			</div></li><li class="listitem"><div class="para">
-				listPrivateGateways (List private gateways)
-			</div></li><li class="listitem"><div class="para">
-				deletePrivateGateway (Deletes a Private gateway)
-			</div></li><li class="listitem"><div class="para">
-				createNetworkACL (Creates a ACL rule the given network (the network has to belong to VPC))
-			</div></li><li class="listitem"><div class="para">
-				deleteNetworkACL (Deletes a Network ACL)
-			</div></li><li class="listitem"><div class="para">
-				listNetworkACLs (Lists all network ACLs)
-			</div></li><li class="listitem"><div class="para">
-				createStaticRoute (Creates a static route)
-			</div></li><li class="listitem"><div class="para">
-				deleteStaticRoute (Deletes a static route)
-			</div></li><li class="listitem"><div class="para">
-				listStaticRoutes (Lists all static routes)
-			</div></li><li class="listitem"><div class="para">
-				createVpnCustomerGateway (Creates site to site vpn customer gateway)
-			</div></li><li class="listitem"><div class="para">
-				createVpnGateway (Creates site to site vpn local gateway)
-			</div></li><li class="listitem"><div class="para">
-				createVpnConnection (Create site to site vpn connection)
-			</div></li><li class="listitem"><div class="para">
-				deleteVpnCustomerGateway (Delete site to site vpn customer gateway)
-			</div></li><li class="listitem"><div class="para">
-				deleteVpnGateway (Delete site to site vpn gateway)
-			</div></li><li class="listitem"><div class="para">
-				deleteVpnConnection (Delete site to site vpn connection)
-			</div></li><li class="listitem"><div class="para">
-				updateVpnCustomerGateway (Update site to site vpn customer gateway)
-			</div></li><li class="listitem"><div class="para">
-				resetVpnConnection (Reset site to site vpn connection)
-			</div></li><li class="listitem"><div class="para">
-				listVpnCustomerGateways (Lists site to site vpn customer gateways)
-			</div></li><li class="listitem"><div class="para">
-				listVpnGateways (Lists site 2 site vpn gateways)
-			</div></li><li class="listitem"><div class="para">
-				listVpnConnections (Lists site to site vpn connection gateways)
-			</div></li><li class="listitem"><div class="para">
-				enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in CloudStack.)
-			</div></li><li class="listitem"><div class="para">
-				disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in CloudStack.)
-			</div></li><li class="listitem"><div class="para">
-				deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in CloudStack.)
-			</div></li><li class="listitem"><div class="para">
-				listCiscoNexusVSMs (Lists the control VLAN ID, packet VLAN ID, and data VLAN ID, as well as the IP address of the Nexus 1000v dvSwitch.)
-			</div></li></ul></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="whats-new.html"><strong>Prev</strong>Chapter 3. What's New in the API?</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="whats-new-in-api-3.0.html"><strong>Next</strong>3.2. What's New in the API for 3.0</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/whats-new.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/whats-new.html b/docs/tmp/en-US/html/whats-new.html
deleted file mode 100644
index 64ee2cd..0000000
--- a/docs/tmp/en-US/html/whats-new.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 3. What's New in the API?</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-API_Developers_Guide-4.0.0-incubating-en-US-1-" /><link rel="home" href="index.html" title="CloudStack API Developer's Guide" /><link rel="up" href="index.html" title="CloudStack API Developer's Guide" /><link rel="prev" href="getting-started.html" title="2.3. Getting Started" /><link rel="next" href="whats-new-in-api-4.0.html" title="3.1. What's New in the API for 4.0" /></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.clouds
 tack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="getting-started.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="whats-new-in-api-4.0.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="whats-new" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 3. What's New in the API?</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="whats-new-in-api-4.0.html">3.1. What's New in the API for 4.0</a></span></dt><dd><dl><dt><span class="section"><a href="whats-new-in-api-4.0.html#changed-apicommands-4.0">3.1.1. Changed API Commands in 4.0.0-incubating</a></span></dt><dt><span class="section"><a href="whats-new-in-api-4.0.html#added-API-commands-4.0">3.1.2. Added API Commands in 4.0.0-incubating</a></span></dt></dl></dd><dt><span class="section"><a href="whats-new-in-api-3.0.html">3.2
 . What's New in the API for 3.0</a></span></dt><dd><dl><dt><span class="section"><a href="whats-new-in-api-3.0.html#enabling-port-8096">3.2.1. Enabling Port 8096</a></span></dt><dt><span class="section"><a href="whats-new-in-api-3.0.html#stopped-vm">3.2.2. Stopped VM</a></span></dt><dt><span class="section"><a href="whats-new-in-api-3.0.html#change-to-behavior-of-list-commands">3.2.3. Change to Behavior of List Commands</a></span></dt><dt><span class="section"><a href="whats-new-in-api-3.0.html#removed-API-commands">3.2.4. Removed API commands</a></span></dt><dt><span class="section"><a href="whats-new-in-api-3.0.html#added-API-commands">3.2.5. Added API commands in 3.0</a></span></dt><dt><span class="section"><a href="whats-new-in-api-3.0.html#added-error-codes">3.2.6. Added CloudStack Error Codes</a></span></dt></dl></dd></dl></div><div class="para">
-		The following describes any new major features of each CloudStack version as it applies to API usage.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="getting-started.html"><strong>Prev</strong>2.3. Getting Started</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="whats-new-in-api-4.0.html"><strong>Next</strong>3.1. What's New in the API for 4.0</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/who-should-read-installation.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/who-should-read-installation.html b/docs/tmp/en-US/html/who-should-read-installation.html
deleted file mode 100644
index 65dffee..0000000
--- a/docs/tmp/en-US/html/who-should-read-installation.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>4.1. Who Should Read This</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="installation.html" title="Chapter 4. Installation" /><link rel="prev" href="installation.html" title="Chapter 4. Installation" /><link rel="next" href="installation-steps-overview.html" title="4.2. Overview of Installation Steps" /></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="installation.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="installation-steps-overview.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="who-should-read-installation" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="who-should-read-installation">4.1. Who Should Read This</h2></div></div></div><div class="para">
-		For those who have already gone through a design phase and planned a more sophisticated deployment, or those who are ready to start scaling up a trial installation. With the following procedures, you can start using the more powerful features of CloudStack, such as advanced VLAN networking, high availability, additional network elements such as load balancers and firewalls, and support for multiple hypervisors including Citrix XenServer, KVM, and VMware vSphere.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="installation.html"><strong>Prev</strong>Chapter 4. Installation</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="installation-steps-overview.html"><strong>Next</strong>4.2. Overview of Installation Steps</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/work-with-usage.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/work-with-usage.html b/docs/tmp/en-US/html/work-with-usage.html
deleted file mode 100644
index 2331216..0000000
--- a/docs/tmp/en-US/html/work-with-usage.html
+++ /dev/null
@@ -1,9 +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 14. Working with Usage</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="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="working-with-snapshots.html" title="13.5. Working with Snapshots" /><link rel="next" href="configure-usage-server.html" title="14.1. Configuring the Usage Server" /></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.c
 loudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-snapshots.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="configure-usage-server.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="work-with-usage" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 14. Working with Usage</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="configure-usage-server.html">14.1. Configuring the Usage Server</a></span></dt><dt><span class="section"><a href="set-usage-limit.html">14.2. Setting Usage Limits</a></span></dt><dt><span class="section"><a href="globally-configured-limit.html">14.3. Globally Configured Limits</a></span></dt><dt><span class="section"><a href="default-account-resource-limit.html">14.4. Default Account Resource Limits</a></span></dt><dt><span class="sec
 tion"><a href="per-domain-limits.html">14.5. Per-Domain Limits</a></span></dt></dl></div><div class="para">
-		The Usage Server is an optional, separately-installed part of CloudStack that provides aggregated usage records which you can use to create billing integration for CloudStack. The Usage Server works by taking data from the events log and creating summary usage records that you can access using the listUsageRecords API call.
-	</div><div class="para">
-		The usage records show the amount of resources, such as VM run time or template storage space, consumed by guest instances.
-	</div><div class="para">
-		The Usage Server runs at least once per day. It can be configured to run multiple times per day.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-snapshots.html"><strong>Prev</strong>13.5. Working with Snapshots</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="configure-usage-server.html"><strong>Next</strong>14.1. Configuring the Usage Server</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/working-with-hosts.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/working-with-hosts.html b/docs/tmp/en-US/html/working-with-hosts.html
deleted file mode 100644
index 0feebfb..0000000
--- a/docs/tmp/en-US/html/working-with-hosts.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 11. Working With Hosts</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="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="working-with-iso.html" title="10.11. Working with ISOs" /><link rel="next" href="adding-hosts.html" title="11.1. Adding Hosts" /></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_Cont
 ent/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-iso.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="adding-hosts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="working-with-hosts" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 11. Working With Hosts</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="adding-hosts.html">11.1. Adding Hosts</a></span></dt><dt><span class="section"><a href="scheduled-maintenance-maintenance-mode-hosts.html">11.2. Scheduled Maintenance and Maintenance Mode for Hosts</a></span></dt><dt><span class="section"><a href="disable-enable-zones-pods-clusters.html">11.3. Disabling and Enabling Zones, Pods, and Clusters</a></span></dt><dt><span class="section"><a href="removing-hosts.html">11.4. Removing Hosts</a></span></dt><dd><dl><dt><span class="section"><a
  href="removing-hosts.html#removing-xenserver-kvm-hosts">11.4.1. Removing XenServer and KVM Hosts</a></span></dt><dt><span class="section"><a href="removing-hosts.html#removing-vsphere-hosts">11.4.2. Removing vSphere Hosts</a></span></dt></dl></dd><dt><span class="section"><a href="re-install-hosts.html">11.5. Re-Installing Hosts</a></span></dt><dt><span class="section"><a href="maintain-hypervisors-on-hosts.html">11.6. Maintaining Hypervisors on Hosts</a></span></dt><dt><span class="section"><a href="change-host-password.html">11.7. Changing Host Password</a></span></dt><dt><span class="section"><a href="host-allocation.html">11.8. Host Allocation</a></span></dt><dt><span class="section"><a href="vlan-provisioning.html">11.9. VLAN Provisioning</a></span></dt></dl></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-iso.html"><strong>Prev</strong>10.11. Working with ISOs</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="adding-hosts.html"><strong>Next</strong>11.1. Adding Hosts</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/working-with-iso.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/working-with-iso.html b/docs/tmp/en-US/html/working-with-iso.html
deleted file mode 100644
index 675513b..0000000
--- a/docs/tmp/en-US/html/working-with-iso.html
+++ /dev/null
@@ -1,125 +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.11. Working with ISOs</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="deleting-vms.html" title="10.10. Deleting VMs" /><link rel="next" href="working-with-hosts.html" title="Chapter 11. Working With Hosts" /></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.o
 rg"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="deleting-vms.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="working-with-hosts.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="working-with-iso" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="working-with-iso">10.11. Working with ISOs</h2></div></div></div><div class="para">
-		CloudStack supports ISOs and their attachment to guest VMs. An ISO is a read-only file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and mount them on their guest VMs.
-	</div><div class="para">
-		ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is available via HTTP specify an upload URL such as http://my.web.server/filename.iso.
-	</div><div class="para">
-		ISOs may be public or private, like templates.ISOs are not hypervisor-specific. That is, a guest on vSphere can mount the exact same image that a guest on KVM can mount.
-	</div><div class="para">
-		ISO images may be stored in the system and made available with a privacy level similar to templates. ISO images are classified as either bootable or not bootable. A bootable ISO image is one that contains an OS image. CloudStack allows a user to boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. For example, this enables installing PV drivers into Windows. ISO images are not hypervisor-specific.
-	</div><div xml:lang="en-US" class="section" id="add-iso" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="add-iso">10.11.1. Adding an ISO</h3></div></div></div><div class="para">
-		To make additional operating system or other software available for use with guest VMs, you can add an ISO. The ISO is typically thought of as an operating system image, but you can also add ISOs for other types of software, such as desktop applications that you want to be installed as part of a template.
-	</div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				Log in to the CloudStack UI as an administrator or end user.
-			</div></li><li class="listitem"><div class="para">
-				In the left navigation bar, click Templates.
-			</div></li><li class="listitem"><div class="para">
-				In Select View, choose ISOs.
-			</div></li><li class="listitem"><div class="para">
-				Click Add ISO.
-			</div></li><li class="listitem"><div class="para">
-				In the Add ISO screen, provide the following:
-			</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Name</strong></span>: Short name for the ISO image. For example, CentOS 6.2 64-bit.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Description</strong></span>: Display test for the ISO image. For example, CentOS 6.2 64-bit.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>URL</strong></span>: The URL that hosts the ISO image. The Management Server must be able to access this location via HTTP. If needed you can place the ISO image directly on the Management Server
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Zone</strong></span>: Choose the zone where you want the ISO to be available, or All Zones to make it available throughout CloudStack.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Bootable</strong></span>: Whether or not a guest could boot off this ISO image. For example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>OS Type</strong></span>: This helps CloudStack and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following.
-					</div><div class="itemizedlist"><ul><li class="listitem"><div class="para">
-								If the operating system of your desired ISO image is listed, choose it.
-							</div></li><li class="listitem"><div class="para">
-								If the OS Type of the ISO is not listed or if the ISO is not bootable, choose Other.
-							</div></li><li class="listitem"><div class="para">
-								(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV (32-bit) or Other PV (64-bit)
-							</div></li><li class="listitem"><div class="para">
-								(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have an IDE root disk. The PV-enabled types are:
-							</div><div class="informaltable"><table border="1"><colgroup><col width="33%" /><col width="33%" /><col width="33%" /></colgroup><tbody><tr><td align="left">
-												<div class="para">
-													Fedora 13
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Fedora 12
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Fedora 11
-												</div>
-											</td></tr><tr><td align="left">
-												<div class="para">
-													Fedora 10
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Fedora 9
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Other PV
-												</div>
-											</td></tr><tr><td align="left">
-												<div class="para">
-													Debian GNU/Linux
-												</div>
-											</td><td align="left">
-												<div class="para">
-													CentOS 5.3
-												</div>
-											</td><td align="left">
-												<div class="para">
-													CentOS 5.4
-												</div>
-											</td></tr><tr><td align="left">
-												<div class="para">
-													CentOS 5.5
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Red Hat Enterprise Linux 5.3
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Red Hat Enterprise Linux 5.4
-												</div>
-											</td></tr><tr><td align="left">
-												<div class="para">
-													Red Hat Enterprise Linux 5.5
-												</div>
-											</td><td align="left">
-												<div class="para">
-													Red Hat Enterprise Linux 6
-												</div>
-											</td><td align="left">
-											</td></tr></tbody></table></div></li></ul></div><div class="note"><div class="admonition_header"><h2>Note</h2></div><div class="admonition"><div class="para">
-							It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.
-						</div></div></div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Extractable</strong></span>: Choose Yes if the ISO should be available for extraction.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Public</strong></span>: Choose Yes if this ISO should be available to other users.
-					</div></li><li class="listitem"><div class="para">
-						<span class="bold bold"><strong>Featured</strong></span>: Choose Yes if you would like this ISO to be more prominent for users to select. The ISO will appear in the Featured ISOs list. Only an administrator can make an ISO Featured.
-					</div></li></ul></div></li><li class="listitem"><div class="para">
-				Click OK.
-			</div><div class="para">
-				The Management Server will download the ISO. Depending on the size of the ISO, this may take a long time. The ISO status column will display Ready once it has been successfully downloaded into secondary storage. Clicking Refresh updates the download percentage.
-			</div></li><li class="listitem"><div class="para">
-				<span class="bold bold"><strong>Important</strong></span>: Wait for the ISO to finish downloading. If you move on to the next task and try to use the ISO right away, it will appear to fail. The entire ISO must be available before CloudStack can work with it.
-			</div></li></ol></div></div><div xml:lang="en-US" class="section" id="attach-iso-to-vm" lang="en-US"><div class="titlepage"><div><div><h3 class="title" id="attach-iso-to-vm">10.11.2. Attaching an ISO to a VM</h3></div></div></div><div class="orderedlist"><ol><li class="listitem"><div class="para">
-				In the left navigation, click Instances.
-			</div></li><li class="listitem"><div class="para">
-				Choose the virtual machine you want to work with.
-			</div></li><li class="listitem"><div class="para">
-				Click the Attach ISO button 
-				<span class="inlinemediaobject"><img src="./images/iso-icon.png" alt="iso.png: Depicts adding an iso image" /></span>
-			</div></li><li class="listitem"><div class="para">
-				In the Attach ISO dialog box, select the desired ISO.
-			</div></li><li class="listitem"><div class="para">
-				Click OK
-			</div></li></ol></div></div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="deleting-vms.html"><strong>Prev</strong>10.10. Deleting 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="working-with-hosts.html"><strong>Next</strong>Chapter 11. Working With Hosts</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/working-with-snapshots.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/working-with-snapshots.html b/docs/tmp/en-US/html/working-with-snapshots.html
deleted file mode 100644
index 81b8674..0000000
--- a/docs/tmp/en-US/html/working-with-snapshots.html
+++ /dev/null
@@ -1,13 +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>13.5. Working with Snapshots</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="storage.html" title="Chapter 13. Working With Storage" /><link rel="prev" href="working-with-volumes.html" title="13.4. Using Swift for Secondary Storage" /><link rel="next" href="work-with-usage.html" title="Chapter 14. Working with Usage" /></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.c
 loudstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-volumes.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="work-with-usage.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="section" id="working-with-snapshots" lang="en-US"><div class="titlepage"><div><div><h2 class="title" id="working-with-snapshots">13.5. Working with Snapshots</h2></div></div></div><div class="para">
-		(Supported for the following hypervisors: <span class="bold bold"><strong>XenServer</strong></span>, <span class="bold bold"><strong>VMware vSphere</strong></span>, and <span class="bold bold"><strong>KVM</strong></span>)
-	</div><div class="para">
-		CloudStack supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. 
-	</div><div class="para">
-		Snapshots may be taken for volumes, including both root and data disks. The administrator places a limit on the number of stored snapshots per user. Users can create new volumes from the snapshot for recovery of particular files and they can create templates from snapshots to boot from a restored disk.
-	</div><div class="para">
-		Users can create snapshots manually or by setting up automatic recurring snapshot policies. Users can also create disk volumes from snapshots, which may be attached to a VM like any other disk volume. Snapshots of both root disks and data disks are supported. However, CloudStack does not currently support booting a VM from a recovered root disk. A disk recovered from snapshot of a root disk is treated as a regular data disk; the data on recovered disk can be accessed by attaching the disk to a VM.
-	</div><div class="para">
-		A completed snapshot is copied from primary storage to secondary storage, where it is stored until deleted or purged by newer snapshot.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="working-with-volumes.html"><strong>Prev</strong>13.4. Using Swift for Secondary Storage</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="work-with-usage.html"><strong>Next</strong>Chapter 14. Working with Usage</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/working-with-system-vm.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/working-with-system-vm.html b/docs/tmp/en-US/html/working-with-system-vm.html
deleted file mode 100644
index 0b1e9b3..0000000
--- a/docs/tmp/en-US/html/working-with-system-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>Chapter 16. Working with System 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="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="configure-vpc.html" title="15.19. Configuring a Virtual Private Cloud" /><link rel="next" href="system-vm-template.html" title="16.1. The System VM 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="configure-vpc.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="system-vm-template.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="working-with-system-vm" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 16. Working with System Virtual Machines</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="system-vm-template.html">16.1. The System VM Template</a></span></dt><dt><span class="section"><a href="multiple-system-vm-vmware.html">16.2. Multiple System VM Support for VMware</a></span></dt><dt><span class="section"><a href="console-proxy.html">16.3. Console Proxy</a></span></dt><dt><span class="section"><a href="virtual-router.html">16.4. Virtual Router</a></span></dt><dt><span class="section"><a href="s
 econdary-storage-vm.html">16.5. Secondary Storage VM</a></span></dt></dl></div><div class="para">
-		CloudStack uses several types of system virtual machines to perform tasks in the cloud. In general CloudStack manages these system VMs and creates, starts, and stops them as needed based on scale and immediate needs. However, the administrator should be aware of them and their roles to assist in debugging issues.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="configure-vpc.html"><strong>Prev</strong>15.19. Configuring a Virtual Private Cloud</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="system-vm-template.html"><strong>Next</strong>16.1. The System VM Template</a></li></ul></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8e31c7a/docs/tmp/en-US/html/working-with-templates.html
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/html/working-with-templates.html b/docs/tmp/en-US/html/working-with-templates.html
deleted file mode 100644
index 41a61b6..0000000
--- a/docs/tmp/en-US/html/working-with-templates.html
+++ /dev/null
@@ -1,9 +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 12. Working with 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="index.html" title="CloudStack Administrator's Guide" /><link rel="prev" href="vlan-provisioning.html" title="11.9. VLAN Provisioning" /><link rel="next" href="create-templates-overview.html" title="12.1. Creating Templates: Overview" /></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.clou
 dstack.org"><img src="Common_Content/images/image_right.png" alt="Documentation Site" /></a></p><ul class="docnav"><li class="previous"><a accesskey="p" href="vlan-provisioning.html"><strong>Prev</strong></a></li><li class="next"><a accesskey="n" href="create-templates-overview.html"><strong>Next</strong></a></li></ul><div xml:lang="en-US" class="chapter" id="working-with-templates" lang="en-US"><div class="titlepage"><div><div><h2 class="title">Chapter 12. Working with Templates</h2></div></div></div><div class="toc"><dl><dt><span class="section"><a href="create-templates-overview.html">12.1. Creating Templates: Overview</a></span></dt><dt><span class="section"><a href="requirements-templates.html">12.2. Requirements for Templates</a></span></dt><dt><span class="section"><a href="best-practices-templates.html">12.3. Best Practices for Templates</a></span></dt><dt><span class="section"><a href="default-template.html">12.4. The Default Template</a></span></dt><dt><span class="secti
 on"><a href="private-public-template.html">12.5. Private and Public Templates</a></span></dt><dt><span class="section"><a href="create-template-from-existing-vm.html">12.6. Creating a Template from an Existing Virtual Machine</a></span></dt><dt><span class="section"><a href="create-template-from-snapshot.html">12.7. Creating a Template from a Snapshot</a></span></dt><dt><span class="section"><a href="upload-template.html">12.8. Uploading Templates</a></span></dt><dt><span class="section"><a href="export-template.html">12.9. Exporting Templates</a></span></dt><dt><span class="section"><a href="create-windows-template.html">12.10. Creating a Windows Template</a></span></dt><dd><dl><dt><span class="section"><a href="create-windows-template.html#sysprep-windows-server-2008R2">12.10.1. System Preparation for Windows Server 2008 R2</a></span></dt><dt><span class="section"><a href="create-windows-template.html#sysprep-for-windows-server-2003R2">12.10.2. Sysprep for Windows Server 2003 R2</
 a></span></dt></dl></dd><dt><span class="section"><a href="import-ami.html">12.11. Importing Amazon Machine Images</a></span></dt><dt><span class="section"><a href="convert-hyperv-vm-to-template.html">12.12. Converting a Hyper-V VM to a Template</a></span></dt><dt><span class="section"><a href="add-password-management-to-templates.html">12.13. Adding Password Management to Your Templates</a></span></dt><dd><dl><dt><span class="section"><a href="add-password-management-to-templates.html#linux-installation">12.13.1. Linux OS Installation</a></span></dt><dt><span class="section"><a href="add-password-management-to-templates.html#windows-installation">12.13.2. Windows OS Installation</a></span></dt></dl></dd><dt><span class="section"><a href="delete-templates.html">12.14. Deleting Templates</a></span></dt></dl></div><div class="para">
-		A template is a reusable configuration for virtual machines. When users launch VMs, they can choose from a list of templates in CloudStack.
-	</div><div class="para">
-		Specifically, a template is a virtual disk image that includes one of a variety of operating systems, optional additional software such as office applications, and settings such as access control to determine who can use the template. Each template is associated with a particular type of hypervisor, which is specified when the template is added to CloudStack.
-	</div><div class="para">
-		CloudStack ships with a default template. In order to present more choices to users, CloudStack administrators and users can create templates and add them to CloudStack.
-	</div></div><ul class="docnav"><li class="previous"><a accesskey="p" href="vlan-provisioning.html"><strong>Prev</strong>11.9. VLAN Provisioning</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="create-templates-overview.html"><strong>Next</strong>12.1. Creating Templates: Overview</a></li></ul></body></html>