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
[4/11] docs: Fix indentation according to coding convention
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/create-bare-metal-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-bare-metal-template.xml b/docs/en-US/create-bare-metal-template.xml
index 635e13f..19db2ed 100644
--- a/docs/en-US/create-bare-metal-template.xml
+++ b/docs/en-US/create-bare-metal-template.xml
@@ -23,24 +23,24 @@
-->
<section id="create-bare-metal-template">
- <title>Creating a Bare Metal Template</title>
- <note><para><emphasis role="bold">Beta feature. Untested in &PRODUCT; 3.0.3. Provided without guarantee of performance</emphasis>.</para></note>
- <para>Before you can create a bare metal template, you must have performed several other installation and setup steps to create a bare metal cluster and environment. See Bare Metal Installation in the Installation Guide. It is assumed you already have a directory named "win7_64bit" on your CIFS server, containing the image for the bare metal instance. This directory and image are set up as part of the Bare Metal Installation procedure.</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
- <listitem><para>In the left navigation bar, click Templates.</para></listitem>
- <listitem><para>Click Create Template.</para></listitem>
- <listitem><para>In the dialog box, enter the following values.</para>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Name</emphasis>. Short name for the template.</para></listitem>
- <listitem><para><emphasis role="bold">Display Text</emphasis>. Description of the template.</para></listitem>
- <listitem><para><emphasis role="bold">URL</emphasis>. The directory name which contains image file on your CIFS server. For example, win7_64bit.</para></listitem>
- <listitem><para><emphasis role="bold">Zone</emphasis>. All Zones.</para></listitem>
- <listitem><para><emphasis role="bold">OS Type</emphasis>. Select the OS type of the ISO image. Choose other if the OS Type of the ISO is not listed or if the ISO is not bootable.</para></listitem>
- <listitem><para><emphasis role="bold">Hypervisor</emphasis>. BareMetal.</para></listitem>
- <listitem><para><emphasis role="bold">Format</emphasis>. BareMetal.</para></listitem>
- <listitem><para><emphasis role="bold">Password Enabled</emphasis>. No.</para></listitem>
- <listitem><para><emphasis role="bold">Public</emphasis>. No.</para></listitem>
- <listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be more prominent for users to select. Only administrators may make templates featured.</para></listitem>
- </itemizedlist></listitem></orderedlist>
- </section>
+ <title>Creating a Bare Metal Template</title>
+ <note><para><emphasis role="bold">Beta feature. Untested in &PRODUCT; 3.0.3. Provided without guarantee of performance</emphasis>.</para></note>
+ <para>Before you can create a bare metal template, you must have performed several other installation and setup steps to create a bare metal cluster and environment. See Bare Metal Installation in the Installation Guide. It is assumed you already have a directory named "win7_64bit" on your CIFS server, containing the image for the bare metal instance. This directory and image are set up as part of the Bare Metal Installation procedure.</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
+ <listitem><para>In the left navigation bar, click Templates.</para></listitem>
+ <listitem><para>Click Create Template.</para></listitem>
+ <listitem><para>In the dialog box, enter the following values.</para>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Name</emphasis>. Short name for the template.</para></listitem>
+ <listitem><para><emphasis role="bold">Display Text</emphasis>. Description of the template.</para></listitem>
+ <listitem><para><emphasis role="bold">URL</emphasis>. The directory name which contains image file on your CIFS server. For example, win7_64bit.</para></listitem>
+ <listitem><para><emphasis role="bold">Zone</emphasis>. All Zones.</para></listitem>
+ <listitem><para><emphasis role="bold">OS Type</emphasis>. Select the OS type of the ISO image. Choose other if the OS Type of the ISO is not listed or if the ISO is not bootable.</para></listitem>
+ <listitem><para><emphasis role="bold">Hypervisor</emphasis>. BareMetal.</para></listitem>
+ <listitem><para><emphasis role="bold">Format</emphasis>. BareMetal.</para></listitem>
+ <listitem><para><emphasis role="bold">Password Enabled</emphasis>. No.</para></listitem>
+ <listitem><para><emphasis role="bold">Public</emphasis>. No.</para></listitem>
+ <listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be more prominent for users to select. Only administrators may make templates featured.</para></listitem>
+ </itemizedlist></listitem></orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/create-template-from-existing-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-template-from-existing-vm.xml b/docs/en-US/create-template-from-existing-vm.xml
index d6b6f0d..c22b7ec 100644
--- a/docs/en-US/create-template-from-existing-vm.xml
+++ b/docs/en-US/create-template-from-existing-vm.xml
@@ -23,27 +23,27 @@
-->
<section id="create-template-from-existing-vm">
- <title>Creating a Template from an Existing Virtual Machine</title>
- <para>Once you have at least one VM set up in the way you want, you can use it as the prototype for other VMs.</para>
- <orderedlist>
- <listitem><para>Create and start a virtual machine using any of the techniques given in <xref linkend="creating-vms"/>.</para></listitem>
- <listitem><para>Make any desired configuration changes on the running VM, then click Stop.</para></listitem>
- <listitem><para>Wait for the VM to stop. When the status shows Stopped, go to the next step.</para></listitem>
- <listitem><para>Click Create Template and provide the following:</para>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so choose something descriptive.</para></listitem>
- <listitem><para><emphasis role="bold">OS Type</emphasis>. This helps &PRODUCT; and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following.</para>
- <itemizedlist>
- <listitem><para>If the operating system of the stopped VM is listed, choose it.</para></listitem>
- <listitem><para>If the OS type of the stopped VM is not listed, choose Other.</para></listitem>
- <listitem><para>If you want to boot from this template in PV mode, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere:</para>
- <note><para>Note: Generally you should not 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 in general not work. In those cases you should choose Other.</para></note></listitem>
- </itemizedlist>
- </listitem>
- <listitem><para><emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all users of this &PRODUCT; installation. The template will appear in the Community Templates list. See <xref linkend="private-public-template"/>.</para></listitem>
- <listitem><para><emphasis role="bold">Password Enabled</emphasis>. Choose Yes if your template has the &PRODUCT; password change script installed. See Adding Password Management to Your Templates.</para></listitem>
- </itemizedlist></listitem>
- <listitem><para>Click Add.</para></listitem>
- </orderedlist>
- <para>The new template will be visible in the Templates section when the template creation process has been completed. The template is then available when creating a new VM</para>
+ <title>Creating a Template from an Existing Virtual Machine</title>
+ <para>Once you have at least one VM set up in the way you want, you can use it as the prototype for other VMs.</para>
+ <orderedlist>
+ <listitem><para>Create and start a virtual machine using any of the techniques given in <xref linkend="creating-vms"/>.</para></listitem>
+ <listitem><para>Make any desired configuration changes on the running VM, then click Stop.</para></listitem>
+ <listitem><para>Wait for the VM to stop. When the status shows Stopped, go to the next step.</para></listitem>
+ <listitem><para>Click Create Template and provide the following:</para>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so choose something descriptive.</para></listitem>
+ <listitem><para><emphasis role="bold">OS Type</emphasis>. This helps &PRODUCT; and the hypervisor perform certain operations and make assumptions that improve the performance of the guest. Select one of the following.</para>
+ <itemizedlist>
+ <listitem><para>If the operating system of the stopped VM is listed, choose it.</para></listitem>
+ <listitem><para>If the OS type of the stopped VM is not listed, choose Other.</para></listitem>
+ <listitem><para>If you want to boot from this template in PV mode, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere:</para>
+ <note><para>Note: Generally you should not 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 in general not work. In those cases you should choose Other.</para></note></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para><emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all users of this &PRODUCT; installation. The template will appear in the Community Templates list. See <xref linkend="private-public-template"/>.</para></listitem>
+ <listitem><para><emphasis role="bold">Password Enabled</emphasis>. Choose Yes if your template has the &PRODUCT; password change script installed. See Adding Password Management to Your Templates.</para></listitem>
+ </itemizedlist></listitem>
+ <listitem><para>Click Add.</para></listitem>
+ </orderedlist>
+ <para>The new template will be visible in the Templates section when the template creation process has been completed. The template is then available when creating a new VM</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/create-templates-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-templates-overview.xml b/docs/en-US/create-templates-overview.xml
index 7e41035..818b42d 100644
--- a/docs/en-US/create-templates-overview.xml
+++ b/docs/en-US/create-templates-overview.xml
@@ -23,13 +23,13 @@
-->
<section id="create-templates-overview">
- <title>Creating Templates: Overview</title>
- <para>&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
- <orderedlist>
- <listitem><para>Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.</para></listitem>
- <listitem><para>Stop the VM.</para></listitem>
- <listitem><para>Convert the volume into a template.</para></listitem>
- </orderedlist>
- <para>There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into &PRODUCT;</para>
- <para>The various techniques for creating templates are described in the next few sections.</para>
+ <title>Creating Templates: Overview</title>
+ <para>&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
+ <orderedlist>
+ <listitem><para>Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.</para></listitem>
+ <listitem><para>Stop the VM.</para></listitem>
+ <listitem><para>Convert the volume into a template.</para></listitem>
+ </orderedlist>
+ <para>There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into &PRODUCT;</para>
+ <para>The various techniques for creating templates are described in the next few sections.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/create-windows-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-windows-template.xml b/docs/en-US/create-windows-template.xml
index ef36020..f8dbc79 100644
--- a/docs/en-US/create-windows-template.xml
+++ b/docs/en-US/create-windows-template.xml
@@ -23,16 +23,16 @@
-->
<section id="create-windows-template">
- <title>Creating a Windows Template</title>
- <para>Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.</para>
- <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
- <para>An overview of the procedure is as follows:</para>
- <orderedlist>
- <listitem><para>Upload your Windows ISO.</para> <para>For more information, see <xref linkend="add-iso"/></para></listitem>
- <listitem><para>Create a VM Instance with this ISO.</para><para> For more information, see <xref linkend="creating-vms"/></para></listitem>
- <listitem><para>Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of Windows Server</para></listitem>
- <listitem><para>The preparation steps are complete. Now you can actually create the template as described in Creating the Windows Template.</para></listitem>
- </orderedlist>
- <xi:include href="sysprep-windows-server-2008R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="sysprep-for-windows-server-2003R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Creating a Windows Template</title>
+ <para>Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.</para>
+ <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
+ <para>An overview of the procedure is as follows:</para>
+ <orderedlist>
+ <listitem><para>Upload your Windows ISO.</para> <para>For more information, see <xref linkend="add-iso"/></para></listitem>
+ <listitem><para>Create a VM Instance with this ISO.</para><para> For more information, see <xref linkend="creating-vms"/></para></listitem>
+ <listitem><para>Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of Windows Server</para></listitem>
+ <listitem><para>The preparation steps are complete. Now you can actually create the template as described in Creating the Windows Template.</para></listitem>
+ </orderedlist>
+ <xi:include href="sysprep-windows-server-2008R2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="sysprep-for-windows-server-2003R2.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/creating-new-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-new-volumes.xml b/docs/en-US/creating-new-volumes.xml
index 995da86..62181b9 100644
--- a/docs/en-US/creating-new-volumes.xml
+++ b/docs/en-US/creating-new-volumes.xml
@@ -23,19 +23,19 @@
-->
<section id="creating-new-volumes">
- <title>Creating a New Volume</title>
- <para>You can add more data disk volumes to a guest VM at any time, up to the limits of your storage capacity. Both &PRODUCT; administrators and users can add volumes to VM instances. When you create a new volume, it is stored as an entity in &PRODUCT;, but the actual storage resources are not allocated on the physical storage device until you attach the volume. This optimization allows the &PRODUCT; to provision the volume nearest to the guest that will use it when the first attachment is made.</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>In the left navigation bar, click Storage.</para></listitem>
- <listitem><para>In Select View, choose Volumes.</para></listitem>
- <listitem><para>To create a new volume, click Add Volume, provide the following details, and click OK.</para>
- <itemizedlist>
- <listitem><para>Name. Give the volume a unique name so you can find it later.</para></listitem>
- <listitem><para>Availability Zone. Where do you want the storage to reside? This should be close to the VM that will use the volume.</para></listitem>
- <listitem><para>Disk Offering. Choose the characteristics of the storage.</para></listitem>
- </itemizedlist>
- <para>The new volume appears in the list of volumes with the state “Allocated.” The volume data is stored in &PRODUCT;, but the volume is not yet ready for use</para></listitem>
- <listitem><para>To start using the volume, continue to Attaching a Volume </para></listitem>
- </orderedlist>
- </section>
+ <title>Creating a New Volume</title>
+ <para>You can add more data disk volumes to a guest VM at any time, up to the limits of your storage capacity. Both &PRODUCT; administrators and users can add volumes to VM instances. When you create a new volume, it is stored as an entity in &PRODUCT;, but the actual storage resources are not allocated on the physical storage device until you attach the volume. This optimization allows the &PRODUCT; to provision the volume nearest to the guest that will use it when the first attachment is made.</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+ <listitem><para>In the left navigation bar, click Storage.</para></listitem>
+ <listitem><para>In Select View, choose Volumes.</para></listitem>
+ <listitem><para>To create a new volume, click Add Volume, provide the following details, and click OK.</para>
+ <itemizedlist>
+ <listitem><para>Name. Give the volume a unique name so you can find it later.</para></listitem>
+ <listitem><para>Availability Zone. Where do you want the storage to reside? This should be close to the VM that will use the volume.</para></listitem>
+ <listitem><para>Disk Offering. Choose the characteristics of the storage.</para></listitem>
+ </itemizedlist>
+ <para>The new volume appears in the list of volumes with the state “Allocated.” The volume data is stored in &PRODUCT;, but the volume is not yet ready for use</para></listitem>
+ <listitem><para>To start using the volume, continue to Attaching a Volume </para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/creating-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml
index dd6ec79..dc37dbb 100644
--- a/docs/en-US/creating-vms.xml
+++ b/docs/en-US/creating-vms.xml
@@ -23,27 +23,27 @@
-->
<section id="creating-vms">
- <title>Creating VMs</title>
- <para>Virtual machines are usually created from a template. Users can also create blank virtual machines. A blank virtual machine is a virtual machine without an OS template. Users can attach an ISO file and install the OS from the CD/DVD-ROM.</para>
- <para>To create a VM from a template:</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
- <listitem><para>In the left navigation bar, click Instances.</para></listitem>
- <listitem><para>Click Add Instance.</para></listitem>
- <listitem><para>Select a template, then follow the steps in the wizard. (For more information about how the templates came to be in this list, see Working with Templates.</para></listitem>
- <listitem><para>Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
- <listitem><para>Click Submit and your VM will be created and started.</para>
- <note><para>For security reason, the internal name of the VM is visible only to the root admin.</para></note></listitem>
- </orderedlist>
- <note><para>Starting with v3.0.3, you can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A new request parameter, startVM, is introduced in the deployVm API to support this feature. For more information, see the Developer's Guide</para></note>
- <para>To create a VM from an ISO:</para>
- <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
- <listitem><para>In the left navigation bar, click Instances.</para></listitem>
- <listitem><para>Click Add Instance.</para></listitem>
- <listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
- <listitem><para>Click Submit and your VM will be created and started.</para></listitem>
- <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
- </orderedlist>
+ <title>Creating VMs</title>
+ <para>Virtual machines are usually created from a template. Users can also create blank virtual machines. A blank virtual machine is a virtual machine without an OS template. Users can attach an ISO file and install the OS from the CD/DVD-ROM.</para>
+ <para>To create a VM from a template:</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
+ <listitem><para>In the left navigation bar, click Instances.</para></listitem>
+ <listitem><para>Click Add Instance.</para></listitem>
+ <listitem><para>Select a template, then follow the steps in the wizard. (For more information about how the templates came to be in this list, see Working with Templates.</para></listitem>
+ <listitem><para>Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
+ <listitem><para>Click Submit and your VM will be created and started.</para>
+ <note><para>For security reason, the internal name of the VM is visible only to the root admin.</para></note></listitem>
+ </orderedlist>
+ <note><para>Starting with v3.0.3, you can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A new request parameter, startVM, is introduced in the deployVm API to support this feature. For more information, see the Developer's Guide</para></note>
+ <para>To create a VM from an ISO:</para>
+ <note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
+ <listitem><para>In the left navigation bar, click Instances.</para></listitem>
+ <listitem><para>Click Add Instance.</para></listitem>
+ <listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
+ <listitem><para>Click Submit and your VM will be created and started.</para></listitem>
+ <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/dates-in-usage-record.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dates-in-usage-record.xml b/docs/en-US/dates-in-usage-record.xml
index 0fe430d..dc2f072 100644
--- a/docs/en-US/dates-in-usage-record.xml
+++ b/docs/en-US/dates-in-usage-record.xml
@@ -16,11 +16,11 @@
under the License.
-->
- <section id="dates-in-usage-record">
- <title>Dates in the Usage Record</title>
- <para>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).</para>
- <para>Note: The start date is not the time a virtual machine was started, and the end date is not the time when a virtual machine was stopped. The start and end dates give the time range within which usage was calculated.</para>
- <para>For network usage, the start date and end date again define the range in which the number of bytes transferred was calculated. If a user downloads 10 MB and uploads 1 MB in one day, there will be two records, one showing the 10 megabytes received and one showing the 1 megabyte sent.</para>
- <para>There is one case where the start date and end date do not correspond to midnight and 11:59:59pm when daily aggregation is used. This occurs only for network usage records. When the usage server has more than one day's worth of unprocessed data, the old data will be included in the aggregation period. The start date in the usage record will show the date and time of the earliest event. For other types of usage, such as IP addresses and VMs, the old unprocessed data is not included in daily aggregation.</para>
- </section>
+ <section id="dates-in-usage-record">
+ <title>Dates in the Usage Record</title>
+ <para>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).</para>
+ <para>Note: The start date is not the time a virtual machine was started, and the end date is not the time when a virtual machine was stopped. The start and end dates give the time range within which usage was calculated.</para>
+ <para>For network usage, the start date and end date again define the range in which the number of bytes transferred was calculated. If a user downloads 10 MB and uploads 1 MB in one day, there will be two records, one showing the 10 megabytes received and one showing the 1 megabyte sent.</para>
+ <para>There is one case where the start date and end date do not correspond to midnight and 11:59:59pm when daily aggregation is used. This occurs only for network usage records. When the usage server has more than one day's worth of unprocessed data, the old data will be included in the aggregation period. The start date in the usage record will show the date and time of the earliest event. For other types of usage, such as IP addresses and VMs, the old unprocessed data is not included in daily aggregation.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/default-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-template.xml b/docs/en-US/default-template.xml
index c4741c9..16442c3 100644
--- a/docs/en-US/default-template.xml
+++ b/docs/en-US/default-template.xml
@@ -23,12 +23,12 @@
-->
<section id="default-template">
- <title>The Default Template</title>
- <para>&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.</para>
- <para>The root password for the default template is "password".</para>
- <para>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.</para>
- <para>The default template includes the standard iptables rules, which will block most access to the template excluding ssh.</para>
- <programlisting># iptables --list
+ <title>The Default Template</title>
+ <para>&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.</para>
+ <para>The root password for the default template is "password".</para>
+ <para>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.</para>
+ <para>The default template includes the standard iptables rules, which will block most access to the template excluding ssh.</para>
+ <programlisting># iptables --list
Chain INPUT (policy ACCEPT)
target prot opt source destination
RH-Firewall-1-INPUT all -- anywhere anywhere
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/delete-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-templates.xml b/docs/en-US/delete-templates.xml
index 48d8fd1..f9351da 100644
--- a/docs/en-US/delete-templates.xml
+++ b/docs/en-US/delete-templates.xml
@@ -23,7 +23,7 @@
-->
<section id="delete-templates">
- <title>Deleting Templates</title>
- <para>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.</para>
- <para>When templates are deleted, the VMs instantiated from them will continue to run. However, new VMs cannot be created based on the deleted template.</para>
+ <title>Deleting Templates</title>
+ <para>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.</para>
+ <para>When templates are deleted, the VMs instantiated from them will continue to run. However, new VMs cannot be created based on the deleted template.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/deleting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deleting-vms.xml b/docs/en-US/deleting-vms.xml
index ab65fef..1f1ee95 100644
--- a/docs/en-US/deleting-vms.xml
+++ b/docs/en-US/deleting-vms.xml
@@ -23,19 +23,19 @@
-->
<section id="deleting-vms">
- <title>Deleting VMs</title>
- <para>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.</para>
- <para>To delete a virtual machine:</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>In the left navigation, click Instances.</para></listitem>
- <listitem><para>Choose the VM that you want to delete.</para></listitem>
- <listitem><para>Click the Destroy Instance button <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/destroy-instance.png" />
- </imageobject>
- <textobject><phrase>Destroyinstance.png: button to destroy an instance</phrase></textobject>
- </inlinemediaobject>
- </para></listitem>
- </orderedlist>
- </section>
+ <title>Deleting VMs</title>
+ <para>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.</para>
+ <para>To delete a virtual machine:</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+ <listitem><para>In the left navigation, click Instances.</para></listitem>
+ <listitem><para>Choose the VM that you want to delete.</para></listitem>
+ <listitem><para>Click the Destroy Instance button <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/destroy-instance.png" />
+ </imageobject>
+ <textobject><phrase>Destroyinstance.png: button to destroy an instance</phrase></textobject>
+ </inlinemediaobject>
+ </para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/deployment-architecture-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
index 2d46379..6a67a2c 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -23,22 +23,22 @@
-->
<section id="deployment-architecture-overview">
- <title>Deployment Architecture Overview</title>
- <para>
- 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.
- </para>
- <para>
- The minimum production 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). In a trial installation, a single machine can act as both the Management Server and the hypervisor host (using the KVM hypervisor).
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/basic-deployment.png" />
- </imageobject>
- <textobject><phrase>basic-deployment.png: Basic two-machine deployment</phrase></textobject>
- </mediaobject>
- <para>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.
- </para>
- <xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="networking-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Deployment Architecture Overview</title>
+ <para>
+ 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.
+ </para>
+ <para>
+ The minimum production 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). In a trial installation, a single machine can act as both the Management Server and the hypervisor host (using the KVM hypervisor).
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/basic-deployment.png" />
+ </imageobject>
+ <textobject><phrase>basic-deployment.png: Basic two-machine deployment</phrase></textobject>
+ </mediaobject>
+ <para>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.
+ </para>
+ <xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="networking-overview.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/detach-move-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
index 6f241d5..a00e15f 100644
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.xml
@@ -23,21 +23,21 @@
-->
<section id="detach-move-volumes">
- <title>Attaching a Volume</title>
- <note><para>This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration </para></note>
- <para>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.</para>
- <para>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.</para>
- <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>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.</para></listitem>
- <listitem><para>Click the name of the volume you want to detach, then click the Detach Disk button <inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/detach-disk-icon.png" />
- </imageobject>
- <textobject><phrase>DetachDiskButton.png: button to detach a volume</phrase></textobject>
- </inlinemediaobject>
- </para></listitem>
- <listitem><para>To move the volume to another VM, follow the steps in Attaching a Volume <xref linkend="attaching-volume"/>.</para></listitem>
- </orderedlist>
- </section>
+ <title>Attaching a Volume</title>
+ <note><para>This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration </para></note>
+ <para>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.</para>
+ <para>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.</para>
+ <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+ <listitem><para>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.</para></listitem>
+ <listitem><para>Click the name of the volume you want to detach, then click the Detach Disk button <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/detach-disk-icon.png" />
+ </imageobject>
+ <textobject><phrase>DetachDiskButton.png: button to detach a volume</phrase></textobject>
+ </inlinemediaobject>
+ </para></listitem>
+ <listitem><para>To move the volume to another VM, follow the steps in Attaching a Volume <xref linkend="attaching-volume"/>.</para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/developer-getting-started.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-getting-started.xml b/docs/en-US/developer-getting-started.xml
index 08e2395..1456028 100644
--- a/docs/en-US/developer-getting-started.xml
+++ b/docs/en-US/developer-getting-started.xml
@@ -23,16 +23,16 @@
under the License.
-->
- <section id="getting-started">
- <title>Getting Started</title>
- <para>
- To get started using the &PRODUCT; API, you should have the following:</para>
- <itemizedlist>
- <listitem><para>URL of the &PRODUCT; server you wish to integrate with.</para></listitem>
- <listitem><para>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.</para></listitem>
- <listitem><para>Familiarity with HTTP GET/POST and query strings.</para></listitem>
- <listitem><para>Knowledge of either XML or JSON.</para></listitem>
- <listitem><para>Knowledge of a programming language that can generate HTTP requests; for example, Java or PHP.</para></listitem>
- </itemizedlist>
- </section>
+ <section id="getting-started">
+ <title>Getting Started</title>
+ <para>
+ To get started using the &PRODUCT; API, you should have the following:</para>
+ <itemizedlist>
+ <listitem><para>URL of the &PRODUCT; server you wish to integrate with.</para></listitem>
+ <listitem><para>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.</para></listitem>
+ <listitem><para>Familiarity with HTTP GET/POST and query strings.</para></listitem>
+ <listitem><para>Knowledge of either XML or JSON.</para></listitem>
+ <listitem><para>Knowledge of a programming language that can generate HTTP requests; for example, Java or PHP.</para></listitem>
+ </itemizedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/developer-guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-guide.xml b/docs/en-US/developer-guide.xml
index 970fe16..c4bdf39 100644
--- a/docs/en-US/developer-guide.xml
+++ b/docs/en-US/developer-guide.xml
@@ -23,8 +23,8 @@
-->
<chapter id="developer-guide">
- <title>Using the API</title>
- <xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Using the API</title>
+ <xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="whats-new.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="making-api-request.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="enabling-api-call-expiration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/developer-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-introduction.xml b/docs/en-US/developer-introduction.xml
index f2ab1d4..5b9964e 100644
--- a/docs/en-US/developer-introduction.xml
+++ b/docs/en-US/developer-introduction.xml
@@ -23,8 +23,8 @@
-->
<section id="developer-introduction">
- <title>Introduction for Developers</title>
- <xi:include href="roles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Introduction for Developers</title>
+ <xi:include href="roles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="api-reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="developer-getting-started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="developer-getting-started.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/developer_guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer_guide.xml b/docs/en-US/developer_guide.xml
index 9606bab..18ef88a 100644
--- a/docs/en-US/developer_guide.xml
+++ b/docs/en-US/developer_guide.xml
@@ -23,8 +23,8 @@
-->
<chapter id="developer_guide">
- <title>Developer Guide</title>
- <xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Developer Guide</title>
+ <xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="whats-new.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="making-api-request.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="enabling-api-call-expiration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/disk-volume-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/disk-volume-usage-record-format.xml b/docs/en-US/disk-volume-usage-record-format.xml
index 7283698..c15d979 100644
--- a/docs/en-US/disk-volume-usage-record-format.xml
+++ b/docs/en-US/disk-volume-usage-record-format.xml
@@ -17,22 +17,22 @@
-->
<section id="disk-volume-usage-record-format">
- <title>Disk Volume Usage Record Format</title>
- <para>For disk volumes, the following fields exist in a usage record.</para>
- <itemizedlist>
- <listitem><para>account – name of the account</para></listitem>
- <listitem><para>accountid – ID of the account</para></listitem>
- <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
- <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
- <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
- <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
- <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
- <listitem><para>usageid – The volume ID</para></listitem>
- <listitem><para>offeringid – The ID of the disk offering</para></listitem>
- <listitem><para>type – Hypervisor</para></listitem>
- <listitem><para>templateid – ROOT template ID</para></listitem>
- <listitem><para>size – The amount of storage allocated</para></listitem>
- <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
- </itemizedlist>
- </section>
+ <title>Disk Volume Usage Record Format</title>
+ <para>For disk volumes, the following fields exist in a usage record.</para>
+ <itemizedlist>
+ <listitem><para>account – name of the account</para></listitem>
+ <listitem><para>accountid – ID of the account</para></listitem>
+ <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
+ <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
+ <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
+ <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for hours)</para></listitem>
+ <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
+ <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
+ <listitem><para>usageid – The volume ID</para></listitem>
+ <listitem><para>offeringid – The ID of the disk offering</para></listitem>
+ <listitem><para>type – Hypervisor</para></listitem>
+ <listitem><para>templateid – ROOT template ID</para></listitem>
+ <listitem><para>size – The amount of storage allocated</para></listitem>
+ <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
+ </itemizedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/dns-dhcp.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dns-dhcp.xml b/docs/en-US/dns-dhcp.xml
index 4d5bf00..2359e83 100644
--- a/docs/en-US/dns-dhcp.xml
+++ b/docs/en-US/dns-dhcp.xml
@@ -23,6 +23,6 @@
-->
<section id="dns-dhcp">
- <title>DNS and DHCP</title>
- <para>The Virtual Router provides DNS and DHCP services to the guests. It proxies DNS requests to the DNS server configured on the Availability Zone.</para>
+ <title>DNS and DHCP</title>
+ <para>The Virtual Router provides DNS and DHCP services to the guests. It proxies DNS requests to the DNS server configured on the Availability Zone.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/domains.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/domains.xml b/docs/en-US/domains.xml
index 9d19c7e..f348fe8 100644
--- a/docs/en-US/domains.xml
+++ b/docs/en-US/domains.xml
@@ -23,6 +23,6 @@
-->
<section id="domains">
- <title>Domains</title>
- <para>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.</para>
- </section>
+ <title>Domains</title>
+ <para>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.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/enable-disable-static-nat.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enable-disable-static-nat.xml b/docs/en-US/enable-disable-static-nat.xml
index 3a76884..f25327a 100644
--- a/docs/en-US/enable-disable-static-nat.xml
+++ b/docs/en-US/enable-disable-static-nat.xml
@@ -23,22 +23,22 @@
-->
<section id="enable-disable-static-nat">
- <title>Enabling or Disabling Static NAT</title>
- <para>If port forwarding rules are already in effect for an IP address, you cannot enable static NAT to that IP.</para>
- <para>If a guest VM is part of more than one network, static NAT rules will function only if they are defined on the default network.</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
- <listitem><para>In the left navigation, choose Network.</para></listitem>
- <listitem><para>Click the name of the network where you want to work with.</para></listitem>
- <listitem><para>Click View IP Addresses.</para></listitem>
- <listitem><para>Click the IP address you want to work with.</para>
- </listitem>
- <listitem><para>Click the Static NAT button.<inlinemediaobject>
- <imageobject>
- <imagedata fileref="./images/release-ip-icon.png" />
- </imageobject>
- <textobject><phrase>ReleaseIPButton.png: button to release an IP</phrase></textobject>
- </inlinemediaobject>The button toggles between Enable and Disable, depending on whether static NAT is currently enabled for the IP address.</para></listitem>
- <listitem><para>If you are enabling static NAT, a dialog appears where you can choose the destination VM and click Apply</para></listitem>
- </orderedlist>
+ <title>Enabling or Disabling Static NAT</title>
+ <para>If port forwarding rules are already in effect for an IP address, you cannot enable static NAT to that IP.</para>
+ <para>If a guest VM is part of more than one network, static NAT rules will function only if they are defined on the default network.</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+ <listitem><para>In the left navigation, choose Network.</para></listitem>
+ <listitem><para>Click the name of the network where you want to work with.</para></listitem>
+ <listitem><para>Click View IP Addresses.</para></listitem>
+ <listitem><para>Click the IP address you want to work with.</para>
+ </listitem>
+ <listitem><para>Click the Static NAT button.<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="./images/release-ip-icon.png" />
+ </imageobject>
+ <textobject><phrase>ReleaseIPButton.png: button to release an IP</phrase></textobject>
+ </inlinemediaobject>The button toggles between Enable and Disable, depending on whether static NAT is currently enabled for the IP address.</para></listitem>
+ <listitem><para>If you are enabling static NAT, a dialog appears where you can choose the destination VM and click Apply</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/enable-security-groups.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enable-security-groups.xml b/docs/en-US/enable-security-groups.xml
index f2e07b3..27f69d2 100644
--- a/docs/en-US/enable-security-groups.xml
+++ b/docs/en-US/enable-security-groups.xml
@@ -23,7 +23,7 @@
-->
<section id="enable-security-groups">
- <title>Enabling Security Groups</title>
- <para>In order for security groups to function in a zone, the security groups feature must first be enabled for the zone. The administrator can do this when creating a new zone, by selecting a network offering that includes security groups. The procedure is described in Basic Zone Configuration in the Advanced Installation Guide.</para>
+ <title>Enabling Security Groups</title>
+ <para>In order for security groups to function in a zone, the security groups feature must first be enabled for the zone. The administrator can do this when creating a new zone, by selecting a network offering that includes security groups. The procedure is described in Basic Zone Configuration in the Advanced Installation Guide.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/enabling-api-call-expiration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enabling-api-call-expiration.xml b/docs/en-US/enabling-api-call-expiration.xml
index dd0d9ce..cd82d3d 100644
--- a/docs/en-US/enabling-api-call-expiration.xml
+++ b/docs/en-US/enabling-api-call-expiration.xml
@@ -22,19 +22,19 @@
under the License.
-->
- <section id="enabling-api-call-expiration">
- <title>Enabling API Call Expiration</title>
- <para>
- You can set an expiry timestamp on API calls to prevent replay attacks over non-secure channels, such as HTTP. The server tracks the expiry timestamp you have specified and rejects all the subsequent API requests that come in after this validity period.
- </para>
- <para>To enable this feature, add the following parameters to the API request:</para>
- <itemizedlist>
- <listitem><para>signatureVersion=3: If the signatureVersion parameter is missing or is not equal to 3, the expires parameter is ignored in the API request.</para></listitem>
- <listitem><para>expires=YYYY-MM-DDThh:mm:ssZ: Specifies the date and time at which the signature included in the request is expired. The timestamp is expressed in the YYYY-MM-DDThh:mm:ssZ format, as specified in the ISO 8601 standard.</para></listitem>
- </itemizedlist>
- <para>For example:</para>
- <programlisting>expires=2011-10-10T12:00:00+0530</programlisting>
- <para>A sample API request with expiration is given below:</para>
- <programlisting>http://<IPAddress>:8080/client/api?command=listZones&signatureVersion=3&expires=2011-10-10T12:00:00+0530&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+ <section id="enabling-api-call-expiration">
+ <title>Enabling API Call Expiration</title>
+ <para>
+ You can set an expiry timestamp on API calls to prevent replay attacks over non-secure channels, such as HTTP. The server tracks the expiry timestamp you have specified and rejects all the subsequent API requests that come in after this validity period.
+ </para>
+ <para>To enable this feature, add the following parameters to the API request:</para>
+ <itemizedlist>
+ <listitem><para>signatureVersion=3: If the signatureVersion parameter is missing or is not equal to 3, the expires parameter is ignored in the API request.</para></listitem>
+ <listitem><para>expires=YYYY-MM-DDThh:mm:ssZ: Specifies the date and time at which the signature included in the request is expired. The timestamp is expressed in the YYYY-MM-DDThh:mm:ssZ format, as specified in the ISO 8601 standard.</para></listitem>
+ </itemizedlist>
+ <para>For example:</para>
+ <programlisting>expires=2011-10-10T12:00:00+0530</programlisting>
+ <para>A sample API request with expiration is given below:</para>
+ <programlisting>http://<IPAddress>:8080/client/api?command=listZones&signatureVersion=3&expires=2011-10-10T12:00:00+0530&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/enabling-port-8096.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/enabling-port-8096.xml b/docs/en-US/enabling-port-8096.xml
index 9609ee4..57c492e 100644
--- a/docs/en-US/enabling-port-8096.xml
+++ b/docs/en-US/enabling-port-8096.xml
@@ -22,16 +22,16 @@
under the License.
-->
- <section id="enabling-port-8096">
- <title>Enabling Port 8096</title>
- <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:
- </para>
- <orderedlist>
- <listitem><para>Ensure that the first Management Server is installed and running.</para></listitem>
- <listitem><para>Set the global configuration parameter integration.api.port to the desired port.</para></listitem>
- <listitem><para>Restart the Management Server.</para></listitem>
- <listitem><para>On the Management Server host machine, create an iptables rule allowing access to that port.</para></listitem>
- </orderedlist>
- </section>
+ <section id="enabling-port-8096">
+ <title>Enabling Port 8096</title>
+ <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:
+ </para>
+ <orderedlist>
+ <listitem><para>Ensure that the first Management Server is installed and running.</para></listitem>
+ <listitem><para>Set the global configuration parameter integration.api.port to the desired port.</para></listitem>
+ <listitem><para>Restart the Management Server.</para></listitem>
+ <listitem><para>On the Management Server host machine, create an iptables rule allowing access to that port.</para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/end-user-ui-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/end-user-ui-overview.xml b/docs/en-US/end-user-ui-overview.xml
index 9c52720..dc95ce0 100644
--- a/docs/en-US/end-user-ui-overview.xml
+++ b/docs/en-US/end-user-ui-overview.xml
@@ -23,6 +23,6 @@
-->
<section id="end-user-ui-overview">
- <title>End User's UI Overview</title>
- <para>The &PRODUCT; UI helps users of cloud infrastructure to view and use their cloud resources, including virtual machines, templates and ISOs, data volumes and snapshots, guest networks, and IP addresses. If the user is a member or administrator of one or more &PRODUCT; projects, the UI can provide a project-oriented view.</para>
+ <title>End User's UI Overview</title>
+ <para>The &PRODUCT; UI helps users of cloud infrastructure to view and use their cloud resources, including virtual machines, templates and ISOs, data volumes and snapshots, guest networks, and IP addresses. If the user is a member or administrator of one or more &PRODUCT; projects, the UI can provide a project-oriented view.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/error-handling.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/error-handling.xml b/docs/en-US/error-handling.xml
index 869e964..3f119bf 100644
--- a/docs/en-US/error-handling.xml
+++ b/docs/en-US/error-handling.xml
@@ -22,8 +22,8 @@
under the License.
-->
- <section id="error-handling">
- <title>Error Handling</title>
- <para>If an error occurs while processing an API request, the appropriate response in the format specified is returned. Each error response consists of an error code and an error text describing what possibly can go wrong. For an example error response, see page 12.</para>
- <para>An HTTP error code of 401 is always returned if API request was rejected due to bad signatures, missing API Keys, or the user simply did not have the permissions to execute the command.</para>
+ <section id="error-handling">
+ <title>Error Handling</title>
+ <para>If an error occurs while processing an API request, the appropriate response in the format specified is returned. Each error response consists of an error code and an error text describing what possibly can go wrong. For an example error response, see page 12.</para>
+ <para>An HTTP error code of 401 is always returned if API request was rejected due to bad signatures, missing API Keys, or the user simply did not have the permissions to execute the command.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/event-log-queries.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/event-log-queries.xml b/docs/en-US/event-log-queries.xml
index 1eb4497..32a1612 100644
--- a/docs/en-US/event-log-queries.xml
+++ b/docs/en-US/event-log-queries.xml
@@ -34,4 +34,4 @@
<listitem><para>Storage volume creation and deletion</para></listitem>
<listitem><para>User login and logout</para></listitem>
</itemizedlist>
- </section>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/event-types.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/event-types.xml b/docs/en-US/event-types.xml
index 7be6970..9a71055 100644
--- a/docs/en-US/event-types.xml
+++ b/docs/en-US/event-types.xml
@@ -22,199 +22,199 @@
under the License.
-->
- <section id="event-types">
- <title>Event Types</title>
- <informaltable frame="all">
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <colspec colname="c1" />
- <colspec colname="c2" />
- <tbody>
- <row>
- <entry><para>VM.CREATE</para></entry>
- <entry><para>TEMPLATE.EXTRACT</para></entry>
- <entry><para>SG.REVOKE.INGRESS</para></entry>
- </row>
- <row>
- <entry><para>VM.DESTROY</para></entry>
- <entry><para>TEMPLATE.UPLOAD</para></entry>
- <entry><para>HOST.RECONNECT</para></entry>
- </row>
- <row>
- <entry><para>VM.START</para></entry>
- <entry><para>TEMPLATE.CLEANUP</para></entry>
- <entry><para>MAINT.CANCEL</para></entry>
- </row>
- <row>
- <entry><para>VM.STOP</para></entry>
- <entry><para>VOLUME.CREATE</para></entry>
- <entry><para>MAINT.CANCEL.PS</para></entry>
- </row>
- <row>
- <entry><para>VM.REBOOT</para></entry>
- <entry><para>VOLUME.DELETE</para></entry>
- <entry><para>MAINT.PREPARE</para></entry>
- </row>
- <row>
- <entry><para>VM.UPGRADE</para></entry>
- <entry><para>VOLUME.ATTACH</para></entry>
- <entry><para>MAINT.PREPARE.PS</para></entry>
- </row>
- <row>
- <entry><para>VM.RESETPASSWORD</para></entry>
- <entry><para>VOLUME.DETACH</para></entry>
- <entry><para>VPN.REMOTE.ACCESS.CREATE</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.CREATE</para></entry>
- <entry><para>VOLUME.UPLOAD</para></entry>
- <entry><para>VPN.USER.ADD</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.DESTROY</para></entry>
- <entry><para>SERVICEOFFERING.CREATE</para></entry>
- <entry><para>VPN.USER.REMOVE</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.START</para></entry>
- <entry><para>SERVICEOFFERING.UPDATE</para></entry>
- <entry><para>NETWORK.RESTART</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.STOP</para></entry>
- <entry><para>SERVICEOFFERING.DELETE</para></entry>
- <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.REBOOT</para></entry>
- <entry><para>DOMAIN.CREATE</para></entry>
- <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
- </row>
- <row>
- <entry><para>ROUTER.HA</para></entry>
- <entry><para>DOMAIN.DELETE</para></entry>
- <entry><para>STATICNAT.DISABLE</para></entry>
- </row>
- <row>
- <entry><para>PROXY.CREATE</para></entry>
- <entry><para>DOMAIN.UPDATE</para></entry>
- <entry><para>SSVM.CREATE</para></entry>
- </row>
- <row>
- <entry><para>PROXY.DESTROY</para></entry>
- <entry><para>SNAPSHOT.CREATE</para></entry>
- <entry><para>SSVM.DESTROY</para></entry>
- </row>
- <row>
- <entry><para>PROXY.START</para></entry>
- <entry><para>SNAPSHOT.DELETE</para></entry>
- <entry><para>SSVM.START</para></entry>
- </row>
- <row>
- <entry><para>PROXY.STOP</para></entry>
- <entry><para>SNAPSHOTPOLICY.CREATE</para></entry>
- <entry><para>SSVM.STOP</para></entry>
- </row>
- <row>
- <entry><para>PROXY.REBOOT</para></entry>
- <entry><para>SNAPSHOTPOLICY.UPDATE</para></entry>
- <entry><para>SSVM.REBOOT</para></entry>
- </row>
- <row>
- <entry><para>PROXY.HA</para></entry>
- <entry><para>SNAPSHOTPOLICY.DELETE</para></entry>
- <entry><para>SSVM.H</para></entry>
- </row>
- <row>
- <entry><para>VNC.CONNECT</para></entry>
- <entry><para>VNC.DISCONNECT</para></entry>
- <entry><para>NET.IPASSIGN</para></entry>
- </row>
- <row>
- <entry><para>NET.IPRELEASE</para></entry>
- <entry><para>NET.RULEADD</para></entry>
- <entry><para>NET.RULEDELETE</para></entry>
- </row>
- <row>
- <entry><para>NET.RULEMODIFY</para></entry>
- <entry><para>NETWORK.CREATE</para></entry>
- <entry><para>NETWORK.DELETE</para></entry>
- </row>
- <row>
- <entry><para>LB.ASSIGN.TO.RULE</para></entry>
- <entry><para>LB.REMOVE.FROM.RULE</para></entry>
- <entry><para>LB.CREATE</para></entry>
- </row>
- <row>
- <entry><para>LB.DELETE</para></entry>
- <entry><para>LB.UPDATE</para></entry>
- <entry><para>USER.LOGIN</para></entry>
- </row>
- <row>
- <entry><para>USER.LOGOUT</para></entry>
- <entry><para>USER.CREATE</para></entry>
- <entry><para>USER.DELETE</para></entry>
- </row>
- <row>
- <entry><para>USER.UPDATE</para></entry>
- <entry><para>USER.DISABLE</para></entry>
- <entry><para>TEMPLATE.CREATE</para></entry>
- </row>
- <row>
- <entry><para>TEMPLATE.DELETE</para></entry>
- <entry><para>TEMPLATE.UPDATE</para></entry>
- <entry><para>TEMPLATE.COPY</para></entry>
- </row>
- <row>
- <entry><para>TEMPLATE.DOWNLOAD.START</para></entry>
- <entry><para>TEMPLATE.DOWNLOAD.SUCCESS</para></entry>
- <entry><para>TEMPLATE.DOWNLOAD.FAILED</para></entry>
- </row>
- <row>
- <entry><para>ISO.CREATE</para></entry>
- <entry><para>ISO.DELETE</para></entry>
- <entry><para>ISO.COPY</para></entry>
- </row>
- <row>
- <entry><para>ISO.ATTACH</para></entry>
- <entry><para>ISO.DETACH</para></entry>
- <entry><para>ISO.EXTRACT</para></entry>
- </row>
- <row>
- <entry><para>ISO.UPLOAD</para></entry>
- <entry><para>SERVICE.OFFERING.CREATE</para></entry>
- <entry><para>SERVICE.OFFERING.EDIT</para></entry>
- </row>
- <row>
- <entry><para>SERVICE.OFFERING.DELETE</para></entry>
- <entry><para>DISK.OFFERING.CREATE</para></entry>
- <entry><para>DISK.OFFERING.EDIT</para></entry>
- </row>
- <row>
- <entry><para>DISK.OFFERING.DELETE</para></entry>
- <entry><para>NETWORK.OFFERING.CREATE</para></entry>
- <entry><para>NETWORK.OFFERING.EDIT</para></entry>
- </row>
- <row>
- <entry><para>NETWORK.OFFERING.DELETE</para></entry>
- <entry><para>POD.CREATE</para></entry>
- <entry><para>POD.EDIT</para></entry>
- </row>
- <row>
- <entry><para>POD.DELETE</para></entry>
- <entry><para>ZONE.CREATE</para></entry>
- <entry><para>ZONE.EDIT</para></entry>
- </row>
- <row>
- <entry><para>ZONE.DELETE</para></entry>
- <entry><para>VLAN.IP.RANGE.CREATE</para></entry>
- <entry><para>VLAN.IP.RANGE.DELETE</para></entry>
- </row>
- <row>
- <entry><para>CONFIGURATION.VALUE.EDIT</para></entry>
- <entry><para>SG.AUTH.INGRESS</para></entry>
- <entry><para></para></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </section>
+ <section id="event-types">
+ <title>Event Types</title>
+ <informaltable frame="all">
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <colspec colname="c1" />
+ <colspec colname="c2" />
+ <tbody>
+ <row>
+ <entry><para>VM.CREATE</para></entry>
+ <entry><para>TEMPLATE.EXTRACT</para></entry>
+ <entry><para>SG.REVOKE.INGRESS</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.DESTROY</para></entry>
+ <entry><para>TEMPLATE.UPLOAD</para></entry>
+ <entry><para>HOST.RECONNECT</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.START</para></entry>
+ <entry><para>TEMPLATE.CLEANUP</para></entry>
+ <entry><para>MAINT.CANCEL</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.STOP</para></entry>
+ <entry><para>VOLUME.CREATE</para></entry>
+ <entry><para>MAINT.CANCEL.PS</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.REBOOT</para></entry>
+ <entry><para>VOLUME.DELETE</para></entry>
+ <entry><para>MAINT.PREPARE</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.UPGRADE</para></entry>
+ <entry><para>VOLUME.ATTACH</para></entry>
+ <entry><para>MAINT.PREPARE.PS</para></entry>
+ </row>
+ <row>
+ <entry><para>VM.RESETPASSWORD</para></entry>
+ <entry><para>VOLUME.DETACH</para></entry>
+ <entry><para>VPN.REMOTE.ACCESS.CREATE</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.CREATE</para></entry>
+ <entry><para>VOLUME.UPLOAD</para></entry>
+ <entry><para>VPN.USER.ADD</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.DESTROY</para></entry>
+ <entry><para>SERVICEOFFERING.CREATE</para></entry>
+ <entry><para>VPN.USER.REMOVE</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.START</para></entry>
+ <entry><para>SERVICEOFFERING.UPDATE</para></entry>
+ <entry><para>NETWORK.RESTART</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.STOP</para></entry>
+ <entry><para>SERVICEOFFERING.DELETE</para></entry>
+ <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.REBOOT</para></entry>
+ <entry><para>DOMAIN.CREATE</para></entry>
+ <entry><para>UPLOAD.CUSTOM.CERTIFICATE</para></entry>
+ </row>
+ <row>
+ <entry><para>ROUTER.HA</para></entry>
+ <entry><para>DOMAIN.DELETE</para></entry>
+ <entry><para>STATICNAT.DISABLE</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.CREATE</para></entry>
+ <entry><para>DOMAIN.UPDATE</para></entry>
+ <entry><para>SSVM.CREATE</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.DESTROY</para></entry>
+ <entry><para>SNAPSHOT.CREATE</para></entry>
+ <entry><para>SSVM.DESTROY</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.START</para></entry>
+ <entry><para>SNAPSHOT.DELETE</para></entry>
+ <entry><para>SSVM.START</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.STOP</para></entry>
+ <entry><para>SNAPSHOTPOLICY.CREATE</para></entry>
+ <entry><para>SSVM.STOP</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.REBOOT</para></entry>
+ <entry><para>SNAPSHOTPOLICY.UPDATE</para></entry>
+ <entry><para>SSVM.REBOOT</para></entry>
+ </row>
+ <row>
+ <entry><para>PROXY.HA</para></entry>
+ <entry><para>SNAPSHOTPOLICY.DELETE</para></entry>
+ <entry><para>SSVM.H</para></entry>
+ </row>
+ <row>
+ <entry><para>VNC.CONNECT</para></entry>
+ <entry><para>VNC.DISCONNECT</para></entry>
+ <entry><para>NET.IPASSIGN</para></entry>
+ </row>
+ <row>
+ <entry><para>NET.IPRELEASE</para></entry>
+ <entry><para>NET.RULEADD</para></entry>
+ <entry><para>NET.RULEDELETE</para></entry>
+ </row>
+ <row>
+ <entry><para>NET.RULEMODIFY</para></entry>
+ <entry><para>NETWORK.CREATE</para></entry>
+ <entry><para>NETWORK.DELETE</para></entry>
+ </row>
+ <row>
+ <entry><para>LB.ASSIGN.TO.RULE</para></entry>
+ <entry><para>LB.REMOVE.FROM.RULE</para></entry>
+ <entry><para>LB.CREATE</para></entry>
+ </row>
+ <row>
+ <entry><para>LB.DELETE</para></entry>
+ <entry><para>LB.UPDATE</para></entry>
+ <entry><para>USER.LOGIN</para></entry>
+ </row>
+ <row>
+ <entry><para>USER.LOGOUT</para></entry>
+ <entry><para>USER.CREATE</para></entry>
+ <entry><para>USER.DELETE</para></entry>
+ </row>
+ <row>
+ <entry><para>USER.UPDATE</para></entry>
+ <entry><para>USER.DISABLE</para></entry>
+ <entry><para>TEMPLATE.CREATE</para></entry>
+ </row>
+ <row>
+ <entry><para>TEMPLATE.DELETE</para></entry>
+ <entry><para>TEMPLATE.UPDATE</para></entry>
+ <entry><para>TEMPLATE.COPY</para></entry>
+ </row>
+ <row>
+ <entry><para>TEMPLATE.DOWNLOAD.START</para></entry>
+ <entry><para>TEMPLATE.DOWNLOAD.SUCCESS</para></entry>
+ <entry><para>TEMPLATE.DOWNLOAD.FAILED</para></entry>
+ </row>
+ <row>
+ <entry><para>ISO.CREATE</para></entry>
+ <entry><para>ISO.DELETE</para></entry>
+ <entry><para>ISO.COPY</para></entry>
+ </row>
+ <row>
+ <entry><para>ISO.ATTACH</para></entry>
+ <entry><para>ISO.DETACH</para></entry>
+ <entry><para>ISO.EXTRACT</para></entry>
+ </row>
+ <row>
+ <entry><para>ISO.UPLOAD</para></entry>
+ <entry><para>SERVICE.OFFERING.CREATE</para></entry>
+ <entry><para>SERVICE.OFFERING.EDIT</para></entry>
+ </row>
+ <row>
+ <entry><para>SERVICE.OFFERING.DELETE</para></entry>
+ <entry><para>DISK.OFFERING.CREATE</para></entry>
+ <entry><para>DISK.OFFERING.EDIT</para></entry>
+ </row>
+ <row>
+ <entry><para>DISK.OFFERING.DELETE</para></entry>
+ <entry><para>NETWORK.OFFERING.CREATE</para></entry>
+ <entry><para>NETWORK.OFFERING.EDIT</para></entry>
+ </row>
+ <row>
+ <entry><para>NETWORK.OFFERING.DELETE</para></entry>
+ <entry><para>POD.CREATE</para></entry>
+ <entry><para>POD.EDIT</para></entry>
+ </row>
+ <row>
+ <entry><para>POD.DELETE</para></entry>
+ <entry><para>ZONE.CREATE</para></entry>
+ <entry><para>ZONE.EDIT</para></entry>
+ </row>
+ <row>
+ <entry><para>ZONE.DELETE</para></entry>
+ <entry><para>VLAN.IP.RANGE.CREATE</para></entry>
+ <entry><para>VLAN.IP.RANGE.DELETE</para></entry>
+ </row>
+ <row>
+ <entry><para>CONFIGURATION.VALUE.EDIT</para></entry>
+ <entry><para>SG.AUTH.INGRESS</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/events-log.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events-log.xml b/docs/en-US/events-log.xml
index 5db856a..9de679e 100644
--- a/docs/en-US/events-log.xml
+++ b/docs/en-US/events-log.xml
@@ -25,4 +25,4 @@
<section id="events-log">
<title>Event Logs</title>
<para>There are two types of events logged in the &PRODUCT; Event Log. Standard events log the success or failure of an event and can be used to identify jobs or processes that have failed. There are also long running job events. Events for asynchronous jobs log when a job is scheduled, when it starts, and when it completes. Other long running synchronous jobs log when a job starts, and when it completes. Long running synchronous and asynchronous event logs can be used to gain more information on the status of a pending job or can be used to identify a job that is hanging or has not started. The following sections provide more information on these events..</para>
- </section>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml
index 9d672ff..cbefc54 100644
--- a/docs/en-US/events.xml
+++ b/docs/en-US/events.xml
@@ -23,7 +23,7 @@
-->
<section id="events">
- <xi:include href="events-log.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="events-log.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="standard-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="long-running-job-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="event-log-queries.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />