You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/08/11 23:10:17 UTC
[2/11] docs: Fix indentation according to coding convention
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/added-API-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands.xml b/docs/en-US/added-API-commands.xml
index bcd72fb..b63895e 100644
--- a/docs/en-US/added-API-commands.xml
+++ b/docs/en-US/added-API-commands.xml
@@ -23,145 +23,145 @@
under the License.
-->
- <section id="added-API-commands">
- <title>Added API commands</title>
- <para>Added in 3.0.3:</para>
- <itemizedlist>
- <listitem><para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
- <listitem><para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
- <listitem><para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
- <listitem><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.)</para></listitem>
- </itemizedlist>
- <para>Added in 3.0.2:</para>
- <itemizedlist>
- <listitem><para>changeServiceForSystemVm</para>
- <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.</para>
- </listitem>
- </itemizedlist>
- <para>Added in 3.0.1:</para>
- <itemizedlist>
- <listitem><para>changeServiceForSystemVm</para>
- <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.</para>
- </listitem>
- </itemizedlist>
- <para>Added in 3.0.0:</para>
- <informaltable frame="all">
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <colspec colname="c1" />
- <colspec colname="c2" />
- <colspec colname="c3" />
- <tbody>
- <row>
- <entry><para>assignVirtualMachine (Move a user VM to another user under same domain.)</para></entry>
- <entry><para>restoreVirtualMachine (Restore a VM to original template or specific snapshot)</para></entry>
- <entry><para>createLBStickinessPolicy (Creates a Load Balancer stickiness policy )</para></entry>
- </row>
- <row>
- <entry><para>deleteLBStickinessPolicy (Deletes a LB stickiness policy.)</para></entry>
- <entry><para>listLBStickinessPolicies (Lists LBStickiness policies.)</para></entry>
- <entry><para>ldapConfig (Configure the LDAP context for this site.)</para></entry>
- </row>
- <row>
- <entry><para>addSwift (Adds Swift.)</para></entry>
- <entry><para>listSwifts (List Swift.)</para></entry>
- <entry><para>migrateVolume (Migrate volume)</para></entry>
- </row>
- <row>
- <entry><para>updateStoragePool (Updates a storage pool.)</para></entry>
- <entry><para>authorizeSecurityGroupEgress (Authorizes a particular egress rule for this security group)</para></entry>
- <entry><para>revokeSecurityGroupEgress (Deletes a particular egress rule from this security group)</para></entry>
- </row>
- <row>
- <entry><para>createNetworkOffering (Creates a network offering.)</para></entry>
- <entry><para>deleteNetworkOffering (Deletes a network offering.)</para></entry>
- <entry><para>createProject (Creates a project)</para></entry>
- </row>
- <row>
- <entry><para>deleteProject (Deletes a project)</para></entry>
- <entry><para>updateProject (Updates a project)</para></entry>
- <entry><para>activateProject (Activates a project)</para></entry>
- </row>
- <row>
- <entry><para>suspendProject (Suspends a project)</para></entry>
- <entry><para>listProjects (Lists projects and provides detailed information for listed projects)</para></entry>
- <entry><para>addAccountToProject (Adds acoount to a project)</para></entry>
- </row>
- <row>
- <entry><para>deleteAccountFromProject (Deletes account from the project)</para></entry>
- <entry><para>listProjectAccounts (Lists project's accounts)</para></entry>
- <entry><para>listProjectInvitations (Lists an account's invitations to join projects)</para></entry>
- </row>
- <row>
- <entry><para>updateProjectInvitation (Accepts or declines project invitation)</para></entry>
- <entry><para>deleteProjectInvitation (Deletes a project invitation)</para></entry>
- <entry><para>updateHypervisorCapabilities (Updates a hypervisor capabilities.)</para></entry>
- </row>
- <row>
- <entry><para>listHypervisorCapabilities (Lists all hypervisor capabilities.)</para></entry>
- <entry><para>createPhysicalNetwork (Creates a physical network)</para></entry>
- <entry><para>deletePhysicalNetwork (Deletes a Physical Network.)</para></entry>
- </row>
- <row>
- <entry><para>listPhysicalNetworks (Lists physical networks)</para></entry>
- <entry><para>updatePhysicalNetwork (Updates a physical network)</para></entry>
- <entry><para>listSupportedNetworkServices (Lists all network services provided by &PRODUCT; or for the given Provider.)</para></entry>
- </row>
- <row>
- <entry><para>addNetworkServiceProvider (Adds a network serviceProvider to a physical network)</para></entry>
- <entry><para>deleteNetworkServiceProvider (Deletes a Network Service Provider.)</para></entry>
- <entry><para>listNetworkServiceProviders (Lists network serviceproviders for a given physical network.)</para></entry>
- </row>
- <row>
- <entry><para>updateNetworkServiceProvider (Updates a network serviceProvider of a physical network)</para></entry>
- <entry><para>addTrafficType (Adds traffic type to a physical network)</para></entry>
- <entry><para>deleteTrafficType (Deletes traffic type of a physical network)</para></entry>
- </row>
- <row>
- <entry><para>listTrafficTypes (Lists traffic types of a given physical network.)</para></entry>
- <entry><para>updateTrafficType (Updates traffic type of a physical network)</para></entry>
- <entry><para>listTrafficTypeImplementors (Lists implementors of implementor of a network traffic type or implementors of all network traffic types)</para></entry>
- </row>
- <row>
- <entry><para>createStorageNetworkIpRange (Creates a Storage network IP range.)</para></entry>
- <entry><para>deleteStorageNetworkIpRange (Deletes a storage network IP Range.)</para></entry>
- <entry><para>listStorageNetworkIpRange (List a storage network IP range.)</para></entry>
- </row>
- <row>
- <entry><para>updateStorageNetworkIpRange (Update a Storage network IP range, only allowed when no IPs in this range have been allocated.)</para></entry>
- <entry><para>listUsageTypes (List Usage Types)</para></entry>
- <entry><para>addF5LoadBalancer (Adds a F5 BigIP load balancer device)</para></entry>
- </row>
- <row>
- <entry><para>configureF5LoadBalancer (configures a F5 load balancer device)</para></entry>
- <entry><para>deleteF5LoadBalancer ( delete a F5 load balancer device)</para></entry>
- <entry><para>listF5LoadBalancers (lists F5 load balancer devices)</para></entry>
- </row>
- <row>
- <entry><para>listF5LoadBalancerNetworks (lists network that are using a F5 load balancer device)</para></entry>
- <entry><para>addSrxFirewall (Adds a SRX firewall device)</para></entry>
- <entry><para>deleteSrxFirewall ( delete a SRX firewall device)</para></entry>
- </row>
- <row>
- <entry><para>listSrxFirewalls (lists SRX firewall devices in a physical network)</para></entry>
- <entry><para>listSrxFirewallNetworks (lists network that are using SRX firewall device)</para></entry>
- <entry><para>addNetscalerLoadBalancer (Adds a netscaler load balancer device)</para></entry>
- </row>
- <row>
- <entry><para>deleteNetscalerLoadBalancer ( delete a netscaler load balancer device)</para></entry>
- <entry><para>configureNetscalerLoadBalancer (configures a netscaler load balancer device)</para></entry>
- <entry><para>listNetscalerLoadBalancers (lists netscaler load balancer devices)</para></entry>
- </row>
- <row>
- <entry><para>listNetscalerLoadBalancerNetworks (lists network that are using a netscaler load balancer device)</para></entry>
- <entry><para>createVirtualRouterElement (Create a virtual router element.)</para></entry>
- <entry><para>configureVirtualRouterElement (Configures a virtual router element.)</para></entry>
- </row>
- <row>
- <entry><para>listVirtualRouterElements (Lists all available virtual router elements.)</para></entry>
- <entry><para></para></entry>
- <entry><para></para></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
+ <section id="added-API-commands">
+ <title>Added API commands</title>
+ <para>Added in 3.0.3:</para>
+ <itemizedlist>
+ <listitem><para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
+ <listitem><para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
+ <listitem><para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para></listitem>
+ <listitem><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.)</para></listitem>
+ </itemizedlist>
+ <para>Added in 3.0.2:</para>
+ <itemizedlist>
+ <listitem><para>changeServiceForSystemVm</para>
+ <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.</para>
+ </listitem>
+ </itemizedlist>
+ <para>Added in 3.0.1:</para>
+ <itemizedlist>
+ <listitem><para>changeServiceForSystemVm</para>
+ <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.</para>
+ </listitem>
+ </itemizedlist>
+ <para>Added in 3.0.0:</para>
+ <informaltable frame="all">
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <colspec colname="c1" />
+ <colspec colname="c2" />
+ <colspec colname="c3" />
+ <tbody>
+ <row>
+ <entry><para>assignVirtualMachine (Move a user VM to another user under same domain.)</para></entry>
+ <entry><para>restoreVirtualMachine (Restore a VM to original template or specific snapshot)</para></entry>
+ <entry><para>createLBStickinessPolicy (Creates a Load Balancer stickiness policy )</para></entry>
+ </row>
+ <row>
+ <entry><para>deleteLBStickinessPolicy (Deletes a LB stickiness policy.)</para></entry>
+ <entry><para>listLBStickinessPolicies (Lists LBStickiness policies.)</para></entry>
+ <entry><para>ldapConfig (Configure the LDAP context for this site.)</para></entry>
+ </row>
+ <row>
+ <entry><para>addSwift (Adds Swift.)</para></entry>
+ <entry><para>listSwifts (List Swift.)</para></entry>
+ <entry><para>migrateVolume (Migrate volume)</para></entry>
+ </row>
+ <row>
+ <entry><para>updateStoragePool (Updates a storage pool.)</para></entry>
+ <entry><para>authorizeSecurityGroupEgress (Authorizes a particular egress rule for this security group)</para></entry>
+ <entry><para>revokeSecurityGroupEgress (Deletes a particular egress rule from this security group)</para></entry>
+ </row>
+ <row>
+ <entry><para>createNetworkOffering (Creates a network offering.)</para></entry>
+ <entry><para>deleteNetworkOffering (Deletes a network offering.)</para></entry>
+ <entry><para>createProject (Creates a project)</para></entry>
+ </row>
+ <row>
+ <entry><para>deleteProject (Deletes a project)</para></entry>
+ <entry><para>updateProject (Updates a project)</para></entry>
+ <entry><para>activateProject (Activates a project)</para></entry>
+ </row>
+ <row>
+ <entry><para>suspendProject (Suspends a project)</para></entry>
+ <entry><para>listProjects (Lists projects and provides detailed information for listed projects)</para></entry>
+ <entry><para>addAccountToProject (Adds acoount to a project)</para></entry>
+ </row>
+ <row>
+ <entry><para>deleteAccountFromProject (Deletes account from the project)</para></entry>
+ <entry><para>listProjectAccounts (Lists project's accounts)</para></entry>
+ <entry><para>listProjectInvitations (Lists an account's invitations to join projects)</para></entry>
+ </row>
+ <row>
+ <entry><para>updateProjectInvitation (Accepts or declines project invitation)</para></entry>
+ <entry><para>deleteProjectInvitation (Deletes a project invitation)</para></entry>
+ <entry><para>updateHypervisorCapabilities (Updates a hypervisor capabilities.)</para></entry>
+ </row>
+ <row>
+ <entry><para>listHypervisorCapabilities (Lists all hypervisor capabilities.)</para></entry>
+ <entry><para>createPhysicalNetwork (Creates a physical network)</para></entry>
+ <entry><para>deletePhysicalNetwork (Deletes a Physical Network.)</para></entry>
+ </row>
+ <row>
+ <entry><para>listPhysicalNetworks (Lists physical networks)</para></entry>
+ <entry><para>updatePhysicalNetwork (Updates a physical network)</para></entry>
+ <entry><para>listSupportedNetworkServices (Lists all network services provided by &PRODUCT; or for the given Provider.)</para></entry>
+ </row>
+ <row>
+ <entry><para>addNetworkServiceProvider (Adds a network serviceProvider to a physical network)</para></entry>
+ <entry><para>deleteNetworkServiceProvider (Deletes a Network Service Provider.)</para></entry>
+ <entry><para>listNetworkServiceProviders (Lists network serviceproviders for a given physical network.)</para></entry>
+ </row>
+ <row>
+ <entry><para>updateNetworkServiceProvider (Updates a network serviceProvider of a physical network)</para></entry>
+ <entry><para>addTrafficType (Adds traffic type to a physical network)</para></entry>
+ <entry><para>deleteTrafficType (Deletes traffic type of a physical network)</para></entry>
+ </row>
+ <row>
+ <entry><para>listTrafficTypes (Lists traffic types of a given physical network.)</para></entry>
+ <entry><para>updateTrafficType (Updates traffic type of a physical network)</para></entry>
+ <entry><para>listTrafficTypeImplementors (Lists implementors of implementor of a network traffic type or implementors of all network traffic types)</para></entry>
+ </row>
+ <row>
+ <entry><para>createStorageNetworkIpRange (Creates a Storage network IP range.)</para></entry>
+ <entry><para>deleteStorageNetworkIpRange (Deletes a storage network IP Range.)</para></entry>
+ <entry><para>listStorageNetworkIpRange (List a storage network IP range.)</para></entry>
+ </row>
+ <row>
+ <entry><para>updateStorageNetworkIpRange (Update a Storage network IP range, only allowed when no IPs in this range have been allocated.)</para></entry>
+ <entry><para>listUsageTypes (List Usage Types)</para></entry>
+ <entry><para>addF5LoadBalancer (Adds a F5 BigIP load balancer device)</para></entry>
+ </row>
+ <row>
+ <entry><para>configureF5LoadBalancer (configures a F5 load balancer device)</para></entry>
+ <entry><para>deleteF5LoadBalancer ( delete a F5 load balancer device)</para></entry>
+ <entry><para>listF5LoadBalancers (lists F5 load balancer devices)</para></entry>
+ </row>
+ <row>
+ <entry><para>listF5LoadBalancerNetworks (lists network that are using a F5 load balancer device)</para></entry>
+ <entry><para>addSrxFirewall (Adds a SRX firewall device)</para></entry>
+ <entry><para>deleteSrxFirewall ( delete a SRX firewall device)</para></entry>
+ </row>
+ <row>
+ <entry><para>listSrxFirewalls (lists SRX firewall devices in a physical network)</para></entry>
+ <entry><para>listSrxFirewallNetworks (lists network that are using SRX firewall device)</para></entry>
+ <entry><para>addNetscalerLoadBalancer (Adds a netscaler load balancer device)</para></entry>
+ </row>
+ <row>
+ <entry><para>deleteNetscalerLoadBalancer ( delete a netscaler load balancer device)</para></entry>
+ <entry><para>configureNetscalerLoadBalancer (configures a netscaler load balancer device)</para></entry>
+ <entry><para>listNetscalerLoadBalancers (lists netscaler load balancer devices)</para></entry>
+ </row>
+ <row>
+ <entry><para>listNetscalerLoadBalancerNetworks (lists network that are using a netscaler load balancer device)</para></entry>
+ <entry><para>createVirtualRouterElement (Create a virtual router element.)</para></entry>
+ <entry><para>configureVirtualRouterElement (Configures a virtual router element.)</para></entry>
+ </row>
+ <row>
+ <entry><para>listVirtualRouterElements (Lists all available virtual router elements.)</para></entry>
+ <entry><para></para></entry>
+ <entry><para></para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/added-cloudPlatform-error-codes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-cloudPlatform-error-codes.xml b/docs/en-US/added-cloudPlatform-error-codes.xml
index b1be04f..6b1e6a3 100644
--- a/docs/en-US/added-cloudPlatform-error-codes.xml
+++ b/docs/en-US/added-cloudPlatform-error-codes.xml
@@ -23,116 +23,116 @@
-->
<section id="added-cloudPlatform-error-codes">
- <title>Added &PRODUCT; Error Codes</title>
- <para>You can now find the &PRODUCT;-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 &PRODUCT; 3.0.3 and later versions.</para>
- <informaltable frame="all">
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <colspec colname="c1" />
- <colspec colname="c2" />
- <colspec colname="c3" />
- <tbody>
- <row>
- <entry><para>4250 : "com.cloud.utils.exception.CloudRuntimeException"</para></entry>
- <entry><para>4255 : "com.cloud.utils.exception.ExceptionUtil"</para></entry>
- <entry><para>4260 : "com.cloud.utils.exception.ExecutionException"</para></entry>
- </row>
- <row>
- <entry><para>4265 : "com.cloud.utils.exception.HypervisorVersionChangedException"</para></entry>
- <entry><para>4270 : "com.cloud.utils.exception.RuntimeCloudException"</para></entry>
- <entry><para>4275 : "com.cloud.exception.CloudException"</para></entry>
- </row>
- <row>
- <entry><para>4280 : "com.cloud.exception.AccountLimitException"</para></entry>
- <entry><para>4285 : "com.cloud.exception.AgentUnavailableException"</para></entry>
- <entry><para>4290 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
- </row>
- <row>
- <entry><para>4295 : "com.cloud.exception.CloudExecutionException"</para></entry>
- <entry><para>4300 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
- <entry><para>4305 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
- </row>
- <row>
- <entry><para>4310 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
- <entry><para>4315 : "com.cloud.exception.HAStateException"</para></entry>
- <entry><para>4320 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
- </row>
- <row>
- <entry><para>4325 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
- <entry><para>4330 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
- <entry><para>4335 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
- </row>
- <row>
- <entry><para>4340 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
- <entry><para>4345 : "com.cloud.exception.InternalErrorException"</para></entry>
- <entry><para>4350 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
- </row>
- <row>
- <entry><para>4355 : "com.cloud.exception.ManagementServerException"</para></entry>
- <entry><para>4360 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
- <entry><para>4365 : "com.cloud.exception.PermissionDeniedException"</para></entry>
- </row>
- <row>
- <entry><para>4370 : "com.cloud.exception.ResourceAllocationException"</para></entry>
- <entry><para>4375 : "com.cloud.exception.ResourceInUseException"</para></entry>
- <entry><para>4380 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
- </row>
- <row>
- <entry><para>4385 : "com.cloud.exception.StorageUnavailableException"</para></entry>
- <entry><para>4390 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
- <entry><para>4395 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
- </row>
- <row>
- <entry><para>4400 : "com.cloud.exception.AccountLimitException"</para></entry>
- <entry><para>4405 : "com.cloud.exception.AgentUnavailableException"</para></entry>
- <entry><para>4410 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
- </row>
- <row>
- <entry><para>4415 : "com.cloud.exception.CloudException"</para></entry>
- <entry><para>4420 : "com.cloud.exception.CloudExecutionException"</para></entry>
- <entry><para>4425 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
- </row>
- <row>
- <entry><para>4430 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
- <entry><para>4435 : "com.cloud.exception.ConnectionException"</para></entry>
- <entry><para>4440 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
- </row>
- <row>
- <entry><para>4445 : "com.cloud.exception.DiscoveryException"</para></entry>
- <entry><para>4450 : "com.cloud.exception.HAStateException"</para></entry>
- <entry><para>4455 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
- </row>
- <row>
- <entry><para>4460 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
- <entry><para>4465 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
- <entry><para>4470 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
- </row>
- <row>
- <entry><para>4475 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
- <entry><para>4480 : "com.cloud.exception.InsufficientVirtualNetworkCapcityException"</para></entry>
- <entry><para>4485 : "com.cloud.exception.InternalErrorException"</para></entry>
- </row>
- <row>
- <entry><para>4490 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
- <entry><para>4495 : "com.cloud.exception.ManagementServerException"</para></entry>
- <entry><para>4500 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
- </row>
- <row>
- <entry><para>4505 : "com.cloud.exception.PermissionDeniedException"</para></entry>
- <entry><para>4510 : "com.cloud.exception.ResourceAllocationException"</para></entry>
- <entry><para>4515 : "com.cloud.exception.ResourceInUseException"</para></entry>
- </row>
- <row>
- <entry><para>4520 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
- <entry><para>4525 : "com.cloud.exception.StorageUnavailableException"</para></entry>
- <entry><para>4530 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
- </row>
- <row>
- <entry><para>4535 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
- <entry><para>9999 : "com.cloud.api.ServerApiException"</para></entry>
- <entry><para></para></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
+ <title>Added &PRODUCT; Error Codes</title>
+ <para>You can now find the &PRODUCT;-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 &PRODUCT; 3.0.3 and later versions.</para>
+ <informaltable frame="all">
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <colspec colname="c1" />
+ <colspec colname="c2" />
+ <colspec colname="c3" />
+ <tbody>
+ <row>
+ <entry><para>4250 : "com.cloud.utils.exception.CloudRuntimeException"</para></entry>
+ <entry><para>4255 : "com.cloud.utils.exception.ExceptionUtil"</para></entry>
+ <entry><para>4260 : "com.cloud.utils.exception.ExecutionException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4265 : "com.cloud.utils.exception.HypervisorVersionChangedException"</para></entry>
+ <entry><para>4270 : "com.cloud.utils.exception.RuntimeCloudException"</para></entry>
+ <entry><para>4275 : "com.cloud.exception.CloudException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4280 : "com.cloud.exception.AccountLimitException"</para></entry>
+ <entry><para>4285 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+ <entry><para>4290 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4295 : "com.cloud.exception.CloudExecutionException"</para></entry>
+ <entry><para>4300 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+ <entry><para>4305 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4310 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+ <entry><para>4315 : "com.cloud.exception.HAStateException"</para></entry>
+ <entry><para>4320 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4325 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+ <entry><para>4330 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+ <entry><para>4335 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4340 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+ <entry><para>4345 : "com.cloud.exception.InternalErrorException"</para></entry>
+ <entry><para>4350 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4355 : "com.cloud.exception.ManagementServerException"</para></entry>
+ <entry><para>4360 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+ <entry><para>4365 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4370 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+ <entry><para>4375 : "com.cloud.exception.ResourceInUseException"</para></entry>
+ <entry><para>4380 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4385 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+ <entry><para>4390 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+ <entry><para>4395 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4400 : "com.cloud.exception.AccountLimitException"</para></entry>
+ <entry><para>4405 : "com.cloud.exception.AgentUnavailableException"</para></entry>
+ <entry><para>4410 : "com.cloud.exception.CloudAuthenticationException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4415 : "com.cloud.exception.CloudException"</para></entry>
+ <entry><para>4420 : "com.cloud.exception.CloudExecutionException"</para></entry>
+ <entry><para>4425 : "com.cloud.exception.ConcurrentOperationException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4430 : "com.cloud.exception.ConflictingNetworkSettingsException"</para></entry>
+ <entry><para>4435 : "com.cloud.exception.ConnectionException"</para></entry>
+ <entry><para>4440 : "com.cloud.exception.DiscoveredWithErrorException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4445 : "com.cloud.exception.DiscoveryException"</para></entry>
+ <entry><para>4450 : "com.cloud.exception.HAStateException"</para></entry>
+ <entry><para>4455 : "com.cloud.exception.InsufficientAddressCapacityException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4460 : "com.cloud.exception.InsufficientCapacityException"</para></entry>
+ <entry><para>4465 : "com.cloud.exception.InsufficientNetworkCapacityException"</para></entry>
+ <entry><para>4470 : "com.cloud.exception.InsufficientServerCapacityException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4475 : "com.cloud.exception.InsufficientStorageCapacityException"</para></entry>
+ <entry><para>4480 : "com.cloud.exception.InsufficientVirtualNetworkCapcityException"</para></entry>
+ <entry><para>4485 : "com.cloud.exception.InternalErrorException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4490 : "com.cloud.exception.InvalidParameterValueException"</para></entry>
+ <entry><para>4495 : "com.cloud.exception.ManagementServerException"</para></entry>
+ <entry><para>4500 : "com.cloud.exception.NetworkRuleConflictException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4505 : "com.cloud.exception.PermissionDeniedException"</para></entry>
+ <entry><para>4510 : "com.cloud.exception.ResourceAllocationException"</para></entry>
+ <entry><para>4515 : "com.cloud.exception.ResourceInUseException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4520 : "com.cloud.exception.ResourceUnavailableException"</para></entry>
+ <entry><para>4525 : "com.cloud.exception.StorageUnavailableException"</para></entry>
+ <entry><para>4530 : "com.cloud.exception.UnsupportedServiceException"</para></entry>
+ </row>
+ <row>
+ <entry><para>4535 : "com.cloud.exception.VirtualMachineMigrationException"</para></entry>
+ <entry><para>9999 : "com.cloud.api.ServerApiException"</para></entry>
+ <entry><para></para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/adding-IP-addresses-for-the-public-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/adding-IP-addresses-for-the-public-network.xml b/docs/en-US/adding-IP-addresses-for-the-public-network.xml
index 2bc7494..abf4d02 100644
--- a/docs/en-US/adding-IP-addresses-for-the-public-network.xml
+++ b/docs/en-US/adding-IP-addresses-for-the-public-network.xml
@@ -23,23 +23,23 @@
-->
<section id="adding-IP-addresses-for-the-public-network">
- <title>Adding IP Addresses for the Public Network</title>
- <para>These instructions assume you have already logged in to the &PRODUCT; UI.</para>
- <orderedlist>
- <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the desired zone .</para></listitem>
- <listitem><para>Click the Network tab.</para></listitem>
- <listitem><para>In the Public node of the diagram, click Configure.</para></listitem>
- <listitem><para>Click the IP Ranges tab.</para></listitem>
- <listitem><para>Provide the following information:</para>
- <itemizedlist>
- <listitem><para>Gateway. The gateway in use for these IP addresses</para></listitem>
- <listitem><para>Netmask. The netmask associated with this IP range</para></listitem>
- <listitem><para>VLAN. The VLAN that will be used for public traffic</para></listitem>
- <listitem><para>Start IP/End IP. A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
- </itemizedlist>
- </listitem>
- <listitem><para>Click Add.</para></listitem>
- </orderedlist>
-
-
- </section>
+ <title>Adding IP Addresses for the Public Network</title>
+ <para>These instructions assume you have already logged in to the &PRODUCT; UI.</para>
+ <orderedlist>
+ <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the desired zone .</para></listitem>
+ <listitem><para>Click the Network tab.</para></listitem>
+ <listitem><para>In the Public node of the diagram, click Configure.</para></listitem>
+ <listitem><para>Click the IP Ranges tab.</para></listitem>
+ <listitem><para>Provide the following information:</para>
+ <itemizedlist>
+ <listitem><para>Gateway. The gateway in use for these IP addresses</para></listitem>
+ <listitem><para>Netmask. The netmask associated with this IP range</para></listitem>
+ <listitem><para>VLAN. The VLAN that will be used for public traffic</para></listitem>
+ <listitem><para>Start IP/End IP. A range of IP addresses that are assumed to be accessible from the Internet and will be allocated for access to guest networks.</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>Click Add.</para></listitem>
+ </orderedlist>
+
+
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/admin-guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/admin-guide.xml b/docs/en-US/admin-guide.xml
index c10455d..512f7a9 100644
--- a/docs/en-US/admin-guide.xml
+++ b/docs/en-US/admin-guide.xml
@@ -23,7 +23,7 @@
-->
<chapter id="admin-guide">
- <title>Administrator Guide</title>
+ <title>Administrator Guide</title>
<xi:include href="whats-in-this-adminguide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="about-working-with-vms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml
index 6803888..d73bcf8 100644
--- a/docs/en-US/advanced-zone-configuration.xml
+++ b/docs/en-US/advanced-zone-configuration.xml
@@ -23,6 +23,6 @@
-->
<section id="advanced-zone-configuration">
- <title>Advanced Zone Configuration</title>
+ <title>Advanced Zone Configuration</title>
<para>TODO</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/advanced-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-network-traffic-types.xml b/docs/en-US/advanced-zone-network-traffic-types.xml
index caeb08c..9f475cf 100644
--- a/docs/en-US/advanced-zone-network-traffic-types.xml
+++ b/docs/en-US/advanced-zone-network-traffic-types.xml
@@ -23,7 +23,7 @@
-->
<section id="advanced-zone-network-traffic-types">
- <title>Advanced Zone Network Traffic Types</title>
+ <title>Advanced Zone Network Traffic Types</title>
<para>When advanced networking is used, there can be multiple physical networks in the zone. Each physical network can carry one or more traffic types, and you need to let &PRODUCT; know which type of network traffic you want each network to carry. The traffic types in an advanced zone are:</para>
<itemizedlist>
<listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. This network can be isolated or shared. In an isolated guest network, the administrator needs to reserve VLAN ranges to provide isolation for each &PRODUCT; account’s network (potentially a large number of VLANs). In a shared guest network, all guest VMs share a single network.</para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-physical-network-configuration.xml b/docs/en-US/advanced-zone-physical-network-configuration.xml
index 8e1e445..4c44c7d 100644
--- a/docs/en-US/advanced-zone-physical-network-configuration.xml
+++ b/docs/en-US/advanced-zone-physical-network-configuration.xml
@@ -23,6 +23,6 @@
-->
<section id="advanced-zone-physical-network-configuration">
- <title>Advanced Zone Physical Network Configuration</title>
- <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para>
- </section>
+ <title>Advanced Zone Physical Network Configuration</title>
+ <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/alerts.xml b/docs/en-US/alerts.xml
index 65f957b..f903023 100644
--- a/docs/en-US/alerts.xml
+++ b/docs/en-US/alerts.xml
@@ -16,34 +16,34 @@
under the License.
-->
- <section id="alerts">
- <title>Alerts</title>
- <para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
- <programlisting>MEMORY = 0</programlisting>
- <programlisting>CPU = 1</programlisting>
- <programlisting>STORAGE =2</programlisting>
- <programlisting>STORAGE_ALLOCATED = 3</programlisting>
- <programlisting>PUBLIC_IP = 4</programlisting>
- <programlisting>PRIVATE_IP = 5</programlisting>
- <programlisting>HOST = 6</programlisting>
- <programlisting>USERVM = 7</programlisting>
- <programlisting>DOMAIN_ROUTER = 8</programlisting>
- <programlisting>CONSOLE_PROXY = 9</programlisting>
- <programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
- <programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
- <programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
- <programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
- <programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
- <programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
- <programlisting>USERVM_MIGRATE = 16</programlisting>
- <programlisting>VLAN = 17</programlisting>
- <programlisting>SSVM = 18</programlisting>
- <programlisting>USAGE_SERVER_RESULT = 19</programlisting>
- <programlisting>STORAGE_DELETE = 20;</programlisting>
- <programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
- <programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
- <programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
- <programlisting>LOCAL_STORAGE = 24;</programlisting>
- <programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
- </section>
+ <section id="alerts">
+ <title>Alerts</title>
+ <para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
+ <programlisting>MEMORY = 0</programlisting>
+ <programlisting>CPU = 1</programlisting>
+ <programlisting>STORAGE =2</programlisting>
+ <programlisting>STORAGE_ALLOCATED = 3</programlisting>
+ <programlisting>PUBLIC_IP = 4</programlisting>
+ <programlisting>PRIVATE_IP = 5</programlisting>
+ <programlisting>HOST = 6</programlisting>
+ <programlisting>USERVM = 7</programlisting>
+ <programlisting>DOMAIN_ROUTER = 8</programlisting>
+ <programlisting>CONSOLE_PROXY = 9</programlisting>
+ <programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
+ <programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
+ <programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
+ <programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
+ <programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
+ <programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
+ <programlisting>USERVM_MIGRATE = 16</programlisting>
+ <programlisting>VLAN = 17</programlisting>
+ <programlisting>SSVM = 18</programlisting>
+ <programlisting>USAGE_SERVER_RESULT = 19</programlisting>
+ <programlisting>STORAGE_DELETE = 20;</programlisting>
+ <programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
+ <programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
+ <programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
+ <programlisting>LOCAL_STORAGE = 24;</programlisting>
+ <programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/api-reference.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/api-reference.xml b/docs/en-US/api-reference.xml
index 74dcbb8..cab3ada 100644
--- a/docs/en-US/api-reference.xml
+++ b/docs/en-US/api-reference.xml
@@ -16,11 +16,11 @@
under the License.
-->
- <section id="api-reference">
- <title>API Reference Documentation</title>
- <para>2.2 API Reference:</para>
- <para><ulink url="http://download.cloud.com/support/downloads.html/">http://download.cloud.com/support/downloads.html/</ulink></para>
- <para>3.0 API Reference:</para>
- <para><ulink url="http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/">http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/</ulink></para>
- </section>
+ <section id="api-reference">
+ <title>API Reference Documentation</title>
+ <para>2.2 API Reference:</para>
+ <para><ulink url="http://download.cloud.com/support/downloads.html/">http://download.cloud.com/support/downloads.html/</ulink></para>
+ <para>3.0 API Reference:</para>
+ <para><ulink url="http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/">http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/</ulink></para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/appendix-a-time-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/appendix-a-time-zones.xml b/docs/en-US/appendix-a-time-zones.xml
index 83648ca..595e7b5 100644
--- a/docs/en-US/appendix-a-time-zones.xml
+++ b/docs/en-US/appendix-a-time-zones.xml
@@ -23,121 +23,121 @@
-->
<section id="appendix-a-time-zones">
- <title>Appendix A—Time Zones</title>
- <para>The following time zone identifiers are accepted by &PRODUCT;. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table.</para>
- <informaltable>
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <tbody>
- <row>
- <entry><para>Etc/GMT+12</para></entry>
- <entry><para>America/La_Paz</para></entry>
- <entry><para>Asia/Jerusalem</para></entry>
-
- </row>
- <row>
- <entry><para>Etc/GMT+11</para></entry>
- <entry><para>America/Santiago</para></entry>
- <entry><para>Europe/Minsk</para></entry>
-
- </row>
- <row>
- <entry><para>Pacific/Samoa</para></entry>
- <entry><para>America/St_Johns</para></entry>
- <entry><para>Europe/Moscow</para></entry>
- </row>
- <row>
- <entry><para>Pacific/Honolulu</para></entry>
- <entry><para>America/Araguaina</para></entry>
- <entry><para>Africa/Nairobi</para></entry>
- </row>
- <row>
- <entry><para>US/Alaska</para></entry>
- <entry><para>America/Los_Angeles</para></entry>
- <entry><para>Mexico/BajaNorte</para></entry>
- </row>
- <row>
- <entry><para>US/Arizona</para></entry>
- <entry><para>US/Mountain</para></entry>
- <entry><para>America/Chihuahua</para></entry>
-
- </row>
- <row>
- <entry><para>America/Chicago</para></entry>
- <entry><para>America/Costa_Rica</para></entry>
- <entry><para>America/Mexico_City</para></entry>
-
- </row>
- <row>
- <entry><para>Canada/Saskatchewan</para></entry>
- <entry><para>America/Bogota</para></entry>
- <entry><para>America/New_York</para></entry>
- </row>
- <row>
- <entry><para>America/Caracas</para></entry>
- <entry><para>America/Asuncion</para></entry>
- <entry><para>America/Cuiaba</para></entry>
- </row>
- <row>
- <entry><para>America/Halifax</para></entry>
- <entry><para>America/Argentina/Buenos_Aires</para></entry>
- <entry><para>America/Cayenne</para></entry>
- </row>
- <row>
- <entry><para>America/Godthab</para></entry>
- <entry><para>America/Montevideo</para></entry>
- <entry><para>Etc/GMT+2</para></entry>
-
- </row>
- <row>
- <entry><para>Atlantic/Azores</para></entry>
- <entry><para>Atlantic/Cape_Verde</para></entry>
- <entry><para>Africa/Casablanca</para></entry>
-
- </row>
- <row>
- <entry><para>Etc/UTC</para></entry>
- <entry><para>Atlantic/Reykjavik</para></entry>
- <entry><para>Europe/London</para></entry>
- </row>
- <row>
- <entry><para>CET</para></entry>
- <entry><para>Europe/Bucharest</para></entry>
- <entry><para>Africa/Johannesburg</para></entry>
- </row>
- <row>
- <entry><para>Asia/Beirut</para></entry>
- <entry><para>Africa/Cairo</para></entry>
- <entry><para>Asia/Karachi</para></entry>
- </row>
- <row>
- <entry><para>Asia/Kolkata</para></entry>
- <entry><para>Asia/Bangkok</para></entry>
- <entry><para>Asia/Shanghai</para></entry>
- </row>
- <row>
- <entry><para>Asia/Kuala_Lumpur</para></entry>
- <entry><para>Australia/Perth</para></entry>
- <entry><para>Asia/Taipei</para></entry>
-
- </row>
- <row>
- <entry><para>Asia/Tokyo</para></entry>
- <entry><para>Asia/Seoul</para></entry>
- <entry><para>Australia/Adelaide</para></entry>
-
- </row>
- <row>
- <entry><para>Australia/Darwin</para></entry>
- <entry><para>Australia/Brisbane</para></entry>
- <entry><para>Australia/Canberra</para></entry>
- </row>
- <row>
- <entry><para>Pacific/Guam</para></entry>
- <entry><para>Pacific/Auckland</para></entry>
- <entry></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
+ <title>Appendix A—Time Zones</title>
+ <para>The following time zone identifiers are accepted by &PRODUCT;. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table.</para>
+ <informaltable>
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <tbody>
+ <row>
+ <entry><para>Etc/GMT+12</para></entry>
+ <entry><para>America/La_Paz</para></entry>
+ <entry><para>Asia/Jerusalem</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Etc/GMT+11</para></entry>
+ <entry><para>America/Santiago</para></entry>
+ <entry><para>Europe/Minsk</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Pacific/Samoa</para></entry>
+ <entry><para>America/St_Johns</para></entry>
+ <entry><para>Europe/Moscow</para></entry>
+ </row>
+ <row>
+ <entry><para>Pacific/Honolulu</para></entry>
+ <entry><para>America/Araguaina</para></entry>
+ <entry><para>Africa/Nairobi</para></entry>
+ </row>
+ <row>
+ <entry><para>US/Alaska</para></entry>
+ <entry><para>America/Los_Angeles</para></entry>
+ <entry><para>Mexico/BajaNorte</para></entry>
+ </row>
+ <row>
+ <entry><para>US/Arizona</para></entry>
+ <entry><para>US/Mountain</para></entry>
+ <entry><para>America/Chihuahua</para></entry>
+
+ </row>
+ <row>
+ <entry><para>America/Chicago</para></entry>
+ <entry><para>America/Costa_Rica</para></entry>
+ <entry><para>America/Mexico_City</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Canada/Saskatchewan</para></entry>
+ <entry><para>America/Bogota</para></entry>
+ <entry><para>America/New_York</para></entry>
+ </row>
+ <row>
+ <entry><para>America/Caracas</para></entry>
+ <entry><para>America/Asuncion</para></entry>
+ <entry><para>America/Cuiaba</para></entry>
+ </row>
+ <row>
+ <entry><para>America/Halifax</para></entry>
+ <entry><para>America/Argentina/Buenos_Aires</para></entry>
+ <entry><para>America/Cayenne</para></entry>
+ </row>
+ <row>
+ <entry><para>America/Godthab</para></entry>
+ <entry><para>America/Montevideo</para></entry>
+ <entry><para>Etc/GMT+2</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Atlantic/Azores</para></entry>
+ <entry><para>Atlantic/Cape_Verde</para></entry>
+ <entry><para>Africa/Casablanca</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Etc/UTC</para></entry>
+ <entry><para>Atlantic/Reykjavik</para></entry>
+ <entry><para>Europe/London</para></entry>
+ </row>
+ <row>
+ <entry><para>CET</para></entry>
+ <entry><para>Europe/Bucharest</para></entry>
+ <entry><para>Africa/Johannesburg</para></entry>
+ </row>
+ <row>
+ <entry><para>Asia/Beirut</para></entry>
+ <entry><para>Africa/Cairo</para></entry>
+ <entry><para>Asia/Karachi</para></entry>
+ </row>
+ <row>
+ <entry><para>Asia/Kolkata</para></entry>
+ <entry><para>Asia/Bangkok</para></entry>
+ <entry><para>Asia/Shanghai</para></entry>
+ </row>
+ <row>
+ <entry><para>Asia/Kuala_Lumpur</para></entry>
+ <entry><para>Australia/Perth</para></entry>
+ <entry><para>Asia/Taipei</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Asia/Tokyo</para></entry>
+ <entry><para>Asia/Seoul</para></entry>
+ <entry><para>Australia/Adelaide</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Australia/Darwin</para></entry>
+ <entry><para>Australia/Brisbane</para></entry>
+ <entry><para>Australia/Canberra</para></entry>
+ </row>
+ <row>
+ <entry><para>Pacific/Guam</para></entry>
+ <entry><para>Pacific/Auckland</para></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/asynchronous-commands-example.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/asynchronous-commands-example.xml b/docs/en-US/asynchronous-commands-example.xml
index be72997..330f125 100644
--- a/docs/en-US/asynchronous-commands-example.xml
+++ b/docs/en-US/asynchronous-commands-example.xml
@@ -17,90 +17,90 @@
-->
<section id="asynchronous-commands-example">
- <title>Example</title>
- <para>
- The following shows an example of using an asynchronous command. Assume the API command:</para>
- <programlisting>command=deployVirtualMachine&zoneId=1&serviceOfferingId=1&diskOfferingId=1&templateId=1
- </programlisting>
- <para>CloudStack will immediately return a job ID and any other additional data.</para>
- <programlisting>
- <deployvirtualmachineresponse>
- <jobid>1</jobid>
- <id>100</id>
- </deployvirtualmachineresponse>
- </programlisting>
- <para>Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.</para>
- <programlisting>command=queryAsyncJobResult&jobId=1</programlisting>
- <para>Three possible results could come from this query.</para>
- <para>Job is still pending:</para>
- <programlisting>
- <queryasyncjobresult>
- <jobid>1</jobid>
- <jobstatus>0</jobstatus>
- <jobprocstatus>1</jobprocstatus>
- </queryasyncjobresult>
- </programlisting>
- <para>Job has succeeded:</para>
- <programlisting>
- <queryasyncjobresultresponse cloud-stack-version="3.0.1.6">
- <jobid>1</jobid>
- <jobstatus>1</jobstatus>
- <jobprocstatus>0</jobprocstatus>
- <jobresultcode>0</jobresultcode>
- <jobresulttype>object</jobresulttype>
- <jobresult>
- <virtualmachine>
- <id>450</id>
- <name>i-2-450-VM</name>
- <displayname>i-2-450-VM</displayname>
- <account>admin</account>
- <domainid>1</domainid>
- <domain>ROOT</domain>
- <created>2011-03-10T18:20:25-0800</created>
- <state>Running</state>
- <haenable>false</haenable>
- <zoneid>1</zoneid>
- <zonename>San Jose 1</zonename>
- <hostid>2</hostid>
- <hostname>905-13.sjc.lab.vmops.com</hostname>
- <templateid>1</templateid>
- <templatename>CentOS 5.3 64bit LAMP</templatename>
- <templatedisplaytext>CentOS 5.3 64bit LAMP</templatedisplaytext>
- <passwordenabled>false</passwordenabled>
- <serviceofferingid>1</serviceofferingid>
- <serviceofferingname>Small Instance</serviceofferingname>
- <cpunumber>1</cpunumber>
- <cpuspeed>500</cpuspeed>
- <memory>512</memory>
- <guestosid>12</guestosid>
- <rootdeviceid>0</rootdeviceid>
- <rootdevicetype>NetworkFilesystem</rootdevicetype>
- <nic>
- <id>561</id>
- <networkid>205</networkid>
- <netmask>255.255.255.0</netmask>
- <gateway>10.1.1.1</gateway>
- <ipaddress>10.1.1.225</ipaddress>
- <isolationuri>vlan://295</isolationuri>
- <broadcasturi>vlan://295</broadcasturi>
- <traffictype>Guest</traffictype>
- <type>Virtual</type>
- <isdefault>true</isdefault>
- </nic>
- <hypervisor>XenServer</hypervisor>
- </virtualmachine>
- </jobresult>
- </queryasyncjobresultresponse>
- </programlisting>
- <para>Job has failed:</para>
- <programlisting>
- <queryasyncjobresult>
- <jobid>1</jobid>
- <jobstatus>2</jobstatus>
- <jobprocstatus>0</jobprocstatus>
- <jobresultcode>551</jobresultcode>
- <jobresulttype>text</jobresulttype>
- <jobresult>Unable to deploy virtual machine id = 100 due to not enough capacity</jobresult>
- </queryasyncjobresult>
- </programlisting>
- </section>
+ <title>Example</title>
+ <para>
+ The following shows an example of using an asynchronous command. Assume the API command:</para>
+ <programlisting>command=deployVirtualMachine&zoneId=1&serviceOfferingId=1&diskOfferingId=1&templateId=1
+ </programlisting>
+ <para>CloudStack will immediately return a job ID and any other additional data.</para>
+ <programlisting>
+ <deployvirtualmachineresponse>
+ <jobid>1</jobid>
+ <id>100</id>
+ </deployvirtualmachineresponse>
+ </programlisting>
+ <para>Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.</para>
+ <programlisting>command=queryAsyncJobResult&jobId=1</programlisting>
+ <para>Three possible results could come from this query.</para>
+ <para>Job is still pending:</para>
+ <programlisting>
+ <queryasyncjobresult>
+ <jobid>1</jobid>
+ <jobstatus>0</jobstatus>
+ <jobprocstatus>1</jobprocstatus>
+ </queryasyncjobresult>
+ </programlisting>
+ <para>Job has succeeded:</para>
+ <programlisting>
+ <queryasyncjobresultresponse cloud-stack-version="3.0.1.6">
+ <jobid>1</jobid>
+ <jobstatus>1</jobstatus>
+ <jobprocstatus>0</jobprocstatus>
+ <jobresultcode>0</jobresultcode>
+ <jobresulttype>object</jobresulttype>
+ <jobresult>
+ <virtualmachine>
+ <id>450</id>
+ <name>i-2-450-VM</name>
+ <displayname>i-2-450-VM</displayname>
+ <account>admin</account>
+ <domainid>1</domainid>
+ <domain>ROOT</domain>
+ <created>2011-03-10T18:20:25-0800</created>
+ <state>Running</state>
+ <haenable>false</haenable>
+ <zoneid>1</zoneid>
+ <zonename>San Jose 1</zonename>
+ <hostid>2</hostid>
+ <hostname>905-13.sjc.lab.vmops.com</hostname>
+ <templateid>1</templateid>
+ <templatename>CentOS 5.3 64bit LAMP</templatename>
+ <templatedisplaytext>CentOS 5.3 64bit LAMP</templatedisplaytext>
+ <passwordenabled>false</passwordenabled>
+ <serviceofferingid>1</serviceofferingid>
+ <serviceofferingname>Small Instance</serviceofferingname>
+ <cpunumber>1</cpunumber>
+ <cpuspeed>500</cpuspeed>
+ <memory>512</memory>
+ <guestosid>12</guestosid>
+ <rootdeviceid>0</rootdeviceid>
+ <rootdevicetype>NetworkFilesystem</rootdevicetype>
+ <nic>
+ <id>561</id>
+ <networkid>205</networkid>
+ <netmask>255.255.255.0</netmask>
+ <gateway>10.1.1.1</gateway>
+ <ipaddress>10.1.1.225</ipaddress>
+ <isolationuri>vlan://295</isolationuri>
+ <broadcasturi>vlan://295</broadcasturi>
+ <traffictype>Guest</traffictype>
+ <type>Virtual</type>
+ <isdefault>true</isdefault>
+ </nic>
+ <hypervisor>XenServer</hypervisor>
+ </virtualmachine>
+ </jobresult>
+ </queryasyncjobresultresponse>
+ </programlisting>
+ <para>Job has failed:</para>
+ <programlisting>
+ <queryasyncjobresult>
+ <jobid>1</jobid>
+ <jobstatus>2</jobstatus>
+ <jobprocstatus>0</jobprocstatus>
+ <jobresultcode>551</jobresultcode>
+ <jobresulttype>text</jobresulttype>
+ <jobresult>Unable to deploy virtual machine id = 100 due to not enough capacity</jobresult>
+ </queryasyncjobresult>
+ </programlisting>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/asynchronous-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/asynchronous-commands.xml b/docs/en-US/asynchronous-commands.xml
index aab1b5c..4c9b59c 100644
--- a/docs/en-US/asynchronous-commands.xml
+++ b/docs/en-US/asynchronous-commands.xml
@@ -23,16 +23,16 @@
-->
<section id="asynchronous-commands">
- <title>Asynchronous Commands</title>
- <para>Asynchronous commands were introduced in &PRODUCT; 2.x. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume. They differ from synchronous commands by the following:
- </para>
- <itemizedlist>
- <listitem><para>They are identified in the API Reference by an (A).</para></listitem>
- <listitem><para>They will immediately return a job ID to refer to the job that will be responsible in processing the command.</para></listitem>
- <listitem><para>If executed as a "create" resource command, it will return the resource ID as well as the job ID.</para>
- <para>You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.</para>
- </listitem>
- </itemizedlist>
- <xi:include href="job-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="asynchronous-commands-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </section>
+ <title>Asynchronous Commands</title>
+ <para>Asynchronous commands were introduced in &PRODUCT; 2.x. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume. They differ from synchronous commands by the following:
+ </para>
+ <itemizedlist>
+ <listitem><para>They are identified in the API Reference by an (A).</para></listitem>
+ <listitem><para>They will immediately return a job ID to refer to the job that will be responsible in processing the command.</para></listitem>
+ <listitem><para>If executed as a "create" resource command, it will return the resource ID as well as the job ID.</para>
+ <para>You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.</para>
+ </listitem>
+ </itemizedlist>
+ <xi:include href="job-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="asynchronous-commands-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/attach-iso-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attach-iso-to-vm.xml b/docs/en-US/attach-iso-to-vm.xml
index b5cc177..30e5d51 100644
--- a/docs/en-US/attach-iso-to-vm.xml
+++ b/docs/en-US/attach-iso-to-vm.xml
@@ -23,17 +23,17 @@
-->
<section id="attach-iso-to-vm">
- <title>Attaching an ISO to a VM</title>
- <orderedlist>
- <listitem><para>In the left navigation, click Instances.</para></listitem>
- <listitem><para>Choose the virtual machine you want to work with.</para></listitem>
- <listitem><para>Click the Attach ISO button <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/iso-icon.png" />
- </imageobject>
- <textobject><phrase>iso.png: Depicts adding an iso image</phrase></textobject>
- </inlinemediaobject></para></listitem>
- <listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
- <listitem><para>Click OK</para></listitem>
- </orderedlist>
+ <title>Attaching an ISO to a VM</title>
+ <orderedlist>
+ <listitem><para>In the left navigation, click Instances.</para></listitem>
+ <listitem><para>Choose the virtual machine you want to work with.</para></listitem>
+ <listitem><para>Click the Attach ISO button <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/iso-icon.png" />
+ </imageobject>
+ <textobject><phrase>iso.png: Depicts adding an iso image</phrase></textobject>
+ </inlinemediaobject></para></listitem>
+ <listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
+ <listitem><para>Click OK</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attaching-volume.xml b/docs/en-US/attaching-volume.xml
index c65337a..385609b 100644
--- a/docs/en-US/attaching-volume.xml
+++ b/docs/en-US/attaching-volume.xml
@@ -23,21 +23,21 @@
-->
<section id="attaching-volume">
- <title>Attaching a Volume</title>
- <para>You can attach a volume to a guest VM to provide extra disk storage. Attach a volume when you first create a new volume, when you are moving an existing volume from one VM to another, or after you have migrated a volume from one storage pool to another.</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>In the left navigation, click Storage.</para></listitem>
- <listitem><para>In Select View, choose Volumes.</para></listitem>
- <listitem><para>4. Click the volume name in the Volumes list, then click the Attach Disk button<inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/attach-disk-icon.png" />
- </imageobject>
- <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
- </inlinemediaobject>
- </para></listitem>
- <listitem><para>In the Instance popup, choose the VM to which you want to attach the volume. You will only see instances to which you are allowed to attach volumes; for example, a user will see only instances created by that user, but the administrator will have more choices.</para>
- <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para></listitem>
- <listitem><para>When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
- </orderedlist>
- </section>
+ <title>Attaching a Volume</title>
+ <para>You can attach a volume to a guest VM to provide extra disk storage. Attach a volume when you first create a new volume, when you are moving an existing volume from one VM to another, or after you have migrated a volume from one storage pool to another.</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+ <listitem><para>In the left navigation, click Storage.</para></listitem>
+ <listitem><para>In Select View, choose Volumes.</para></listitem>
+ <listitem><para>4. Click the volume name in the Volumes list, then click the Attach Disk button<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/attach-disk-icon.png" />
+ </imageobject>
+ <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+ </inlinemediaobject>
+ </para></listitem>
+ <listitem><para>In the Instance popup, choose the VM to which you want to attach the volume. You will only see instances to which you are allowed to attach volumes; for example, a user will see only instances created by that user, but the administrator will have more choices.</para>
+ <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para></listitem>
+ <listitem><para>When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/automatic-snapshot-creation-retention.xml b/docs/en-US/automatic-snapshot-creation-retention.xml
index cd01314..ee4cf73 100644
--- a/docs/en-US/automatic-snapshot-creation-retention.xml
+++ b/docs/en-US/automatic-snapshot-creation-retention.xml
@@ -23,8 +23,8 @@
-->
<section id="automatic-snapshot-creation-retention">
- <title>Automatic Snapshot Creation and Retention</title>
- <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>, <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold">KVM</emphasis>)</para>
- <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
- <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be retained. Older snapshots that exceed the retention limit are automatically deleted. This user-defined limit must be equal to or lower than the global limit set by the &PRODUCT; administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual snapshots can be created and retained.</para>
- </section>
+ <title>Automatic Snapshot Creation and Retention</title>
+ <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>, <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold">KVM</emphasis>)</para>
+ <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly interval. One snapshot policy can be set up per disk volume. For example, a user can set up a daily snapshot at 02:30.</para>
+ <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be retained. Older snapshots that exceed the retention limit are automatically deleted. This user-defined limit must be equal to or lower than the global limit set by the &PRODUCT; administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual snapshots can be created and retained.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/basic-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml
index bbfd6ec..18afa84 100644
--- a/docs/en-US/basic-zone-configuration.xml
+++ b/docs/en-US/basic-zone-configuration.xml
@@ -23,7 +23,7 @@
-->
<section id="basic-zone-configuration">
- <title>Basic Zone Configuration</title>
+ <title>Basic Zone Configuration</title>
<orderedlist>
<listitem><para>After you select Basic in the Add Zone wizard and click Next, you will be asked to enter the following details. Then click Next.</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/basic-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-network-traffic-types.xml b/docs/en-US/basic-zone-network-traffic-types.xml
index ac835aa..fa3be0f 100644
--- a/docs/en-US/basic-zone-network-traffic-types.xml
+++ b/docs/en-US/basic-zone-network-traffic-types.xml
@@ -23,7 +23,7 @@
-->
<section id="basic-zone-network-traffic-types">
- <title>Basic Zone Network Traffic Types</title>
+ <title>Basic Zone Network Traffic Types</title>
<para>When basic networking is used, there can be only one physical network in the zone. That physical network carries the following traffic types:</para>
<itemizedlist>
<listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod.</para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/basic-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-physical-network-configuration.xml b/docs/en-US/basic-zone-physical-network-configuration.xml
index a9b8f55..83833a7 100644
--- a/docs/en-US/basic-zone-physical-network-configuration.xml
+++ b/docs/en-US/basic-zone-physical-network-configuration.xml
@@ -23,7 +23,7 @@
-->
<section id="basic-zone-physical-network-configuration">
- <title>Basic Zone Physical Network Configuration</title>
- <para>In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to CloudPlatform, you set up the guest network through the Add Zone screens.</para>
-
- </section>
+ <title>Basic Zone Physical Network Configuration</title>
+ <para>In a basic network, configuring the physical network is fairly straightforward. You only need to configure one guest network to carry traffic that is generated by guest VMs. When you first add a zone to CloudPlatform, you set up the guest network through the Add Zone screens.</para>
+
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/best-practices-for-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-for-vms.xml b/docs/en-US/best-practices-for-vms.xml
index 59e2708..a67add4 100644
--- a/docs/en-US/best-practices-for-vms.xml
+++ b/docs/en-US/best-practices-for-vms.xml
@@ -17,7 +17,7 @@
-->
<section id="vm-lifecycle">
- <title>VM Lifecycle</title>
- <para>The CloudPlatform administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudPlatform global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this
number of VMs, use the CloudPlatform UI to disable allocation of more VMs to the cluster..</para>
-
+ <title>VM Lifecycle</title>
+ <para>The CloudPlatform administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudPlatform global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches t
his number of VMs, use the CloudPlatform UI to disable allocation of more VMs to the cluster..</para>
+
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/best-practices-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-primary-storage.xml b/docs/en-US/best-practices-primary-storage.xml
index c02501b..2f639b1 100644
--- a/docs/en-US/best-practices-primary-storage.xml
+++ b/docs/en-US/best-practices-primary-storage.xml
@@ -23,9 +23,9 @@
-->
<section id="best-practices-primary-storage">
- <title>Best Practices for Primary Storage</title>
- <itemizedlist>
- <listitem><para>The speed of primary storage will impact guest performance. If possible, choose smaller, higher RPM drives for primary storage.</para></listitem>
- <listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data</para></listitem>
- </itemizedlist>
- </section>
+ <title>Best Practices for Primary Storage</title>
+ <itemizedlist>
+ <listitem><para>The speed of primary storage will impact guest performance. If possible, choose smaller, higher RPM drives for primary storage.</para></listitem>
+ <listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data</para></listitem>
+ </itemizedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/best-practices-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/best-practices-secondary-storage.xml b/docs/en-US/best-practices-secondary-storage.xml
index 5c08f9d..c2da7d8 100644
--- a/docs/en-US/best-practices-secondary-storage.xml
+++ b/docs/en-US/best-practices-secondary-storage.xml
@@ -23,10 +23,10 @@
-->
<section id="best-practices-secondary-storage">
- <title>Best Practices for Secondary Storage</title>
- <itemizedlist>
- <listitem><para>Each Zone can have one or more secondary storage servers. Multiple secondary storage servers provide increased scalability to the system.</para></listitem>
- <listitem><para>Secondary storage has a high read:write ratio and is expected to consist of larger drives with lower IOPS than primary storage.</para></listitem>
- <listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data.</para></listitem>
- </itemizedlist>
- </section>
+ <title>Best Practices for Secondary Storage</title>
+ <itemizedlist>
+ <listitem><para>Each Zone can have one or more secondary storage servers. Multiple secondary storage servers provide increased scalability to the system.</para></listitem>
+ <listitem><para>Secondary storage has a high read:write ratio and is expected to consist of larger drives with lower IOPS than primary storage.</para></listitem>
+ <listitem><para>Ensure that nothing is stored on the server. Adding the server to CloudPlatform will destroy any existing data.</para></listitem>
+ </itemizedlist>
+ </section>