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
[1/11] git commit: docs: Fix indentation according to coding
convention
Updated Branches:
refs/heads/master f0dfa3f75 -> dcfa5a50b
docs: Fix indentation according to coding convention
The coding convention requires:
* 4 spaces, no tabs
* Unix line endings
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dcfa5a50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dcfa5a50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dcfa5a50
Branch: refs/heads/master
Commit: dcfa5a50b73d2bd205b8ddc7a42833e986a0af00
Parents: f0dfa3f
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Sat Aug 11 22:43:26 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Sat Aug 11 22:43:26 2012 +0200
----------------------------------------------------------------------
docs/en-US/Author_Group.xml | 8 +-
docs/en-US/Book_Info.xml | 40 +-
docs/en-US/Common_Content/Legal_Notice.xml | 30 +-
docs/en-US/Preface.xml | 10 +-
docs/en-US/SSL-keystore-path-and-password.xml | 8 +-
docs/en-US/VPN-user-usage-record-format.xml | 28 +-
docs/en-US/about-clusters.xml | 2 +-
docs/en-US/about-hosts.xml | 2 +-
docs/en-US/about-physical-networks.xml | 2 +-
docs/en-US/about-pods.xml | 2 +-
docs/en-US/about-primary-storage.xml | 2 +-
docs/en-US/about-secondary-storage.xml | 2 +-
docs/en-US/about-working-with-vms.xml | 24 +-
docs/en-US/about-zones.xml | 2 +-
docs/en-US/accessing-vms.xml | 28 +-
docs/en-US/acquire-new-ip-address.xml | 20 +-
docs/en-US/add-additional-guest-network.xml | 34 +-
docs/en-US/add-ingress-egress-rules.xml | 66 +-
docs/en-US/add-iso.xml | 130 +-
docs/en-US/add-load-balancer-rule.xml | 40 +-
.../en-US/add-password-management-to-templates.xml | 10 +-
docs/en-US/add-security-group.xml | 24 +-
docs/en-US/added-API-commands.xml | 284 +-
docs/en-US/added-cloudPlatform-error-codes.xml | 224 +-
.../adding-IP-addresses-for-the-public-network.xml | 40 +-
docs/en-US/admin-guide.xml | 2 +-
docs/en-US/advanced-zone-configuration.xml | 2 +-
docs/en-US/advanced-zone-network-traffic-types.xml | 2 +-
...dvanced-zone-physical-network-configuration.xml | 6 +-
docs/en-US/alerts.xml | 60 +-
docs/en-US/api-reference.xml | 14 +-
docs/en-US/appendix-a-time-zones.xml | 234 +-
docs/en-US/asynchronous-commands-example.xml | 174 +-
docs/en-US/asynchronous-commands.xml | 26 +-
docs/en-US/attach-iso-to-vm.xml | 26 +-
docs/en-US/attaching-volume.xml | 36 +-
.../automatic-snapshot-creation-retention.xml | 10 +-
docs/en-US/basic-zone-configuration.xml | 2 +-
docs/en-US/basic-zone-network-traffic-types.xml | 2 +-
.../basic-zone-physical-network-configuration.xml | 8 +-
docs/en-US/best-practices-for-vms.xml | 6 +-
docs/en-US/best-practices-primary-storage.xml | 12 +-
docs/en-US/best-practices-secondary-storage.xml | 14 +-
docs/en-US/best-practices-templates.xml | 4 +-
.../change-network-offering-on-guest-network.xml | 36 +-
docs/en-US/change-to-behavior-of-list-commands.xml | 116 +-
docs/en-US/changing-root-password.xml | 2 +-
docs/en-US/changing-secondary-storage-ip.xml | 40 +-
docs/en-US/changing-secondary-storage-servers.xml | 20 +-
docs/en-US/changing-secondary-storage-serversp.xml | 20 +-
docs/en-US/changing-service-offering-for-vm.xml | 46 +-
docs/en-US/changing-vm-name-os-group.xml | 58 +-
docs/en-US/cloud-infrastructure-concepts.xml | 2 +-
docs/en-US/cloud-infrastructure-overview.xml | 40 +-
docs/en-US/cloudstack-admin.xml | 4 +-
docs/en-US/cloudstack.xml | 2 +-
docs/en-US/cloudstack_admin.xml | 4 +-
docs/en-US/cloudstack_developers.xml | 4 +-
docs/en-US/cloudstack_features.xml | 84 +-
docs/en-US/cloudstack_installation.xml | 4 +-
docs/en-US/cloudstack_system_requirements.xml | 88 +-
docs/en-US/cloudstack_trial_installation.xml | 4 +-
docs/en-US/cloudstack_whatis.xml | 28 +-
docs/en-US/cluster-add.xml | 4 +-
docs/en-US/compatibility-matrix.xml | 180 +-
docs/en-US/concepts.xml | 8 +-
.../configure-guest-traffic-in-advanced-zone.xml | 50 +-
docs/en-US/configure-usage-server.xml | 2 +-
docs/en-US/configure-vpn.xml | 52 +-
docs/en-US/convert-hyperv-vm-to-template.xml | 84 +-
docs/en-US/create-bare-metal-template.xml | 42 +-
docs/en-US/create-template-from-existing-vm.xml | 46 +-
docs/en-US/create-templates-overview.xml | 18 +-
docs/en-US/create-windows-template.xml | 24 +-
docs/en-US/creating-new-volumes.xml | 32 +-
docs/en-US/creating-vms.xml | 46 +-
docs/en-US/dates-in-usage-record.xml | 14 +-
docs/en-US/default-template.xml | 12 +-
docs/en-US/delete-templates.xml | 6 +-
docs/en-US/deleting-vms.xml | 32 +-
docs/en-US/deployment-architecture-overview.xml | 36 +-
docs/en-US/detach-move-volumes.xml | 36 +-
docs/en-US/developer-getting-started.xml | 24 +-
docs/en-US/developer-guide.xml | 4 +-
docs/en-US/developer-introduction.xml | 6 +-
docs/en-US/developer_guide.xml | 4 +-
docs/en-US/disk-volume-usage-record-format.xml | 38 +-
docs/en-US/dns-dhcp.xml | 4 +-
docs/en-US/domains.xml | 6 +-
docs/en-US/enable-disable-static-nat.xml | 36 +-
docs/en-US/enable-security-groups.xml | 4 +-
docs/en-US/enabling-api-call-expiration.xml | 28 +-
docs/en-US/enabling-port-8096.xml | 24 +-
docs/en-US/end-user-ui-overview.xml | 4 +-
docs/en-US/error-handling.xml | 8 +-
docs/en-US/event-log-queries.xml | 2 +-
docs/en-US/event-types.xml | 392 +-
docs/en-US/events-log.xml | 2 +-
docs/en-US/events.xml | 2 +-
.../example-response-from-listUsageRecords.xml | 60 +-
docs/en-US/export-template.xml | 4 +-
docs/en-US/feature-overview.xml | 84 +-
docs/en-US/firewall-rules.xml | 60 +-
docs/en-US/first_ms_node_install.xml | 56 +-
docs/en-US/globally-configured-limit.xml | 148 +-
docs/en-US/globally-configured-limits.xml | 148 +-
docs/en-US/guest-ip-ranges.xml | 4 +-
docs/en-US/guest-network.xml | 6 +-
docs/en-US/guest-traffic.xml | 24 +-
docs/en-US/host-add.xml | 4 +-
.../hypervisor-support-for-primarystorage.xml | 154 +-
docs/en-US/import-ami.xml | 72 +-
docs/en-US/incremental-snapshots-backup.xml | 52 +-
...l-setup-of-external-firewalls-loadbalancers.xml | 4 +-
docs/en-US/initialize-and-test.xml | 4 +-
.../install-database-on-management-server-node.xml | 126 +-
docs/en-US/install-database-on-separate-node.xml | 136 +-
.../install-management-server-multi-nodes.xml | 80 +-
docs/en-US/install-management-server.xml | 50 +-
docs/en-US/installation-complete.xml | 26 +-
docs/en-US/installation-steps-overview.xml | 110 +-
docs/en-US/installation.xml | 10 +-
docs/en-US/installation_overview.xml | 14 +-
docs/en-US/introduction.xml | 6 +-
docs/en-US/ip-load-balancing.xml | 16 +-
docs/en-US/ipaddress-usage-record-format.xml | 32 +-
docs/en-US/job-status.xml | 14 +-
docs/en-US/linux-installation.xml | 44 +-
...cy-port-forwarding-rule-usage-record-format.xml | 28 +-
docs/en-US/log-in.xml | 12 +-
docs/en-US/long-running-job-events.xml | 2 +-
.../en-US/maintenance-mode-for-primary-storage.xml | 6 +-
docs/en-US/making-api-request.xml | 42 +-
docs/en-US/management-server-install-flow.xml | 18 +-
.../management-server-installation-overview.xml | 40 +-
docs/en-US/management-server-overview.xml | 66 +-
.../en-US/management_server_multi_node_install.xml | 8 +-
docs/en-US/management_server_overview.xml | 60 +-
docs/en-US/manual-live-migration.xml | 52 +-
docs/en-US/max-result-page-returned.xml | 26 +-
.../migrate-datadisk-volume-new-storage-pool.xml | 18 +-
...grate-vm-rootvolume-volume-new-storage-pool.xml | 22 +-
docs/en-US/minimum-system-requirements.xml | 132 +-
docs/en-US/multi_node_overview.xml | 36 +-
.../en-US/network-offering-usage-record-format.xml | 34 +-
docs/en-US/network-usage-record-format.xml | 28 +-
docs/en-US/networking-in-a-pod.xml | 30 +-
docs/en-US/networking-in-a-zone.xml | 20 +-
docs/en-US/networking-overview.xml | 18 +-
docs/en-US/networking_overview.xml | 18 +-
docs/en-US/nfs-shares-on-management-server.xml | 114 +-
docs/en-US/nfs-shares-on-separate-server.xml | 48 +-
.../physical-network-configuration-settings.xml | 2 +-
docs/en-US/pod-add.xml | 4 +-
docs/en-US/port-forwarding.xml | 46 +-
docs/en-US/prepare-nfs-shares.xml | 24 +-
docs/en-US/prepare-os.xml | 156 +-
docs/en-US/prepare-system-vm-template.xml | 56 +-
docs/en-US/prepare_os.xml | 148 +-
docs/en-US/primary-storage-add.xml | 4 +-
docs/en-US/primary-storage.xml | 6 +-
docs/en-US/private-public-template.xml | 8 +-
docs/en-US/provisioning-steps-overview.xml | 40 +-
docs/en-US/provisioning-steps.xml | 4 +-
docs/en-US/provisioning.xml | 4 +-
docs/en-US/query-filter.xml | 50 +-
docs/en-US/release-ip-address.xml | 30 +-
docs/en-US/release-notes-3.0.4.xml | 4764 +++++++-------
docs/en-US/removed-API-commands.xml | 14 +-
docs/en-US/requirements-templates.xml | 8 +-
docs/en-US/resizing-volumes.xml | 22 +-
docs/en-US/response-formats.xml | 60 +-
docs/en-US/responses.xml | 2 +-
docs/en-US/roles.xml | 16 +-
docs/en-US/root-admin-ui-overview.xml | 4 +-
docs/en-US/runtime-behavior-of-primary-storage.xml | 8 +-
docs/en-US/search-base.xml | 40 +-
docs/en-US/search-user-bind-dn.xml | 42 +-
docs/en-US/secondary-storage-add.xml | 4 +-
.../en-US/set-monitor-total-vm-limits-per-host.xml | 2 +-
docs/en-US/signing-api-requests.xml | 68 +-
.../en-US/sticky-session-policies-for-lb-rules.xml | 8 +-
docs/en-US/stopped-vm.xml | 18 +-
docs/en-US/stopping-and-starting-vms.xml | 4 +-
docs/en-US/storage-tags.xml | 6 +-
docs/en-US/storage.xml | 6 +-
.../template-iso-snapshot-usage-record-format.xml | 32 +-
docs/en-US/ui.xml | 4 +-
...pgrade-virtual-router-with-service-offering.xml | 2 +-
docs/en-US/upload-existing-volume-to-vm.xml | 100 +-
docs/en-US/upload-template.xml | 74 +-
docs/en-US/usage-record-format.xml | 18 +-
docs/en-US/usage-types.xml | 190 +-
docs/en-US/user-services-overview.xml | 122 +-
docs/en-US/using-multiple-guest-networks.xml | 10 +-
docs/en-US/using-netscaler-load-balancers.xml | 4 +-
docs/en-US/using-swift-for-secondary-storage.xml | 8 +-
docs/en-US/using-vpn-with-mac.xml | 6 +-
docs/en-US/using-vpn-with-windows.xml | 32 +-
docs/en-US/virtual-machine-usage-record-format.xml | 38 +-
docs/en-US/vm-lifecycle.xml | 34 +-
docs/en-US/vm-storage-migration.xml | 8 +-
docs/en-US/volume-deletion-garbage-collection.xml | 20 +-
docs/en-US/volume-status.xml | 8 +-
docs/en-US/vpn.xml | 30 +-
docs/en-US/whatis.xml | 38 +-
docs/en-US/whats-in-this-adminguide.xml | 10 +-
docs/en-US/who-should-read-installation.xml | 16 +-
docs/en-US/windows-installation.xml | 4 +-
docs/en-US/working-with-iso.xml | 12 +-
docs/en-US/working-with-snapshots.xml | 18 +-
docs/en-US/working-with-templates.xml | 10 +-
docs/en-US/working-with-usage-data.xml | 2 +-
docs/en-US/working-with-volumes.xml | 10 +-
docs/en-US/zone-add.xml | 2 +-
docs/publican-cloudstack/en-US/Feedback.xml | 22 +-
docs/runbook/en-US/Author_Group.xml | 8 +-
docs/runbook/en-US/Book_Info.xml | 40 +-
docs/runbook/en-US/Chapter.xml | 2 +-
docs/runbook/en-US/Environment.xml | 12 +-
docs/runbook/en-US/Management.xml | 10 +-
docs/runbook/en-US/Overview.xml | 20 +-
docs/runbook/en-US/Preface.xml | 10 +-
docs/runbook/en-US/Revision_History.xml | 28 +-
docs/runbook/en-US/Runbook.xml | 10 +-
docs/runbook/en-US/kvm.xml | 2 +-
226 files changed, 6373 insertions(+), 6373 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Author_Group.xml b/docs/en-US/Author_Group.xml
index 65080cf..ba9e651 100644
--- a/docs/en-US/Author_Group.xml
+++ b/docs/en-US/Author_Group.xml
@@ -24,9 +24,9 @@
<authorgroup>
- <author>
- <firstname>Apache</firstname>
- <surname>CloudStack</surname>
- </author>
+ <author>
+ <firstname>Apache</firstname>
+ <surname>CloudStack</surname>
+ </author>
</authorgroup>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Book_Info.xml b/docs/en-US/Book_Info.xml
index 7d3953f..3bd6efa 100644
--- a/docs/en-US/Book_Info.xml
+++ b/docs/en-US/Book_Info.xml
@@ -24,24 +24,24 @@
-->
<bookinfo id="book-release-notes-3.0.4">
- <title>&PRODUCT; Guide</title>
- <subtitle>Revised August 9, 2012 10:48 pm Pacific</subtitle>
- <productname>Apache CloudStack</productname>
- <productnumber>4.0</productnumber>
- <edition>1</edition>
- <pubsnumber></pubsnumber>
- <abstract>
- <para>
- Complete technical documentation of &PRODUCT;.
- </para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>&PRODUCT; Guide</title>
+ <subtitle>Revised August 9, 2012 10:48 pm Pacific</subtitle>
+ <productname>Apache CloudStack</productname>
+ <productnumber>4.0</productnumber>
+ <edition>1</edition>
+ <pubsnumber></pubsnumber>
+ <abstract>
+ <para>
+ Complete technical documentation of &PRODUCT;.
+ </para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</bookinfo>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/Common_Content/Legal_Notice.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Common_Content/Legal_Notice.xml b/docs/en-US/Common_Content/Legal_Notice.xml
index 0fe5eb5..d35b5c6 100644
--- a/docs/en-US/Common_Content/Legal_Notice.xml
+++ b/docs/en-US/Common_Content/Legal_Notice.xml
@@ -2,20 +2,20 @@
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
]>
<legalnotice>
- <para>
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
- </para>
- <para>
- http://www.apache.org/licenses/LICENSE-2.0
- </para>
- <para>
- Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- </para>
- <para>
- Apache CloudStack is an effort undergoing incubation at The Apache Software Foundation (ASF).
- </para>
- <para>
- Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
- </para>
+ <para>
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ </para>
+ <para>
+ http://www.apache.org/licenses/LICENSE-2.0
+ </para>
+ <para>
+ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ </para>
+ <para>
+ Apache CloudStack is an effort undergoing incubation at The Apache Software Foundation (ASF).
+ </para>
+ <para>
+ Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+ </para>
</legalnotice>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/Preface.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Preface.xml b/docs/en-US/Preface.xml
index ff90bec..b33d62e 100644
--- a/docs/en-US/Preface.xml
+++ b/docs/en-US/Preface.xml
@@ -4,10 +4,10 @@
%BOOK_ENTITIES;
]>
<preface id="pref-cloudstack-Preface">
- <title>Preface</title>
- <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </xi:fallback>
- </xi:include>
+ <title>Preface</title>
+ <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>
</preface>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/SSL-keystore-path-and-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/SSL-keystore-path-and-password.xml b/docs/en-US/SSL-keystore-path-and-password.xml
index 4819fdc..e75c3d0 100644
--- a/docs/en-US/SSL-keystore-path-and-password.xml
+++ b/docs/en-US/SSL-keystore-path-and-password.xml
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<section id="SSL-keystore-path-and-password">
- <title>SSL Keystore Path and Password</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>SSL Keystore Path and Password</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/VPN-user-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/VPN-user-usage-record-format.xml b/docs/en-US/VPN-user-usage-record-format.xml
index af9315f..5db6690 100644
--- a/docs/en-US/VPN-user-usage-record-format.xml
+++ b/docs/en-US/VPN-user-usage-record-format.xml
@@ -1,17 +1,17 @@
<section id="VPN-user-usage-record-format">
- <title>VPN User Usage Record Format</title>
- <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 – VPN user ID</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</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>
+ <title>VPN User Usage Record Format</title>
+ <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 – VPN user ID</para></listitem>
+ <listitem><para>usagetype – A number representing the usage type (see Usage Types)</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/about-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-clusters.xml b/docs/en-US/about-clusters.xml
index 7f46b3f..e328cba 100644
--- a/docs/en-US/about-clusters.xml
+++ b/docs/en-US/about-clusters.xml
@@ -23,7 +23,7 @@
-->
<section id="about-clusters">
- <title>About Clusters</title>
+ <title>About Clusters</title>
<para>A cluster provides a way to group hosts. To be precise, a cluster is a XenServer server pool, a set of KVM servers, a set of OVM hosts, or a VMware cluster preconfigured in vCenter. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared primary storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user.</para>
<para>A cluster is the third-largest organizational unit within a &PRODUCT; deployment. Clusters are contained within pods, and pods are contained within zones. Size of the cluster is limited by the underlying hypervisor, although the &PRODUCT; recommends less in most cases; see Best Practices.</para>
<para>A cluster consists of one or more hosts and one or more primary storage servers.</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-hosts.xml b/docs/en-US/about-hosts.xml
index 93f178f..956c695 100644
--- a/docs/en-US/about-hosts.xml
+++ b/docs/en-US/about-hosts.xml
@@ -23,7 +23,7 @@
-->
<section id="about-hosts">
- <title>About Hosts</title>
+ <title>About Hosts</title>
<para>A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs. For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts.</para>
<para>The host is the smallest organizational unit within a &PRODUCT; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.</para>
<para>Hosts in a &PRODUCT; deployment:</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-physical-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-physical-networks.xml b/docs/en-US/about-physical-networks.xml
index 7a9889a..b35aeeb 100644
--- a/docs/en-US/about-physical-networks.xml
+++ b/docs/en-US/about-physical-networks.xml
@@ -23,7 +23,7 @@
-->
<section id="about-physical-networks">
- <title>About Physical Networks</title>
+ <title>About Physical Networks</title>
<para>Part of adding a zone is setting up the physical network. One or (in an advanced zone) more physical networks can be associated with each zone. The network corresponds to a NIC on the hypervisor host. Each physical network can carry one or more types of network traffic. The choices of traffic type for each network vary depending on whether you are creating a zone with basic networking or advanced networking.</para>
<para>A physical network is the actual network hardware and wiring in a zone. A zone can have multiple physical networks. An administrator can:</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-pods.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-pods.xml b/docs/en-US/about-pods.xml
index 711db6b..ed3520c 100644
--- a/docs/en-US/about-pods.xml
+++ b/docs/en-US/about-pods.xml
@@ -23,7 +23,7 @@
-->
<section id="about-pods">
- <title>About Pods</title>
+ <title>About Pods</title>
<para>A pod often represents a single rack. Hosts in the same pod are in the same subnet.</para>
<para>A pod is the second-largest organizational unit within a &PRODUCT; deployment. Pods are contained within zones. Each zone can contain one or more pods.</para>
<para>Pods are not visible to the end user.</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-primary-storage.xml b/docs/en-US/about-primary-storage.xml
index 91262c3..68d7a25 100644
--- a/docs/en-US/about-primary-storage.xml
+++ b/docs/en-US/about-primary-storage.xml
@@ -23,7 +23,7 @@
-->
<section id="about-primary-storage">
- <title>About Primary Storage</title>
+ <title>About Primary Storage</title>
<para>Primary storage is associated with a cluster, and it stores the disk volumes for all the VMs running on hosts in that cluster. You can add multiple primary storage servers to a cluster. At least one is required. It is typically located close to the hosts for increased performance.</para>
<para>&PRODUCT; is designed to work with all standards-compliant iSCSI and NFS servers that are supported by the underlying hypervisor, including, for example:</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-secondary-storage.xml b/docs/en-US/about-secondary-storage.xml
index ef2913f..c4df0b8 100644
--- a/docs/en-US/about-secondary-storage.xml
+++ b/docs/en-US/about-secondary-storage.xml
@@ -23,7 +23,7 @@
-->
<section id="about-secondary-storage">
- <title>About Secondary Storage</title>
+ <title>About Secondary Storage</title>
<para>Secondary storage is associated with a zone, and it stores the following:</para>
<itemizedlist>
<listitem><para>Templates — OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-working-with-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-working-with-vms.xml b/docs/en-US/about-working-with-vms.xml
index 920c4e8..47153e2 100644
--- a/docs/en-US/about-working-with-vms.xml
+++ b/docs/en-US/about-working-with-vms.xml
@@ -23,17 +23,17 @@
-->
<section id="about-working-with-vms">
- <title>About Working with Virtual Machines</title>
- <para>&PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs executing in the cloud. &PRODUCT; provides several guest management operations for end users and administrators. VMs may be stopped, started, rebooted, and destroyed.</para>
- <para>Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are available for end users to organize their VMs. Each VM can have three names for use in different contexts. Only two of these names can be controlled by the user:</para>
- <itemizedlist>
- <listitem><para>Instance name – a unique, immutable ID that is generated by &PRODUCT; and can not be modified by the user. This name conforms to the requirements in IETF RFC 1123.</para></listitem>
- <listitem><para>Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user. Defaults to instance name.</para></listitem>
- <listitem><para>Name – host name that the DHCP server assigns to the VM. Can be set by the user. Defaults to instance name</para></listitem>
- </itemizedlist>
- <para>Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by the system. If the system detects that the VM is down, it will attempt to restart the VM, possibly on a different host. For more information, see HA-Enabled Virtual Machines on </para>
- <para>Each new VM is allocated one public IP address. When the VM is started, &PRODUCT; automatically creates a static NAT between this public IP address and the private IP address of the VM.</para>
- <para>If elastic IP is in use (with the NetScaler load balancer), the IP address initially allocated to the new VM is not marked as elastic. The user must replace the automatically configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between this new IP and the guest VM’s private IP. The VM’s original IP address is then released and returned to the pool of available public IPs.</para>
- <para>&PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the “shutdown” command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go through the &PRODUCT; UI or API.</para>
+ <title>About Working with Virtual Machines</title>
+ <para>&PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs executing in the cloud. &PRODUCT; provides several guest management operations for end users and administrators. VMs may be stopped, started, rebooted, and destroyed.</para>
+ <para>Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are available for end users to organize their VMs. Each VM can have three names for use in different contexts. Only two of these names can be controlled by the user:</para>
+ <itemizedlist>
+ <listitem><para>Instance name – a unique, immutable ID that is generated by &PRODUCT; and can not be modified by the user. This name conforms to the requirements in IETF RFC 1123.</para></listitem>
+ <listitem><para>Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user. Defaults to instance name.</para></listitem>
+ <listitem><para>Name – host name that the DHCP server assigns to the VM. Can be set by the user. Defaults to instance name</para></listitem>
+ </itemizedlist>
+ <para>Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by the system. If the system detects that the VM is down, it will attempt to restart the VM, possibly on a different host. For more information, see HA-Enabled Virtual Machines on </para>
+ <para>Each new VM is allocated one public IP address. When the VM is started, &PRODUCT; automatically creates a static NAT between this public IP address and the private IP address of the VM.</para>
+ <para>If elastic IP is in use (with the NetScaler load balancer), the IP address initially allocated to the new VM is not marked as elastic. The user must replace the automatically configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between this new IP and the guest VM’s private IP. The VM’s original IP address is then released and returned to the pool of available public IPs.</para>
+ <para>&PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the “shutdown” command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go through the &PRODUCT; UI or API.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/about-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-zones.xml b/docs/en-US/about-zones.xml
index e89e155..a05a9a6 100644
--- a/docs/en-US/about-zones.xml
+++ b/docs/en-US/about-zones.xml
@@ -23,7 +23,7 @@
-->
<section id="about-zones">
- <title>About Zones</title>
+ <title>About Zones</title>
<para>A zone is the largest organizational unit within a &PRODUCT; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).</para>
<para>A zone consists of:</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/accessing-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/accessing-vms.xml b/docs/en-US/accessing-vms.xml
index a6f86f5..d69d021 100644
--- a/docs/en-US/accessing-vms.xml
+++ b/docs/en-US/accessing-vms.xml
@@ -23,19 +23,19 @@
-->
<section id="accessing-vms">
- <title>Accessing VMs</title>
- <para>Any user can access their own virtual machines. The administrator can access all VMs running in the cloud.</para>
- <para>To access a VM through the &PRODUCT; UI:</para>
- <orderedlist>
- <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
- <listitem><para>Click Instances, then click the name of a running VM.</para></listitem>
- <listitem><para>Click the View Console button <inlinegraphic format="PNG" fileref="images/icon.png"/>.</para></listitem>
- </orderedlist>
- <para>To access a VM directly over the network:</para>
- <orderedlist>
- <listitem><para>The VM must have some port open to incoming traffic. For example, in a basic zone, a new VM might be assigned to a security group which allows incoming traffic. This depends on what security group you picked when creating the VM. In other cases, you can open a port by setting up a port forwarding policy. See IP Forwarding and Firewalling.</para></listitem>
- <listitem><para>If a port is open but you can not access the VM using ssh, it’s possible that ssh is not already enabled on the VM. This will depend on whether ssh is enabled in the template you picked when creating the VM. Access the VM through the &PRODUCT; UI and enable ssh on the machine using the commands for the VM’s operating system.</para></listitem>
- <listitem><para>If the network has an external firewall device, you will need to create a firewall rule to allow access. See IP Forwarding and Firewalling.</para></listitem>
- </orderedlist>
+ <title>Accessing VMs</title>
+ <para>Any user can access their own virtual machines. The administrator can access all VMs running in the cloud.</para>
+ <para>To access a VM through the &PRODUCT; UI:</para>
+ <orderedlist>
+ <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+ <listitem><para>Click Instances, then click the name of a running VM.</para></listitem>
+ <listitem><para>Click the View Console button <inlinegraphic format="PNG" fileref="images/icon.png"/>.</para></listitem>
+ </orderedlist>
+ <para>To access a VM directly over the network:</para>
+ <orderedlist>
+ <listitem><para>The VM must have some port open to incoming traffic. For example, in a basic zone, a new VM might be assigned to a security group which allows incoming traffic. This depends on what security group you picked when creating the VM. In other cases, you can open a port by setting up a port forwarding policy. See IP Forwarding and Firewalling.</para></listitem>
+ <listitem><para>If a port is open but you can not access the VM using ssh, it’s possible that ssh is not already enabled on the VM. This will depend on whether ssh is enabled in the template you picked when creating the VM. Access the VM through the &PRODUCT; UI and enable ssh on the machine using the commands for the VM’s operating system.</para></listitem>
+ <listitem><para>If the network has an external firewall device, you will need to create a firewall rule to allow access. See IP Forwarding and Firewalling.</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/acquire-new-ip-address.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/acquire-new-ip-address.xml b/docs/en-US/acquire-new-ip-address.xml
index 5c02f8a..8af130c 100644
--- a/docs/en-US/acquire-new-ip-address.xml
+++ b/docs/en-US/acquire-new-ip-address.xml
@@ -23,14 +23,14 @@
-->
<section id="acquire-new-ip-address">
- <title>Acquiring a New IP Address</title>
- <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 Acquire New IP, and click Yes in the confirmation dialog.</para>
- <para>You are prompted for confirmation because, typically, IP addresses are a limited resource. Within a few moments, the new IP address should appear with the state Allocated. You can now use the IP address in port forwarding or static NAT rules.</para>
- </listitem>
- </orderedlist>
+ <title>Acquiring a New IP Address</title>
+ <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 Acquire New IP, and click Yes in the confirmation dialog.</para>
+ <para>You are prompted for confirmation because, typically, IP addresses are a limited resource. Within a few moments, the new IP address should appear with the state Allocated. You can now use the IP address in port forwarding or static NAT rules.</para>
+ </listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/add-additional-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-additional-guest-network.xml b/docs/en-US/add-additional-guest-network.xml
index e9ddd33..57e7ffd 100644
--- a/docs/en-US/add-additional-guest-network.xml
+++ b/docs/en-US/add-additional-guest-network.xml
@@ -23,21 +23,21 @@
-->
<section id="add-additional-guest-network">
- <title>Adding an Additional Guest Network</title>
- <itemizedlist>
- <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 Add guest network. Provide the following information: </para>
- <itemizedlist>
- <listitem><para>Name. The name of the network. This will be user-visible. </para></listitem>
- <listitem><para>Description. The description of the network. This will be user-visible.</para></listitem>
- <listitem><para>Network offering. If the administrator has configured multiple network offerings, select the one you want to use for this network.</para></listitem>
- <listitem><para>Pod. The name of the pod this network applies to. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod. </para></listitem>
- <listitem><para>VLAN ID. The VLAN tag for this network.</para></listitem>
- <listitem><para>Gateway. The gateway that the guests should use.</para></listitem>
- <listitem><para>Netmask. The netmask in use on the subnet the guests will use.</para></listitem>
- <listitem><para>Start IP/End IP. Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. We strongly recommend the use of multiple NICs. If multiple NICs are used, they may be in a different subnet. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.</para></listitem></itemizedlist></listitem>
- <listitem><para>Click Create.</para></listitem>
- </itemizedlist>
+ <title>Adding an Additional Guest Network</title>
+ <itemizedlist>
+ <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 Add guest network. Provide the following information: </para>
+ <itemizedlist>
+ <listitem><para>Name. The name of the network. This will be user-visible. </para></listitem>
+ <listitem><para>Description. The description of the network. This will be user-visible.</para></listitem>
+ <listitem><para>Network offering. If the administrator has configured multiple network offerings, select the one you want to use for this network.</para></listitem>
+ <listitem><para>Pod. The name of the pod this network applies to. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod. </para></listitem>
+ <listitem><para>VLAN ID. The VLAN tag for this network.</para></listitem>
+ <listitem><para>Gateway. The gateway that the guests should use.</para></listitem>
+ <listitem><para>Netmask. The netmask in use on the subnet the guests will use.</para></listitem>
+ <listitem><para>Start IP/End IP. Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. We strongly recommend the use of multiple NICs. If multiple NICs are used, they may be in a different subnet. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.</para></listitem></itemizedlist></listitem>
+ <listitem><para>Click Create.</para></listitem>
+ </itemizedlist>
- </section>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/add-ingress-egress-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-ingress-egress-rules.xml b/docs/en-US/add-ingress-egress-rules.xml
index 4ea072b..964045f 100644
--- a/docs/en-US/add-ingress-egress-rules.xml
+++ b/docs/en-US/add-ingress-egress-rules.xml
@@ -23,37 +23,37 @@
-->
<section id="add-ingress-egress-rules">
- <title>Adding Ingress and Egress Rules to a Security Group</title>
- <itemizedlist>
- <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>In Select view, choose Security Groups, then click the security group you want .</para></listitem>
- <listitem><para>To add an ingress rule, click the Ingress Rules tab and fill out the following fields to specify what network traffic is allowed into VM instances in this security group. If no ingress rules are specified, then no traffic will be allowed in, except for responses to any traffic that has been allowed out through an egress rule.</para>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the source of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow incoming traffic from all VMs in another security group</para></listitem>
- <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that sources will use to send traffic to the security group. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
- <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the incoming traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
- <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be accepted.</para></listitem>
- <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To accept only traffic from IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
- <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To accept only traffic from another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter the same name you used in step 7.</para></listitem>
- </itemizedlist>
- <para>The following example allows inbound HTTP access from anywhere:</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/http-access.png" />
- </imageobject>
- <textobject><phrase>httpaccess.png: allows inbound HTTP access from anywhere</phrase></textobject>
- </mediaobject>
- </listitem>
- <listitem><para>To add an egress rule, click the Egress Rules tab and fill out the following fields to specify what type of traffic is allowed to be sent out of VM instances in this security group. If no egress rules are specified, then all traffic will be allowed out. Once egress rules are specified, the following types of traffic are allowed out: traffic specified in egress rules; queries to DNS and DHCP servers; and responses to any traffic that has been allowed in through an ingress rule</para>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the destination of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow outgoing traffic to all VMs in another security group.</para></listitem>
- <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that VMs will use to send outgoing traffic. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
- <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the outgoing traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
- <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be sent</para></listitem>
- <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To send traffic only to IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the destination. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
- <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To allow traffic to be sent to another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter its name.</para></listitem>
- </itemizedlist></listitem>
- <listitem><para>Click Add.</para></listitem>
- </itemizedlist>
+ <title>Adding Ingress and Egress Rules to a Security Group</title>
+ <itemizedlist>
+ <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>In Select view, choose Security Groups, then click the security group you want .</para></listitem>
+ <listitem><para>To add an ingress rule, click the Ingress Rules tab and fill out the following fields to specify what network traffic is allowed into VM instances in this security group. If no ingress rules are specified, then no traffic will be allowed in, except for responses to any traffic that has been allowed out through an egress rule.</para>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the source of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow incoming traffic from all VMs in another security group</para></listitem>
+ <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that sources will use to send traffic to the security group. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
+ <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the incoming traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
+ <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be accepted.</para></listitem>
+ <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To accept only traffic from IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
+ <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To accept only traffic from another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter the same name you used in step 7.</para></listitem>
+ </itemizedlist>
+ <para>The following example allows inbound HTTP access from anywhere:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/http-access.png" />
+ </imageobject>
+ <textobject><phrase>httpaccess.png: allows inbound HTTP access from anywhere</phrase></textobject>
+ </mediaobject>
+ </listitem>
+ <listitem><para>To add an egress rule, click the Egress Rules tab and fill out the following fields to specify what type of traffic is allowed to be sent out of VM instances in this security group. If no egress rules are specified, then all traffic will be allowed out. Once egress rules are specified, the following types of traffic are allowed out: traffic specified in egress rules; queries to DNS and DHCP servers; and responses to any traffic that has been allowed in through an ingress rule</para>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the destination of the traffic will be defined by IP address (CIDR) or an existing security group in a &PRODUCT; account (Account). Choose Account if you want to allow outgoing traffic to all VMs in another security group.</para></listitem>
+ <listitem><para><emphasis role="bold">Protocol</emphasis>. The networking protocol that VMs will use to send outgoing traffic. TCP and UDP are typically used for data exchange and end-user communications. ICMP is typically used to send error messages or network monitoring data.</para></listitem>
+ <listitem><para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of listening ports that are the destination for the outgoing traffic. If you are opening a single port, use the same number in both fields.</para></listitem>
+ <listitem><para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of message and error code that will be sent</para></listitem>
+ <listitem><para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To send traffic only to IP addresses within a particular address block, enter a CIDR or a comma-separated list of CIDRs. The CIDR is the base IP address of the destination. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para></listitem>
+ <listitem><para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To allow traffic to be sent to another security group, enter the &PRODUCT; account and name of a security group that has already been defined in that account. To allow traffic between VMs within the security group you are editing now, enter its name.</para></listitem>
+ </itemizedlist></listitem>
+ <listitem><para>Click Add.</para></listitem>
+ </itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/add-iso.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-iso.xml b/docs/en-US/add-iso.xml
index 9376bc7..f56d10c 100644
--- a/docs/en-US/add-iso.xml
+++ b/docs/en-US/add-iso.xml
@@ -23,69 +23,69 @@
-->
<section id="add-iso">
- <title>Adding an ISO</title>
- <para>To make additional operating system or other software available for use with guest VMs, you can add an ISO. The ISO is typically thought of as an operating system image, but you can also add ISOs for other types of software, such as desktop applications that you want to be installed as part of a template.</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>In Select View, choose ISOs.</para></listitem>
- <listitem><para>Click Add ISO.</para></listitem>
- <listitem><para>In the Add ISO screen, provide the following:</para>
- <itemizedlist>
- <listitem><para>Name. Short name for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
- <listitem><para>Description. Display test for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
- <listitem><para>URL. The URL that hosts the ISO image. The Management Server must be able to access this location via HTTP. If needed you can place the ISO image directly on the Management Server</para></listitem>
- <listitem><para>Zone. Choose the zone where you want the ISO to be available, or All Zones to make it available throughout &PRODUCT;.</para></listitem>
- <listitem><para>Bootable. Whether or not a guest could boot off this ISO image. For example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable.</para></listitem>
- <listitem><para>OS Type. 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 your desired ISO image is listed, choose it.</para></listitem>
- <listitem><para>If the OS Type of the ISO is not listed or if the ISO is not bootable, choose Other.</para></listitem>
- <listitem><para>(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV (32-bit) or Other PV (64-bit)</para></listitem>
- <listitem><para>(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have an IDE root disk. The PV-enabled types are:</para>
- <informaltable>
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <tbody>
- <row>
- <entry><para>Fedora 13</para></entry>
- <entry><para>Fedora 12</para></entry>
- <entry><para>Fedora 11</para></entry>
-
- </row>
- <row>
- <entry><para>Fedora 10</para></entry>
- <entry><para>Fedora 9</para></entry>
- <entry><para>Other PV</para></entry>
-
- </row>
- <row>
- <entry><para>Debian GNU/Linux</para></entry>
- <entry><para>CentOS 5.3</para></entry>
- <entry><para>CentOS 5.4</para></entry>
- </row>
- <row>
- <entry><para>CentOS 5.5</para></entry>
- <entry><para>Red Hat Enterprise Linux 5.3</para></entry>
- <entry><para>Red Hat Enterprise Linux 5.4</para></entry>
- </row>
- <row>
- <entry><para>Red Hat Enterprise Linux 5.5</para></entry>
- <entry><para>Red Hat Enterprise Linux 6</para></entry>
- <entry></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable></listitem>
- </itemizedlist>
- <note><para>Note: It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.</para></note>
- </listitem>
- <listitem><para>Extractable. Choose Yes if the ISO should be available for extraction.</para></listitem>
- <listitem><para>Public. Choose Yes if this ISO should be available to other users.</para></listitem>
- <listitem><para>Featured. Choose Yes if you would like this ISO to be more prominent for users to select. The ISO will appear in the Featured ISOs list. Only an administrator can make an ISO Featured.</para></listitem>
- </itemizedlist></listitem>
- <listitem><para>Click OK.</para>
- <para>The Management Server will download the ISO. Depending on the size of the ISO, this may take a long time. The ISO status column will display Ready once it has been successfully downloaded into secondary storage. Clicking Refresh updates the download percentage.</para>
- </listitem>
- <listitem><para><emphasis role="bold">Important</emphasis>: Wait for the ISO to finish downloading. If you move on to the next task and try to use the ISO right away, it will appear to fail. The entire ISO must be available before &PRODUCT; can work with it</para></listitem>
- </orderedlist>
+ <title>Adding an ISO</title>
+ <para>To make additional operating system or other software available for use with guest VMs, you can add an ISO. The ISO is typically thought of as an operating system image, but you can also add ISOs for other types of software, such as desktop applications that you want to be installed as part of a template.</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>In Select View, choose ISOs.</para></listitem>
+ <listitem><para>Click Add ISO.</para></listitem>
+ <listitem><para>In the Add ISO screen, provide the following:</para>
+ <itemizedlist>
+ <listitem><para>Name. Short name for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
+ <listitem><para>Description. Display test for the ISO image. (E.g. CentOS 6.2 64 bit).</para></listitem>
+ <listitem><para>URL. The URL that hosts the ISO image. The Management Server must be able to access this location via HTTP. If needed you can place the ISO image directly on the Management Server</para></listitem>
+ <listitem><para>Zone. Choose the zone where you want the ISO to be available, or All Zones to make it available throughout &PRODUCT;.</para></listitem>
+ <listitem><para>Bootable. Whether or not a guest could boot off this ISO image. For example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable.</para></listitem>
+ <listitem><para>OS Type. 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 your desired ISO image is listed, choose it.</para></listitem>
+ <listitem><para>If the OS Type of the ISO is not listed or if the ISO is not bootable, choose Other.</para></listitem>
+ <listitem><para>(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV (32-bit) or Other PV (64-bit)</para></listitem>
+ <listitem><para>(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have an IDE root disk. The PV-enabled types are:</para>
+ <informaltable>
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <tbody>
+ <row>
+ <entry><para>Fedora 13</para></entry>
+ <entry><para>Fedora 12</para></entry>
+ <entry><para>Fedora 11</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Fedora 10</para></entry>
+ <entry><para>Fedora 9</para></entry>
+ <entry><para>Other PV</para></entry>
+
+ </row>
+ <row>
+ <entry><para>Debian GNU/Linux</para></entry>
+ <entry><para>CentOS 5.3</para></entry>
+ <entry><para>CentOS 5.4</para></entry>
+ </row>
+ <row>
+ <entry><para>CentOS 5.5</para></entry>
+ <entry><para>Red Hat Enterprise Linux 5.3</para></entry>
+ <entry><para>Red Hat Enterprise Linux 5.4</para></entry>
+ </row>
+ <row>
+ <entry><para>Red Hat Enterprise Linux 5.5</para></entry>
+ <entry><para>Red Hat Enterprise Linux 6</para></entry>
+ <entry></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable></listitem>
+ </itemizedlist>
+ <note><para>Note: It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.</para></note>
+ </listitem>
+ <listitem><para>Extractable. Choose Yes if the ISO should be available for extraction.</para></listitem>
+ <listitem><para>Public. Choose Yes if this ISO should be available to other users.</para></listitem>
+ <listitem><para>Featured. Choose Yes if you would like this ISO to be more prominent for users to select. The ISO will appear in the Featured ISOs list. Only an administrator can make an ISO Featured.</para></listitem>
+ </itemizedlist></listitem>
+ <listitem><para>Click OK.</para>
+ <para>The Management Server will download the ISO. Depending on the size of the ISO, this may take a long time. The ISO status column will display Ready once it has been successfully downloaded into secondary storage. Clicking Refresh updates the download percentage.</para>
+ </listitem>
+ <listitem><para><emphasis role="bold">Important</emphasis>: Wait for the ISO to finish downloading. If you move on to the next task and try to use the ISO right away, it will appear to fail. The entire ISO must be available before &PRODUCT; can work with it</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/add-load-balancer-rule.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-load-balancer-rule.xml b/docs/en-US/add-load-balancer-rule.xml
index 4289557..ddbce95 100644
--- a/docs/en-US/add-load-balancer-rule.xml
+++ b/docs/en-US/add-load-balancer-rule.xml
@@ -23,24 +23,24 @@
-->
<section id="add-load-balancer-rule">
- <title>Adding a Load Balancer Rule</title>
- <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 load balance the traffic.</para></listitem>
- <listitem><para>Click View IP Addresses.</para></listitem>
- <listitem><para>Click the IP address for which you want to create the rule, then click the Configuration tab.</para></listitem>
- <listitem><para>In the Load Balancing node of the diagram, click View All.</para></listitem>
- <listitem><para>Fill in the following:</para>
- <itemizedlist>
- <listitem><para>Name. A name for the load balancer rule.</para></listitem>
- <listitem><para>Public Port. The port receiving incoming traffic to be balanced.</para></listitem>
- <listitem><para>Private Port. The port that the VMs will use to receive the traffic.</para></listitem>
- <listitem><para>Algorithm. Choose the load balancing algorithm you want &PRODUCT; to use. &PRODUCT; supports a variety of well-known algorithms. If you are not familiar with these choices, you will find plenty of information about them on the Internet.</para></listitem>
- <listitem><para>Stickiness. (Optional) Click Configure and choose the algorithm for the stickiness policy. See Sticky Session Policies for Load Balancer Rules.</para></listitem>
- </itemizedlist></listitem>
- <listitem><para>Click Add VMs, then select two or more VMs that will divide the load of incoming traffic, and click Apply.</para>
- <para>The new load balancer rule appears in the list. You can repeat these steps to add more load balancer rules for this IP address.</para>
- </listitem>
- </orderedlist>
+ <title>Adding a Load Balancer Rule</title>
+ <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 load balance the traffic.</para></listitem>
+ <listitem><para>Click View IP Addresses.</para></listitem>
+ <listitem><para>Click the IP address for which you want to create the rule, then click the Configuration tab.</para></listitem>
+ <listitem><para>In the Load Balancing node of the diagram, click View All.</para></listitem>
+ <listitem><para>Fill in the following:</para>
+ <itemizedlist>
+ <listitem><para>Name. A name for the load balancer rule.</para></listitem>
+ <listitem><para>Public Port. The port receiving incoming traffic to be balanced.</para></listitem>
+ <listitem><para>Private Port. The port that the VMs will use to receive the traffic.</para></listitem>
+ <listitem><para>Algorithm. Choose the load balancing algorithm you want &PRODUCT; to use. &PRODUCT; supports a variety of well-known algorithms. If you are not familiar with these choices, you will find plenty of information about them on the Internet.</para></listitem>
+ <listitem><para>Stickiness. (Optional) Click Configure and choose the algorithm for the stickiness policy. See Sticky Session Policies for Load Balancer Rules.</para></listitem>
+ </itemizedlist></listitem>
+ <listitem><para>Click Add VMs, then select two or more VMs that will divide the load of incoming traffic, and click Apply.</para>
+ <para>The new load balancer rule appears in the list. You can repeat these steps to add more load balancer rules for this IP address.</para>
+ </listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/add-password-management-to-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-password-management-to-templates.xml b/docs/en-US/add-password-management-to-templates.xml
index 05c40af..581e564 100644
--- a/docs/en-US/add-password-management-to-templates.xml
+++ b/docs/en-US/add-password-management-to-templates.xml
@@ -23,11 +23,11 @@
-->
<section id="add-password-management-to-templates">
- <title>Adding Password Management to Your Templates</title>
- <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the &PRODUCT; UI.</para>
- <para>To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into &PRODUCT;, you can specify whether reset admin/root password feature should be enabled for this template.</para>
- <para>The password management feature works always resets the account password on instance boot. The script does an HTTP call to the virtual router to retrieve the account password that should be set. As long as the virtual router is accessible the guest will have access to the account password that should be used. When the user requests a password reset the management server generates and sends a new password to the virtual router for the account. Thus an instance reboot is necessary to effect any password changes.</para>
- <para>If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.</para>
+ <title>Adding Password Management to Your Templates</title>
+ <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the &PRODUCT; UI.</para>
+ <para>To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into &PRODUCT;, you can specify whether reset admin/root password feature should be enabled for this template.</para>
+ <para>The password management feature works always resets the account password on instance boot. The script does an HTTP call to the virtual router to retrieve the account password that should be set. As long as the virtual router is accessible the guest will have access to the account password that should be used. When the user requests a password reset the management server generates and sends a new password to the virtual router for the account. Thus an instance reboot is necessary to effect any password changes.</para>
+ <para>If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.</para>
<xi:include href="linux-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="windows-installation.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/add-security-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-security-group.xml b/docs/en-US/add-security-group.xml
index c6ddbf5..e4c8b3c 100644
--- a/docs/en-US/add-security-group.xml
+++ b/docs/en-US/add-security-group.xml
@@ -23,17 +23,17 @@
-->
<section id="add-security-group">
- <title>Adding a Security Group</title>
- <para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
- <itemizedlist>
- <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>In Select view, choose Security Groups.</para></listitem>
- <listitem><para>Click Add Security Group.</para></listitem>
- <listitem><para>Provide a name and description.</para></listitem>
- <listitem><para>Click OK.</para>
- <para>The new security group appears in the Security Groups Details tab.</para></listitem>
- <listitem><para>To make the security group useful, continue to Adding Ingress and Egress Rules to a Security Group.</para></listitem>
- </itemizedlist>
+ <title>Adding a Security Group</title>
+ <para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
+ <itemizedlist>
+ <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>In Select view, choose Security Groups.</para></listitem>
+ <listitem><para>Click Add Security Group.</para></listitem>
+ <listitem><para>Provide a name and description.</para></listitem>
+ <listitem><para>Click OK.</para>
+ <para>The new security group appears in the Security Groups Details tab.</para></listitem>
+ <listitem><para>To make the security group useful, continue to Adding Ingress and Egress Rules to a Security Group.</para></listitem>
+ </itemizedlist>
</section>