incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [1/9] git commit: Feature Documentation for s2svpn interVlan and Autoscale
Date Tue, 11 Sep 2012 14:41:08 GMT
Unfortunately this seems to have broken the docs build.
FATAL ERROR: XInclude:1604 in developer-guide.xml on line 32: could
not load contacting-support.xml, and no fallback was found
 at /usr/bin/publican line 763

It's comparatively trivial to build the docs before committing, please
try and do that if at all possible, and if not possible consider
deferring committing.

Also - this commit has a number of style problems, tabs were
introduced instead of using spaces, and changes were made to 149
different files (which should have been a warning sign in and of
itself since this is supposedly only about s2svpn, vpc, and a feature
not yet present.)

Pranav: do you want to fix this in place or would you consider reverting it?

On Tue, Sep 11, 2012 at 4:55 AM,  <pranavs@apache.org> wrote:
> Updated Branches:
>   refs/heads/master 87ecde648 -> 4a8bb9dfc
>
>
> Feature Documentation for s2svpn interVlan and Autoscale
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a8bb9df
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a8bb9df
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a8bb9df
>
> Branch: refs/heads/master
> Commit: 4a8bb9dfc70a1d0b1b855b10d821a54ed51a0ba6
> Parents: 87ecde6
> Author: Radhika Puthiyetath <radhika.puthiyetath@citrix.com>
> Authored: Tue Sep 11 14:23:59 2012 +0530
> Committer: Pranav Saxena <pranav.saxena@citrix.com>
> Committed: Tue Sep 11 14:23:59 2012 +0530
>
> ----------------------------------------------------------------------
>  docs/en-US/LDAPserver-for-user-authentication.xml  |   33 +-
>  docs/en-US/about-clusters.xml                      |    2 +-
>  docs/en-US/about-hosts.xml                         |   34 +-
>  docs/en-US/about-physical-networks.xml             |   38 +-
>  docs/en-US/about-pods.xml                          |   41 +-
>  docs/en-US/about-primary-storage.xml               |    2 +-
>  docs/en-US/about-secondary-storage.xml             |    2 +-
>  docs/en-US/about-virtual-networks.xml              |   39 +-
>  docs/en-US/about-working-with-vms.xml              |   54 +-
>  docs/en-US/about-zones.xml                         |   37 +-
>  docs/en-US/accessing-vms.xml                       |   66 ++-
>  docs/en-US/accounts-users-domains.xml              |   31 +-
>  docs/en-US/accounts.xml                            |   35 +-
>  docs/en-US/add-additional-guest-network.xml        |   70 ++--
>  docs/en-US/add-ingress-egress-rules.xml            |  123 +++--
>  docs/en-US/add-iso.xml                             |  178 ++++---
>  docs/en-US/add-load-balancer-rule.xml              |   84 ++--
>  docs/en-US/add-security-group.xml                  |   54 +-
>  docs/en-US/advanced-zone-configuration.xml         |  437 +++++++++------
>  docs/en-US/advanced-zone-guest-ip-addresses.xml    |   33 +-
>  docs/en-US/advanced-zone-network-traffic-types.xml |   35 +-
>  ...dvanced-zone-physical-network-configuration.xml |   39 +-
>  docs/en-US/advanced-zone-public-ip-addresses.xml   |   33 +-
>  docs/en-US/alerts.xml                              |   96 ++--
>  docs/en-US/attach-iso-to-vm.xml                    |   59 +-
>  .../automatic-snapshot-creation-retention.xml      |   47 +-
>  docs/en-US/basic-zone-configuration.xml            |   39 +-
>  docs/en-US/basic-zone-guest-ip-addresses.xml       |   35 +-
>  docs/en-US/basic-zone-network-traffic-types.xml    |   35 +-
>  .../basic-zone-physical-network-configuration.xml  |   38 +-
>  docs/en-US/best-practices-for-vms.xml              |   55 ++-
>  .../change-network-offering-on-guest-network.xml   |   77 ++--
>  docs/en-US/changing-root-password.xml              |   37 +-
>  docs/en-US/changing-secondary-storage-ip.xml       |   74 ++--
>  docs/en-US/changing-service-offering-for-vm.xml    |   83 ++--
>  docs/en-US/changing-vm-name-os-group.xml           |   95 ++--
>  docs/en-US/cloud-infrastructure-concepts.xml       |   50 +-
>  docs/en-US/cloud-infrastructure-overview.xml       |   75 ++--
>  docs/en-US/cloudstack_admin.xml                    |   59 ++-
>  docs/en-US/cluster-add.xml                         |   39 +-
>  docs/en-US/compute-disk-service-offerings.xml      |   40 +-
>  docs/en-US/concepts.xml                            |   41 +-
>  .../configure-guest-traffic-in-advanced-zone.xml   |   88 ++--
>  docs/en-US/configure-usage-server.xml              |   47 +-
>  docs/en-US/configure-vpn.xml                       |   87 ++--
>  docs/en-US/console-proxy.xml                       |   33 +-
>  docs/en-US/convert-hyperv-vm-to-template.xml       |  117 ++--
>  docs/en-US/create-template-from-existing-vm.xml    |   87 ++--
>  docs/en-US/create-template-from-snapshot.xml       |   38 +-
>  docs/en-US/create-templates-overview.xml           |   52 +-
>  docs/en-US/create-windows-template.xml             |   58 +-
>  docs/en-US/creating-compute-offerings.xml          |   74 ++-
>  docs/en-US/creating-network-offerings.xml          |  122 +++--
>  docs/en-US/creating-new-volumes.xml                |   88 ++--
>  docs/en-US/creating-vms.xml                        |   86 ++--
>  docs/en-US/default-account-resource-limit.xml      |   53 +-
>  docs/en-US/deleting-vms.xml                        |   66 ++-
>  docs/en-US/deployment-architecture-overview.xml    |   69 ++--
>  docs/en-US/detach-move-volumes.xml                 |   71 ++--
>  docs/en-US/developer-guide.xml                     |   39 +-
>  docs/en-US/enable-disable-static-nat.xml           |   70 ++--
>  docs/en-US/enable-security-groups.xml              |   39 +-
>  docs/en-US/end-user-ui-overview.xml                |   37 +-
>  docs/en-US/event-log-queries.xml                   |   33 +-
>  docs/en-US/event-types.xml                         |  425 +++++++-------
>  docs/en-US/events-log.xml                          |   43 +-
>  docs/en-US/events.xml                              |   31 +-
>  .../external-firewalls-and-load-balancers.xml      |   38 +-
>  docs/en-US/feature-overview.xml                    |  117 ++--
>  docs/en-US/firewall-rules.xml                      |   91 ++--
>  docs/en-US/globally-configured-limits.xml          |  178 +++---
>  docs/en-US/guest-traffic.xml                       |   55 +-
>  docs/en-US/ha-for-hosts.xml                        |   35 +-
>  docs/en-US/host-add.xml                            |   48 +-
>  docs/en-US/host-allocation.xml                     |   33 +-
>  .../hypervisor-support-for-primarystorage.xml      |  183 +++---
>  docs/en-US/images/cluster-overview.png             |  Bin 6973 -> 6080 bytes
>  docs/en-US/import-ami.xml                          |  108 ++--
>  docs/en-US/initialize-and-test.xml                 |  102 ++--
>  docs/en-US/ip-forwarding-firewalling.xml           |   34 +-
>  docs/en-US/isolated-networks.xml                   |   33 +-
>  docs/en-US/linux-installation.xml                  |   82 ++--
>  docs/en-US/load-balancer-rules.xml                 |   37 +-
>  docs/en-US/log-in-root-admin.xml                   |   34 +-
>  docs/en-US/log-in.xml                              |   44 +-
>  docs/en-US/maintain-hypervisors-on-hosts.xml       |   33 +-
>  docs/en-US/manage-cloud.xml                        |   45 +-
>  docs/en-US/manual-live-migration.xml               |   83 ++--
>  ...grate-vm-rootvolume-volume-new-storage-pool.xml |   54 +-
>  docs/en-US/minimum-system-requirements.xml         |  153 +++---
>  docs/en-US/network-offerings.xml                   |   46 +-
>  docs/en-US/network-service-providers.xml           |  133 ++++-
>  docs/en-US/networking-in-a-pod.xml                 |   69 ++-
>  docs/en-US/networking-in-a-zone.xml                |   56 +-
>  docs/en-US/networking-overview.xml                 |   51 +-
>  docs/en-US/pod-add.xml                             |   51 ++-
>  docs/en-US/port-forwarding.xml                     |   80 ++--
>  docs/en-US/primary-storage-add.xml                 |   60 ++-
>  docs/en-US/primary-storage.xml                     |   42 +-
>  docs/en-US/projects.xml                            |   53 +-
>  docs/en-US/provisioning-steps-overview.xml         |   70 ++--
>  docs/en-US/provisioning-steps.xml                  |   36 +-
>  docs/en-US/release-ip-address.xml                  |   64 ++-
>  docs/en-US/removing-vsphere-hosts.xml              |   32 +-
>  ...untime-allocation-virtual-network-resources.xml |   37 +-
>  ...cheduled-maintenance-maintenance-mode-hosts.xml |   34 +-
>  docs/en-US/secondary-storage-add.xml               |   41 +-
>  docs/en-US/secondary-storage-vm.xml                |   41 +-
>  docs/en-US/secondary-storage.xml                   |   38 +-
>  docs/en-US/security-groups.xml                     |   36 +-
>  docs/en-US/set-up-invitations.xml                  |   53 +-
>  docs/en-US/set-up-network-for-users.xml            |   46 +-
>  docs/en-US/set-usage-limit.xml                     |   36 +-
>  docs/en-US/shared-networks.xml                     |   38 +-
>  docs/en-US/site-to-site-vpn.xml                    |   72 ++--
>  docs/en-US/standard-events.xml                     |   35 +-
>  docs/en-US/static-nat.xml                          |   34 +-
>  docs/en-US/stop-restart-management-server.xml      |   33 +-
>  docs/en-US/stopping-and-starting-vms.xml           |    7 +-
>  docs/en-US/storage.xml                             |   43 +-
>  docs/en-US/suspend-project.xml                     |   48 +-
>  docs/en-US/sys-reliability-and-ha.xml              |   45 +-
>  docs/en-US/sysprep-for-windows-server-2003R2.xml   |   96 ++--
>  docs/en-US/sysprep-windows-server-2008R2.xml       |   48 +-
>  docs/en-US/system-reserved-ip-addresses.xml        |   36 +-
>  docs/en-US/system-service-offerings.xml            |   34 +-
>  docs/en-US/time-zones.xml                          |  259 +++++-----
>  docs/en-US/troubleshooting.xml                     |   52 +-
>  docs/en-US/tuning.xml                              |   36 +-
>  docs/en-US/ui.xml                                  |   35 +-
>  docs/en-US/upload-template.xml                     |  100 ++--
>  docs/en-US/user-services-overview.xml              |  119 +---
>  docs/en-US/using-multiple-guest-networks.xml       |   43 +-
>  docs/en-US/using-sshkeys.xml                       |   95 ++--
>  docs/en-US/vcenter-maintenance-mode.xml            |   36 +-
>  docs/en-US/virtual-router.xml                      |   35 +-
>  docs/en-US/vm-lifecycle.xml                        |   63 +-
>  docs/en-US/vm-storage-migration.xml                |   44 +-
>  docs/en-US/vpc.xml                                 |  160 +++++--
>  docs/en-US/vpn.xml                                 |   58 ++-
>  docs/en-US/windows-installation.xml                |   37 +-
>  docs/en-US/work-with-usage.xml                     |   47 +-
>  docs/en-US/working-with-hosts.xml                  |   51 +-
>  docs/en-US/working-with-iso.xml                    |   43 +-
>  docs/en-US/working-with-snapshots.xml              |   49 +-
>  docs/en-US/working-with-system-vm.xml              |   39 +-
>  docs/en-US/working-with-templates.xml              |   44 +-
>  docs/en-US/working-with-volumes.xml                |   46 +-
>  docs/en-US/xenserver-maintenance-mode.xml          |   40 +-
>  149 files changed, 5092 insertions(+), 4360 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/LDAPserver-for-user-authentication.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/LDAPserver-for-user-authentication.xml b/docs/en-US/LDAPserver-for-user-authentication.xml
> index 5fcb300..376631c 100644
> --- a/docs/en-US/LDAPserver-for-user-authentication.xml
> +++ b/docs/en-US/LDAPserver-for-user-authentication.xml
> @@ -5,23 +5,22 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
> -
>  <section id="LDAPserver-for-user-authentication">
>      <title>Using an LDAP Server for User Authentication</title>
>      <para>You can use an external LDAP server such as Microsoft Active Directory or ApacheDS to authenticate &PRODUCT; end-users. Just map &PRODUCT; accounts to the corresponding LDAP accounts using a query filter. The query filter is written using the query syntax of the particular LDAP server, and can include special wildcard characters provided by &PRODUCT; for matching common values such as the user’s email address and name. &PRODUCT; will search the external LDAP directory tree starting at a specified base directory and return the distinguished name (DN) and password of the matching user. This information along with the given password is used to authenticate the user..</para>
> @@ -37,4 +36,4 @@
>      <xi:include href="query-filter.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      <xi:include href="search-user-bind-dn.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      <xi:include href="SSL-keystore-path-and-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> -</section>
> +    </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/about-clusters.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/about-clusters.xml b/docs/en-US/about-clusters.xml
> index e328cba..b01fcfc 100644
> --- a/docs/en-US/about-clusters.xml
> +++ b/docs/en-US/about-clusters.xml
> @@ -1,5 +1,5 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/about-hosts.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/about-hosts.xml b/docs/en-US/about-hosts.xml
> index 956c695..2002a6a 100644
> --- a/docs/en-US/about-hosts.xml
> +++ b/docs/en-US/about-hosts.xml
> @@ -1,25 +1,25 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
>
>  <section id="about-hosts">
> @@ -28,7 +28,7 @@
>      <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>
>      <itemizedlist>
> -        <listitem><para>Provde the CPU, memory, storage, and networking resources needed to host the virtual machines</para></listitem>
> +        <listitem><para>Provide the CPU, memory, storage, and networking resources needed to host the virtual machines</para></listitem>
>          <listitem><para>Interconnect using a high bandwidth TCP/IP network and connect to the Internet</para></listitem>
>          <listitem><para>May reside in multiple data centers across different geographic locations</para></listitem>
>          <listitem><para>May have different capacities (different CPU speeds, different amounts of RAM, etc.), although the hosts within a cluster must all be homogeneous</para></listitem>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 8edb9e0..b22e48b 100644
> --- a/docs/en-US/about-physical-networks.xml
> +++ b/docs/en-US/about-physical-networks.xml
> @@ -1,29 +1,28 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
> -
>  <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>
> @@ -33,8 +32,7 @@
>          <listitem><para>Configure the service providers (firewalls, load balancers, etc.) available on a physical network</para></listitem>
>          <listitem><para>Configure the IP addresses trunked to a physical network</para></listitem>
>          <listitem><para>Specify what type of traffic is carried on the physical network, as well as other properties like network speed</para></listitem>
> -    </itemizedlist>
> -    <xi:include href="physical-network-configuration-settings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> +    </itemizedlist>
>      <xi:include href="basic-zone-network-traffic-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      <xi:include href="basic-zone-guest-ip-addresses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      <xi:include href="advanced-zone-network-traffic-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/about-pods.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/about-pods.xml b/docs/en-US/about-pods.xml
> index ed3520c..57ae1a3 100644
> --- a/docs/en-US/about-pods.xml
> +++ b/docs/en-US/about-pods.xml
> @@ -1,33 +1,34 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
>
>  <section id="about-pods">
>      <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>
> -    <para>A pod consists of one or more clusters of hosts and one or more primary storage servers.</para>
> +    <para>A pod often represents a single rack. Hosts in the same pod are in the same subnet.
> +        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.
> +        A pod consists of one or more clusters of hosts and one or more primary storage servers.
> +        Pods are not visible to the end user.
> +    </para>
>      <mediaobject>
>          <imageobject>
>              <imagedata fileref="./images/pod-overview.png" />
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 68d7a25..a9cf054 100644
> --- a/docs/en-US/about-primary-storage.xml
> +++ b/docs/en-US/about-primary-storage.xml
> @@ -1,5 +1,5 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 c4df0b8..c5b4f5d 100644
> --- a/docs/en-US/about-secondary-storage.xml
> +++ b/docs/en-US/about-secondary-storage.xml
> @@ -1,5 +1,5 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/about-virtual-networks.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/about-virtual-networks.xml b/docs/en-US/about-virtual-networks.xml
> index 2fc6ba9..225717e 100644
> --- a/docs/en-US/about-virtual-networks.xml
> +++ b/docs/en-US/about-virtual-networks.xml
> @@ -5,27 +5,26 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
> -
>  <section id="about-virtual-networks">
>      <title>About Virtual Networks</title>
> -    <para>A virtual network is a logical construct that enables multi-tenancy on a single physical network. In &PRODUCT;, a virtual network can be shared or isolated.</para>
> -    <para><xref linkend="isolated-networks" />XenServer and Maintenance Mode</para>
> -    <para><xref linkend="shared-networks" />Working with Usage</para>
> -    <para><xref linkend="runtime-allocation-virtual-network-resources" />XenServer and Maintenance Mode</para>
> +    <para>A virtual network is a logical construct that enables multi-tenancy on a single physical network. In &PRODUCT; a virtual network can be shared or isolated.</para>
> +    <xi:include href="isolated-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> +    <xi:include href="shared-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> +    <xi:include href="runtime-allocation-virtual-network-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 47153e2..259c61b 100644
> --- a/docs/en-US/about-working-with-vms.xml
> +++ b/docs/en-US/about-working-with-vms.xml
> @@ -5,35 +5,35 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
>
>  <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 &ndash; 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 &ndash; the name displayed in the &PRODUCT; web UI. Can be set by the user. Defaults to instance name.</para></listitem>
> -            <listitem><para>Name &ndash; 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/4a8bb9df/docs/en-US/about-zones.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/about-zones.xml b/docs/en-US/about-zones.xml
> index a05a9a6..5385df0 100644
> --- a/docs/en-US/about-zones.xml
> +++ b/docs/en-US/about-zones.xml
> @@ -1,29 +1,28 @@
>  <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
>  %BOOK_ENTITIES;
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
> -
>  <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>
> @@ -34,7 +33,7 @@
>          <imageobject>
>              <imagedata fileref="./images/zone-overview.png" />
>          </imageobject>
> -        <textobject><phrase>zone-overview.png: Nested structure of a simple zone</phrase></textobject>
> +        <textobject><phrase>zone-overview.png: Nested structure of a simple zone.</phrase></textobject>
>      </mediaobject>
>      <para>Zones are visible to the end user. When a user starts a guest VM, the user must select a zone for their guest. Users might also be required to copy their private templates to additional zones to enable creation of guest VMs using their templates in those zones.</para>
>      <para>Zones can be public or private.  Public zones are visible to all users.  This means that any user may create a guest in that zone.  Private zones are reserved for a specific domain.  Only users in that domain or its subdomains may create guests in that zone.</para>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/accessing-vms.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/accessing-vms.xml b/docs/en-US/accessing-vms.xml
> index d69d021..7053996 100644
> --- a/docs/en-US/accessing-vms.xml
> +++ b/docs/en-US/accessing-vms.xml
> @@ -5,37 +5,43 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
> -
>  <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 <inlinemediaobject>
> +                               <imageobject>
> +                                       <imagedata fileref="./images/console-icon.png"/>
> +                               </imageobject>
> +                               <textobject>
> +                                       <phrase>consoleicon.png: button to view the console.</phrase>
> +                               </textobject>
> +                       </inlinemediaobject></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/4a8bb9df/docs/en-US/accounts-users-domains.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/accounts-users-domains.xml b/docs/en-US/accounts-users-domains.xml
> index 8549129..a3f5837 100644
> --- a/docs/en-US/accounts-users-domains.xml
> +++ b/docs/en-US/accounts-users-domains.xml
> @@ -5,23 +5,22 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
> -
>  <section id="accounts-users-domains">
>      <title>Accounts, Users, and Domains</title>
>      <formalpara>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/accounts.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/accounts.xml b/docs/en-US/accounts.xml
> index 5292a9c..aa62f68 100644
> --- a/docs/en-US/accounts.xml
> +++ b/docs/en-US/accounts.xml
> @@ -5,24 +5,25 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +    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
> +
> +    http://www.apache.org/licenses/LICENSE-2.0
> +
> +    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.
>  -->
>
> -<section id="accounts">
> +<chapter id="accounts">
> +    <title>Accounts</title>
>      <xi:include href="accounts-users-domains.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>      <xi:include href="LDAPserver-for-user-authentication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> -</section>
> +</chapter>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 57e7ffd..3d3858a 100644
> --- a/docs/en-US/add-additional-guest-network.xml
> +++ b/docs/en-US/add-additional-guest-network.xml
> @@ -5,39 +5,43 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
> -
>  <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>
> +       <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 Add guest network. Provide the following information: </para>
> +                       <itemizedlist>
> +                               <listitem><para><emphasis role="bold">Name</emphasis>: The name of the network. This will be user-visible. </para></listitem>
> +                               <listitem><para><emphasis role="bold">Display Text</emphasis>: The description of the network. This will be
> +                               user-visible.</para></listitem>
> +                               <listitem><para><emphasis role="bold">Zone</emphasis>. The name of the zone this network applies to. Each zone is a broadcast domain, and therefore each zone has a different
> +                                       IP range for the guest network. The administrator must configure the IP
> +                                       range for each zone.</para></listitem>
> +                               <listitem><para><emphasis role="bold">Network offering</emphasis>: If the administrator has configured
> +                                               multiple network offerings, select the one you want to use for this
> +                                               network.</para></listitem>
> +                               <listitem><para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should use.</para></listitem>
> +                               <listitem><para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the guests will
> +                                               use.</para></listitem>
> +                               </itemizedlist></listitem>
> +               <listitem><para>Click Create.</para></listitem>
> +       </orderedlist>
>
> -    </section>
> +       </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/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 964045f..10895d6 100644
> --- a/docs/en-US/add-ingress-egress-rules.xml
> +++ b/docs/en-US/add-ingress-egress-rules.xml
> @@ -5,55 +5,88 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
>
>  <section id="add-ingress-egress-rules">
>      <title>Adding Ingress and Egress Rules to a Security Group</title>
> -    <itemizedlist>
> +    <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>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>
> +               <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>
> +       </orderedlist>
>  </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/add-iso.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/add-iso.xml b/docs/en-US/add-iso.xml
> index f56d10c..60f6116 100644
> --- a/docs/en-US/add-iso.xml
> +++ b/docs/en-US/add-iso.xml
> @@ -5,87 +5,103 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
> -
>  <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><emphasis role="bold">Name</emphasis>: Short name for the ISO image. For example, CentOS 6.2
> +                                               64-bit.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Description</emphasis>: Display test for the ISO image. For example,
> +                                               CentOS 6.2 64-bit.</para></listitem>
> +                       <listitem><para><emphasis role="bold">URL</emphasis>: 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><emphasis role="bold">Zone</emphasis>: Choose the zone where you want the ISO to be available,
> +                                               or All Zones to make it available throughout &PRODUCT;.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Bootable</emphasis>: 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><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 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>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><emphasis role="bold">Extractable</emphasis>: Choose Yes if the ISO should be available for
> +                                               extraction.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Public</emphasis>: Choose Yes if this ISO should be available to other
> +                                               users.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Featured</emphasis>: 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/4a8bb9df/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 ddbce95..30128ef 100644
> --- a/docs/en-US/add-load-balancer-rule.xml
> +++ b/docs/en-US/add-load-balancer-rule.xml
> @@ -5,42 +5,56 @@
>  ]>
>
>  <!-- 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
> -
> -   http://www.apache.org/licenses/LICENSE-2.0
> -
> - 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.
> +       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
> +
> +       http://www.apache.org/licenses/LICENSE-2.0
> +
> +       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.
>  -->
>
>  <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>
> +               <para>In a Basic zone, you can also create a load balancing rule without acquiring or selecting an
> +                               IP address. &PRODUCT; internally assign an IP when you create the load balancing
> +                               rule, which is listed in the IP Addresses page when the rule is created. </para>
> +               <para>To do that, select the name of the network, then click Add Load Balancer tab. Continue with
> +                                       <xref linkend="config-lb"/>.</para></listitem>
> +               <listitem id="config-lb"><para>Fill in the following:</para>
> +               <itemizedlist>
> +                       <listitem><para><emphasis role="bold">Name</emphasis>: A name for the load balancer rule.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Public Port</emphasis>: The port receiving incoming traffic to be
> +                                               balanced.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Private Port</emphasis>: The port that the VMs will use to receive the
> +                                               traffic.</para></listitem>
> +                       <listitem><para><emphasis role="bold">Algorithm</emphasis>: 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><emphasis role="bold">Stickiness</emphasis>: (Optional) Click Configure and choose the
> +                                               algorithm for the stickiness policy. See Sticky Session Policies for Load
> +                                               Balancer Rules.</para></listitem>
> +                       <listitem><para><emphasis role="bold">AutoScale</emphasis>: Click Configure and complete the AutoScale
> +                                               configuration as explained in <xref linkend="autoscale"/>.</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>
>

Mime
View raw message