diff --git a/docs/en-US/dates-in-usage-record.xml b/docs/en-US/dates-in-usage-record.xml
index ff4658734ec..0fe430dba87 100644
--- a/docs/en-US/dates-in-usage-record.xml
+++ b/docs/en-US/dates-in-usage-record.xml
@@ -1,3 +1,21 @@
+
+
Dates in the Usage Record
Usage records include a start date and an end date. These dates define the period of time for which the raw usage number was calculated. If daily aggregation is used, the start date is midnight on the day in question and the end date is 23:59:59 on the day in question (with one exception; see below). A virtual machine could have been deployed at noon on that day, stopped at 6pm on that day, then started up again at 11pm. When usage is calculated on that day, there will be 7 hours of running VM usage (usage type 1) and 12 hours of allocated VM usage (usage type 2). If the same virtual machine runs for the entire next day, there will 24 hours of both running VM usage (type 1) and allocated VM usage (type 2).
diff --git a/docs/en-US/dedicated-ha-hosts.xml b/docs/en-US/dedicated-ha-hosts.xml
index e985142023b..ab50700197a 100644
--- a/docs/en-US/dedicated-ha-hosts.xml
+++ b/docs/en-US/dedicated-ha-hosts.xml
@@ -1,15 +1,34 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Dedicated HA Hosts
(v3.0.3 and greater) One or more hosts can be designated for use only by HA-enabled VMs that are restarting due to a host failure. Setting up a pool of such dedicated HA hosts as the recovery destination for all HA-enabled VMs is useful to:
- Make it easier to determine which VMs have been restarted as part of the CloudPlatform high-availability function. If a VM is running on a dedicated HA host, then it must be an HA-enabled VM whose original host failed. (With one exception: It is possible for an administrator to manually migrate any VM to a dedicated HA host.).
+ Make it easier to determine which VMs have been restarted as part of the &PRODUCT; high-availability function. If a VM is running on a dedicated HA host, then it must be an HA-enabled VM whose original host failed. (With one exception: It is possible for an administrator to manually migrate any VM to a dedicated HA host.).
Keep HA-enabled VMs from restarting on hosts which may be reserved for other purposes.
The dedicated HA option is set through a special host tag when the host is created. To allow the administrator to dedicate hosts to only HA-enabled VMs, set the global configuration variable ha.tag to the desired tag (for example, "ha_host"), and restart the Management Server. Enter the value in the Host Tags field when adding the host(s) that you want to dedicate to HA-enabled VMs.
If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail to restart after a crash.
-
\ No newline at end of file
+
diff --git a/docs/en-US/default-account-resource-limit.xml b/docs/en-US/default-account-resource-limit.xml
index 0ace6348ff2..abc313f46bf 100644
--- a/docs/en-US/default-account-resource-limit.xml
+++ b/docs/en-US/default-account-resource-limit.xml
@@ -1,14 +1,33 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Default Account Resource Limits
You can limit resource use by accounts. The default limits are set using global configuration parameters, and they affect all accounts within a cloud. The relevant parameters are those beginning with max.account (max.account.snapshots, etc.)..
To override a default limit for a particular account, set a per-account resource limit.
- Log in to the CloudPlatform UI.
+ Log in to the &PRODUCT; UI.
In the left navigation tree, click Accounts.
Select the account you want to modify. The current limits are displayed. A value of -1 shows that there is no limit in place
Click the Edit button
@@ -18,5 +37,4 @@
editbutton.png: edits the settings.
-
diff --git a/docs/en-US/default-template.xml b/docs/en-US/default-template.xml
index 4f4e583f991..c4741c964e3 100644
--- a/docs/en-US/default-template.xml
+++ b/docs/en-US/default-template.xml
@@ -1,11 +1,30 @@
-
%BOOK_ENTITIES;
]>
+
+
+
The Default Template
- CloudPlatform includes a CentOS template. This template is downloaded by the Secondary Storage VM after the primary and secondary storage are configured. You can use this template in your production deployment or you can delete it and use custom templates.
+ &PRODUCT; includes a CentOS template. This template is downloaded by the Secondary Storage VM after the primary and secondary storage are configured. You can use this template in your production deployment or you can delete it and use custom templates.
The root password for the default template is "password".
A default template is provided for each of XenServer, KVM, and vSphere. The templates that are downloaded depend on the hypervisor type that is available in your cloud. Each template is approximately 2.5 GB physical size.
The default template includes the standard iptables rules, which will block most access to the template excluding ssh.
diff --git a/docs/en-US/delete-templates.xml b/docs/en-US/delete-templates.xml
index d3f99b930e0..48d8fd11ff8 100644
--- a/docs/en-US/delete-templates.xml
+++ b/docs/en-US/delete-templates.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Deleting Templates
Templates may be deleted. In general, when a template spans multiple Zones, only the copy that is selected for deletion will be deleted; the same template in other Zones will not be deleted. The provided CentOS template is an exception to this. If the provided CentOS template is deleted, it will be deleted from all Zones.
diff --git a/docs/en-US/deleting-vms.xml b/docs/en-US/deleting-vms.xml
index a6cc0db1e07..ab65fef1db9 100644
--- a/docs/en-US/deleting-vms.xml
+++ b/docs/en-US/deleting-vms.xml
@@ -1,14 +1,33 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Deleting VMs
Users can delete their own virtual machines. A running virtual machine will be abruptly stopped before it is deleted. Administrators can delete any virtual machines.
To delete a virtual machine:
- Log in to the CloudPlatform UI as a user or admin.
+ Log in to the &PRODUCT; UI as a user or admin.
In the left navigation, click Instances.
Choose the VM that you want to delete.
Click the Destroy Instance button
@@ -20,4 +39,3 @@
-
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
index 25f082585a5..2d463790af7 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Deployment Architecture Overview
@@ -22,4 +41,4 @@
-
\ No newline at end of file
+
diff --git a/docs/en-US/deployment_architecture_overview.xml b/docs/en-US/deployment_architecture_overview.xml
index 08c10829a8c..34d91d7b60e 100644
--- a/docs/en-US/deployment_architecture_overview.xml
+++ b/docs/en-US/deployment_architecture_overview.xml
@@ -1,17 +1,35 @@
+
+
Deployment Architecture Overview
- A CloudStack installation consists of two parts: the Management Server and the cloud infrastructure that it manages. When you set up and manage a CloudStack cloud, you provision resources such as hosts, storage devices, and IP addresses into the Management Server, and the Management Server manages those resources.
+ A &PRODUCT; installation consists of two parts: the Management Server and the cloud infrastructure that it manages. When you set up and manage a &PRODUCT; cloud, you provision resources such as hosts, storage devices, and IP addresses into the Management Server, and the Management Server manages those resources.
- The minimum installation consists of one machine running the CloudStack Management Server and another machine to act as the cloud infrastructure (in this case, a very simple infrastructure consisting of one host running hypervisor software).
+ The minimum installation consists of one machine running the &PRODUCT; Management Server and another machine to act as the cloud infrastructure (in this case, a very simple infrastructure consisting of one host running hypervisor software).
- basic_deployment.png: Basic two-machine CloudStack deployment
+ basic_deployment.png: Basic two-machine &PRODUCT; deployment
A more full-featured installation consists of a highly-available multi-node Management Server installation and up to thousands of hosts using any of several advanced networking setups. For information about deployment options, see Choosing a Deployment Architecture.
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
index 26c241c0311..6f241d594e6 100644
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.xml
@@ -1,16 +1,35 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Attaching a Volume
This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration
- A volume can be detached from a guest VM and attached to another guest. Both CloudPlatform administrators and users can detach volumes from VMs and move them to other VMs.
+ A volume can be detached from a guest VM and attached to another guest. Both &PRODUCT; administrators and users can detach volumes from VMs and move them to other VMs.
If the two VMs are in different clusters, and the volume is large, it may take several minutes for the volume to be moved to the new VM.
If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.
- Log in to the CloudPlatform UI as a user or admin.
+ Log in to the &PRODUCT; UI as a user or admin.
In the left navigation bar, click Storage, and choose Volumes in Select View. Alternatively, if you know which VM the volume is attached to, you can click Instances, click the VM name, and click View Volumes.
Click the name of the volume you want to detach, then click the Detach Disk button
@@ -22,4 +41,3 @@
To move the volume to another VM, follow the steps in Attaching a Volume .
-
diff --git a/docs/en-US/developer-getting-started.xml b/docs/en-US/developer-getting-started.xml
index adfac34488d..82ef12054df 100644
--- a/docs/en-US/developer-getting-started.xml
+++ b/docs/en-US/developer-getting-started.xml
@@ -1,9 +1,27 @@
+
+
Getting Started
- To get started using the CloudStack API, you should have the following:
+ To get started using the &PRODUCT; API, you should have the following:
- URL of the CloudStack server you wish to integrate with.
+ URL of the &PRODUCT; server you wish to integrate with.
Both the API Key and Secret Key for an account. This should have been generated by the administrator of the cloud instance and given to you.
Familiarity with HTTP GET/POST and query strings.
Knowledge of either XML or JSON.
diff --git a/docs/en-US/developer-guide.xml b/docs/en-US/developer-guide.xml
index 77af46eb430..373ab294851 100644
--- a/docs/en-US/developer-guide.xml
+++ b/docs/en-US/developer-guide.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Using the API
diff --git a/docs/en-US/developer-introduction.xml b/docs/en-US/developer-introduction.xml
index d895253f5b3..f2ab1d4f37a 100644
--- a/docs/en-US/developer-introduction.xml
+++ b/docs/en-US/developer-introduction.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Introduction for Developers
diff --git a/docs/en-US/developer_guide.xml b/docs/en-US/developer_guide.xml
index eb174be52d0..9606bab8a16 100644
--- a/docs/en-US/developer_guide.xml
+++ b/docs/en-US/developer_guide.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Developer Guide
diff --git a/docs/en-US/disable-enable-zones-pods-clusters.xml b/docs/en-US/disable-enable-zones-pods-clusters.xml
index 94bf89e4778..7d52ae7c7a9 100644
--- a/docs/en-US/disable-enable-zones-pods-clusters.xml
+++ b/docs/en-US/disable-enable-zones-pods-clusters.xml
@@ -1,14 +1,33 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Disabling and Enabling Zones, Pods, and Clusters
You can enable or disable a zone, pod, or cluster without permanently removing it from the cloud. This is useful for maintenance or when there are problems that make a portion of the cloud infrastructure unreliable. No new allocations will be made to a disabled zone, pod, or cluster until its state is returned to Enabled. When a zone, pod, or cluster is first added to the cloud, it is Disabled by default.
To disable and enable a zone, pod, or cluster:
- Log in to the CloudPlatform UI as administrator
+ Log in to the &PRODUCT; UI as administrator
In the left navigation bar, click Infrastructure.
In Zones, click View More.
diff --git a/docs/en-US/disk-volume-usage-record-format.xml b/docs/en-US/disk-volume-usage-record-format.xml
index c4b898ec447..72836982251 100644
--- a/docs/en-US/disk-volume-usage-record-format.xml
+++ b/docs/en-US/disk-volume-usage-record-format.xml
@@ -1,3 +1,21 @@
+
+
-
diff --git a/docs/en-US/dns-dhcp.xml b/docs/en-US/dns-dhcp.xml
index dfebbd6f4bd..4d5bf00f907 100644
--- a/docs/en-US/dns-dhcp.xml
+++ b/docs/en-US/dns-dhcp.xml
@@ -1,8 +1,27 @@
-
%BOOK_ENTITIES;
]>
+
+
+
DNS and DHCP
The Virtual Router provides DNS and DHCP services to the guests. It proxies DNS requests to the DNS server configured on the Availability Zone.
diff --git a/docs/en-US/domains.xml b/docs/en-US/domains.xml
index 669b3d3e317..9d19c7e9d5e 100644
--- a/docs/en-US/domains.xml
+++ b/docs/en-US/domains.xml
@@ -1,10 +1,28 @@
-
%BOOK_ENTITIES;
]>
+
+
+
Domains
If the LDAP server requires SSL, you need to enable it in the ldapConfig command by setting the parameters ssl, truststore, and truststorepass. Before enabling SSL for ldapConfig, you need to get the certificate which the LDAP server is using and add it to a trusted keystore. You will need to know the path to the keystore and the password.
-