cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [38/81] [abbrv] [partial] Removing docs from master
Date Mon, 14 Oct 2013 17:17:30 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
deleted file mode 100644
index 4f75781..0000000
--- a/docs/en-US/creating-network-offerings.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="creating-network-offerings">
-  <title>Creating a New Network Offering</title>
-  <para>To create a network offering:</para>
-  <orderedlist>
-    <listitem>
-      <para>Log in with admin privileges to the &PRODUCT; UI.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation bar, click Service Offerings.</para>
-    </listitem>
-    <listitem>
-      <para>In Select Offering, choose Network Offering.</para>
-    </listitem>
-    <listitem>
-      <para>Click Add Network Offering.</para>
-    </listitem>
-    <listitem>
-      <para>In the dialog, make the following choices:</para>
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Name</emphasis>. Any desired name for the network
-            offering.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Description</emphasis>. A short description of the offering
-            that can be displayed to users.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Network Rate</emphasis>. Allowed data transfer rate in MB per
-            second.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Guest Type</emphasis>. Choose whether the guest network is
-            isolated or shared. </para>
-          <para condition="admin">For a description of this term, see <xref
-              linkend="about-virtual-networks"/>.</para>
-          <para condition="install">For a description of this term, see the Administration Guide.
-          </para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Persistent</emphasis>. Indicate whether the guest network is
-            persistent or not. The network that you can provision without having to deploy a VM on
-            it is termed persistent network. For more information, see <xref
-              linkend="persistent-network"/>.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Specify VLAN</emphasis>. (Isolated guest networks only)
-            Indicate whether a VLAN could be specified when this offering is used. If you select
-            this option and later use this network offering while creating a VPC tier or an isolated
-            network, you will be able to specify a VLAN ID for the network you create.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">VPC</emphasis>. This option indicate whether the guest network
-            is Virtual Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private, isolated
-            part of &PRODUCT;. A VPC can have its own virtual network topology that resembles a
-            traditional physical network. For more information on VPCs, see <xref linkend="vpc"/>.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Supported Services</emphasis>. Select one or more of the
-            possible network services. For some services, you must also choose the service provider;
-            for example, if you select Load Balancer, you can choose the &PRODUCT; virtual router or
-            any other load balancers that have been configured in the cloud. Depending on which
-            services you choose, additional fields may appear in the rest of the dialog box.</para>
-          <para>Based on the guest network type selected, you can see the following supported
-            services:</para>
-          <informaltable>
-            <tgroup cols="4" align="left" colsep="1" rowsep="1">
-              <thead>
-                <row>
-                  <entry><para>Supported Services</para></entry>
-                  <entry><para>Description</para></entry>
-                  <entry><para>Isolated</para></entry>
-                  <entry><para>Shared</para></entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry><para>DHCP</para></entry>
-                  <entry><para>For more information, see <xref linkend="dns-dhcp"/>.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>DNS</para></entry>
-                  <entry><para>For more information, see <xref linkend="dns-dhcp"/>.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Load Balancer</para></entry>
-                  <entry><para>If you select Load Balancer, you can choose the &PRODUCT; virtual
-                      router or any other load balancers that have been configured in the
-                      cloud.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Firewall</para></entry>
-                  <entry><para condition="install">For more information, see <xref
-                        linkend="firewall-rules"/>.</para>
-                    <para condition="admin">For more information, see the Administration
-                      Guide.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Source NAT</para></entry>
-                  <entry><para>If you select Source NAT, you can choose the &PRODUCT; virtual router
-                      or any other Source NAT providers that have been configured in the
-                      cloud.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Static NAT</para></entry>
-                  <entry><para>If you select Static NAT, you can choose the &PRODUCT; virtual router
-                      or any other Static NAT providers that have been configured in the
-                      cloud.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Port Forwarding</para></entry>
-                  <entry><para>If you select Port Forwarding, you can choose the &PRODUCT; virtual
-                      router or any other Port Forwarding providers that have been configured in the
-                      cloud.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Not Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>VPN</para></entry>
-                  <entry><para>For more information, see <xref linkend="vpn"/>.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Not Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>User Data</para></entry>
-                  <entry><para condition="admin">For more information, see <xref
-                        linkend="user-data-and-meta-data"/>.</para>
-                    <para condition="install">For more information, see the Administration
-                      Guide.</para></entry>
-                  <entry><para>Not Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Network ACL</para></entry>
-                  <entry><para>For more information, see <xref linkend="configure-acl"
-                    />.</para></entry>
-                  <entry><para>Supported</para></entry>
-                  <entry><para>Not Supported</para></entry>
-                </row>
-                <row>
-                  <entry><para>Security Groups</para></entry>
-                  <entry><para>For more information, see <xref linkend="add-security-group"
-                      />.</para></entry>
-                  <entry><para>Not Supported</para></entry>
-                  <entry><para>Supported</para></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">System Offering</emphasis>. If the service provider for any of
-            the services selected in Supported Services is a virtual router, the System Offering
-            field appears. Choose the system service offering that you want virtual routers to use
-            in this network. For example, if you selected Load Balancer in Supported Services and
-            selected a virtual router to provide load balancing, the System Offering field appears
-            so you can choose between the &PRODUCT; default system service offering and any custom
-            system service offerings that have been defined by the &PRODUCT; root
-            administrator.</para>
-          <para condition="admin">For more information, see <xref linkend="system-service-offerings"/>.</para>
-          <para condition="install">For more information, see the Administration Guide.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">LB Isolation</emphasis>: Specify what type of load balancer
-            isolation you want for the network: Shared or Dedicated.</para>
-          <para><emphasis role="bold">Dedicated</emphasis>: If you select dedicated LB isolation, a
-            dedicated load balancer device is assigned for the network from the pool of dedicated
-            load balancer devices provisioned in the zone. If no sufficient dedicated load balancer
-            devices are available in the zone, network creation fails. Dedicated device is a good
-            choice for the high-traffic networks that make full use of the device's
-            resources.</para>
-          <para><emphasis role="bold">Shared</emphasis>: If you select shared LB isolation, a shared
-            load balancer device is assigned for the network from the pool of shared load balancer
-            devices provisioned in the zone. While provisioning &PRODUCT; picks the shared load
-            balancer device that is used by the least number of accounts. Once the device reaches
-            its maximum capacity, the device will not be allocated to a new account.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Mode</emphasis>: You can select either Inline mode or Side by
-            Side mode:</para>
-          <para><emphasis role="bold">Inline mode</emphasis>: Supported only for Juniper SRX
-            firewall and BigF5 load balancer devices. In inline mode, a firewall device is placed in
-            front of a load balancing device. The firewall acts as the gateway for all the incoming
-            traffic, then redirect the load balancing traffic to the load balancer behind it. The
-            load balancer in this case will not have the direct access to the public network. </para>
-          <para><emphasis role="bold">Side by Side</emphasis>: In side by side mode, a firewall
-            device is deployed in parallel with the load balancer device. So the traffic to the load
-            balancer public IP is not routed through the firewall, and therefore, is exposed to the
-            public network.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Associate Public IP</emphasis>: Select this option if you want
-            to assign a public IP address to the VMs deployed in the guest network. This option is
-            available only if</para>
-          <itemizedlist>
-            <listitem>
-              <para>Guest network is shared.</para>
-            </listitem>
-            <listitem>
-              <para>StaticNAT is enabled.</para>
-            </listitem>
-            <listitem>
-              <para>Elastic IP is enabled.</para>
-            </listitem>
-          </itemizedlist>
-          <para>For information on Elastic IP, see <xref linkend="elastic-ip"/>.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Redundant router capability</emphasis>: Available only when
-            Virtual Router is selected as the Source NAT provider. Select this option if you want to
-            use two virtual routers in the network for uninterrupted connection: one operating as
-            the master virtual router and the other as the backup. The master virtual router
-            receives requests from and sends responses to the user’s VM. The backup virtual router
-            is activated only when the master is down. After the failover, the backup becomes the
-            master virtual router. &PRODUCT; deploys the routers on different hosts to ensure
-            reliability if one host is down.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Conserve mode</emphasis>: Indicate whether to use conserve
-            mode. In this mode, network resources are allocated only when the first virtual machine
-            starts in the network. When conservative mode is off, the public IP can only be used for
-            a single service. For example, a public IP used for a port forwarding rule cannot be
-            used for defining other services, such as StaticNAT or load balancing. When the conserve
-            mode is on, you can define more than one service on the same public IP.</para>
-          <note>
-            <para>If StaticNAT is enabled, irrespective of the status of the conserve mode, no port
-              forwarding or load balancing rule can be created for the IP. However, you can add the
-              firewall rules by using the createFirewallRule command.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Tags</emphasis>: Network tag to specify which physical network
-            to use.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Default egress policy</emphasis>: Configure the default policy
-            for firewall egress rules. Options are Allow and Deny. Default is Allow if no egress
-            policy is specified, which indicates that all the egress traffic is accepted when a
-            guest network is created from this offering. </para>
-          <para>To block the egress traffic for a guest network, select Deny. In this case, when you
-            configure an egress rules for an isolated guest network, rules are added to allow the
-            specified traffic.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    <listitem>
-      <para>Click Add.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/creating-new-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-new-volumes.xml b/docs/en-US/creating-new-volumes.xml
deleted file mode 100644
index 5440dc5..0000000
--- a/docs/en-US/creating-new-volumes.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="creating-new-volumes">
-  <title>Creating a New Volume</title>
-  <para>You can add more data disk volumes to a guest VM at any time, up to the limits of your
-    storage capacity. Both &PRODUCT; administrators and users can add volumes to VM instances. When
-    you create a new volume, it is stored as an entity in &PRODUCT;, but the actual storage
-    resources are not allocated on the physical storage device until you attach the volume. This
-    optimization allows the &PRODUCT; to provision the volume nearest to the guest that will use it
-    when the first attachment is made.</para>
-  <section id="local-storage-data-volumes">
-    <title>Using Local Storage for Data Volumes</title>
-    <para>You can create data volumes on local storage (supported with XenServer, KVM, and VMware).
-      The data volume is placed on the same host as the VM instance that is attached to the data
-      volume. These local data volumes can be attached to virtual machines, detached, re-attached,
-      and deleted just as with the other types of data volume.</para>
-    <para>Local storage is ideal for scenarios where persistence of data volumes and HA is not
-      required. Some of the benefits include reduced disk I/O latency and cost reduction from using
-      inexpensive local disks.</para>
-    <para>In order for local volumes to be used, the feature must be enabled for the zone.</para>
-    <para>You can create a data disk offering for local storage. When a user creates a new VM, they
-      can select this disk offering in order to cause the data disk volume to be placed in local
-      storage.</para>
-    <para>You can not migrate a VM that has a volume in local storage to a different host, nor
-      migrate the volume itself away to a different host. If you want to put a host into maintenance
-      mode, you must first stop any VMs with local data volumes on that host.</para>
-  </section>
-  <section id="creating-new-volume-steps">
-    <title>To Create a New Volume</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in to the &PRODUCT; UI as a user or admin.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation bar, click Storage.</para>
-      </listitem>
-      <listitem>
-        <para>In Select View, choose Volumes.</para>
-      </listitem>
-      <listitem>
-        <para>To create a new volume, click Add Volume, provide the following details, and click
-          OK.</para>
-        <itemizedlist>
-          <listitem>
-            <para>Name. Give the volume a unique name so you can find it later.</para>
-          </listitem>
-          <listitem>
-            <para>Availability Zone. Where do you want the storage to reside? This should be close
-              to the VM that will use the volume.</para>
-          </listitem>
-          <listitem>
-            <para>Disk Offering. Choose the characteristics of the storage.</para>
-          </listitem>
-        </itemizedlist>
-        <para>The new volume appears in the list of volumes with the state “Allocated.” The volume
-          data is stored in &PRODUCT;, but the volume is not yet ready for use</para>
-      </listitem>
-      <listitem>
-        <para>To start using the volume, continue to Attaching a Volume </para>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/creating-shared-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-shared-network.xml b/docs/en-US/creating-shared-network.xml
deleted file mode 100644
index e6a018f..0000000
--- a/docs/en-US/creating-shared-network.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="creating-shared-network">
-  <title>Configuring a Shared Guest Network</title>
-  <orderedlist>
-    <listitem>
-      <para>Log in to the &PRODUCT; UI as administrator.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation, choose Infrastructure.</para>
-    </listitem>
-    <listitem>
-      <para>On Zones, click View More.</para>
-    </listitem>
-    <listitem>
-      <para>Click the zone to which you want to add a guest network.</para>
-    </listitem>
-    <listitem>
-      <para>Click the Physical Network tab.</para>
-    </listitem>
-    <listitem>
-      <para>Click the physical network you want to work with.</para>
-    </listitem>
-    <listitem>
-      <para>On the Guest node of the diagram, click Configure.</para>
-    </listitem>
-    <listitem>
-      <para>Click the Network tab.</para>
-    </listitem>
-    <listitem>
-      <para>Click Add guest network.</para>
-      <para>The Add guest network window is displayed.</para>
-    </listitem>
-    <listitem>
-      <para>Specify the following:</para>
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Name</emphasis>: The name of the network. This will be visible
-            to the user.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Description</emphasis>: The short description of the network
-            that can be displayed to users.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">VLAN ID</emphasis>: The unique ID of the VLAN.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Isolated VLAN ID</emphasis>: The unique ID of the Secondary
-            Isolated VLAN. </para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Scope</emphasis>: The available scopes are Domain, Account,
-            Project, and All.</para>
-          <itemizedlist>
-            <listitem>
-              <para><emphasis role="bold">Domain</emphasis>: Selecting Domain limits the scope of
-                this guest network to the domain you specify. The network will not be available for
-                other domains. If you select Subdomain Access, the guest network is available to all
-                the sub domains within the selected domain.</para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="bold">Account</emphasis>: The account for which the guest
-                network is being created for. You must specify the domain the account belongs
-                to.</para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="bold">Project</emphasis>: The project for which the guest
-                network is being created for. You must specify the domain the project belongs
-                to.</para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="bold">All</emphasis>: The guest network is available for all the
-                domains, account, projects within the selected zone. </para>
-            </listitem>
-          </itemizedlist>
-        </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">Gateway</emphasis>: The gateway that the guests should
-            use.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Netmask</emphasis>: The netmask in use on the subnet the
-            guests will use.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">IP Range</emphasis>: A range of IP addresses that are
-            accessible from the Internet and are assigned to the guest VMs.</para>
-          <para>If one NIC is used, these IPs should be in the same CIDR in the case of IPv6.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">IPv6 CIDR</emphasis>: The network prefix that defines the
-            guest network subnet. This is the CIDR that describes the IPv6 addresses in use in the
-            guest networks in this zone. To allot IP addresses from within a particular address
-            block, enter a CIDR.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Network Domain</emphasis>: A custom DNS suffix at the level of
-            a network. If you want to assign a special domain name to the guest VM network, specify
-            a DNS suffix.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    <listitem>
-      <para>Click OK to confirm.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/creating-system-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-system-service-offerings.xml b/docs/en-US/creating-system-service-offerings.xml
deleted file mode 100644
index e33d9d0..0000000
--- a/docs/en-US/creating-system-service-offerings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-
-<section id="creating-system-service-offerings">
-    <title>Creating a New System Service Offering</title>
-    <para>To create a system service offering:</para>
-    <orderedlist>
-        <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
-        <listitem><para>In the left navigation bar, click Service Offerings.</para></listitem>
-        <listitem><para>In Select Offering, choose System Offering.</para></listitem>
-        <listitem><para>Click Add System Service Offering.</para></listitem>
-        <listitem><para>In the dialog, make the following choices:</para>
-        <itemizedlist>
-            <listitem><para>Name. Any desired name for the system offering.</para></listitem>
-            <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
-            <listitem><para>System VM Type. Select the type of system virtual machine that this offering is intended to support.</para></listitem>
-            <listitem><para>Storage type. The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
-            <listitem><para># of CPU cores. The number of cores which should be allocated to a system VM with this offering</para></listitem>
-            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, "2000" would provide for a 2 GHz clock.</para></listitem>
-            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, "2048" would provide for a 2 GB RAM allocation.</para></listitem>
-            <listitem><para>Network Rate. Allowed data transfer rate in MB per second.</para></listitem>
-            <listitem><para>Offer HA. If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.</para></listitem>
-            <listitem><para>Storage Tags.  The tags that should be associated with the primary storage used by the system VM.</para></listitem>
-            <listitem><para>Host Tags.  (Optional) Any tags that you use to organize your hosts</para></listitem>
-            <listitem><para>CPU cap. Whether to limit the level of CPU usage even if spare capacity is available.</para></listitem>
-            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
-        </itemizedlist></listitem> 
-        <listitem><para>Click Add.</para></listitem>        
-    </orderedlist>                
-    
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/creating-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml
deleted file mode 100644
index df4d88e..0000000
--- a/docs/en-US/creating-vms.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="creating-vms">
-  <title>Creating VMs</title>
-  <para>Virtual machines are usually created from a template. Users can also create blank virtual
-    machines. A blank virtual machine is a virtual machine without an OS template. Users can attach
-    an ISO file and install the OS from the CD/DVD-ROM.</para>
-  <note>
-    <para>You can create a VM without starting it. You can determine whether the VM needs to be
-      started as part of the VM deployment. A request parameter, startVM, in the deployVm API
-      provides this feature. For more information, see the Developer's Guide</para>
-  </note>
-  <para/>
-  <section id="creating-vm-from-template">
-    <title>Creating a VM from a template</title>
-  <orderedlist>
-    <listitem>
-      <para>Log in to the &PRODUCT; UI as an administrator or user.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation bar, click Instances.</para>
-    </listitem>
-    <listitem>
-      <para>Click Add Instance.</para>
-    </listitem>
-    <listitem>
-      <para>Select a zone.</para>
-    </listitem>
-    <listitem>
-      <para>Select a template, then follow the steps in the wizard. For more information about how
-        the templates came to be in this list, see <xref linkend="working-with-templates"/>.</para>
-    </listitem>
-    <listitem>
-      <para>Be sure that the hardware you have allows starting the selected service offering.</para>
-    </listitem>
-    <listitem>
-      <para>Click Submit and your VM will be created and started.</para>
-      <note>
-        <para>For security reasons, the internal name of the VM is visible only to the root
-            admin.</para>
-      </note>
-    </listitem>
-  </orderedlist>
-  </section>
-  <section id="creating-vm-from-iso">
-  <title>Creating a VM from an ISO</title>
-  <note>
-    <para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in
-      the template or added after the VM is created. The PV drivers are necessary for essential
-      management functions such as mounting additional volumes and ISO images, live migration, and
-      graceful shutdown.</para>
-  </note>
-  <para/>
-  <orderedlist>
-    <listitem>
-      <para>Log in to the &PRODUCT; UI as an administrator or user.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation bar, click Instances.</para>
-    </listitem>
-    <listitem>
-      <para>Click Add Instance.</para>
-    </listitem>
-    <listitem>
-      <para>Select a zone.</para>
-    </listitem>
-    <listitem>
-      <para>Select ISO Boot, and follow the steps in the wizard.</para>
-    </listitem>
-    <listitem>
-      <para>Click Submit and your VM will be created and started.</para>
-    </listitem>
-    <!-- <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem> -->
-  </orderedlist>
-</section>
-<section id="vmware-configure-linked-clones">
-  <!-- CS-17387 -->
-  <title>Configuring Usage of Linked Clones on VMware</title>
-  <para>(For ESX hypervisor in conjunction with vCenter)</para>
-  <para>VMs can be created as either linked clones or full clones on VMware.</para>
-  <para>For a full description of clone types, refer to VMware documentation. In summary: A
-    full clone is a copy of an existing virtual machine which, once created, does not depend
-    in any way on the original virtual machine. A linked clone is also a copy of an existing
-    virtual machine, but it has ongoing dependency on the original. A linked clone shares the
-    virtual disk of the original VM, and retains access to all files that were present at the
-    time the clone was created.</para>
-  <para>The use of these different clone types involves some side effects and tradeoffs, so it
-    is to the administrator's advantage to be able to choose which of the two types will be
-    used in a &PRODUCT; deployment.</para>
-  <para>A new global configuration setting has been added, vmware.create.full.clone. When the
-    administrator sets this to true, end users can create guest VMs only as full clones. The
-    default value is false. </para>
-  <para>It is not recommended to change the value of vmware.create.full.clone in a cloud with
-    running VMs. However, if the value is changed, existing VMs are not affected. Only VMs
-    created after the setting is put into effect are subject to the restriction.</para>
-</section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/customizing-dns.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/customizing-dns.xml b/docs/en-US/customizing-dns.xml
deleted file mode 100644
index c24bad8..0000000
--- a/docs/en-US/customizing-dns.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-
-<section id="customizing-dns">
-    <title>Customizing the Network Domain Name</title>
-    <para>The root administrator can optionally assign a custom DNS suffix at the level of a network, account, domain, zone, or entire &PRODUCT; installation, and a domain administrator can do so within their own domain. To specify a custom domain name and put it into effect, follow these steps.</para>
-    <orderedlist>
-        <listitem><para>Set the DNS suffix at the desired scope</para>
-        <itemizedlist>
-            <listitem><para>At the network level, the DNS suffix can be assigned through the UI when creating a new network, as described in <xref linkend="add-additional-guest-network"/> or with the updateNetwork command in the &PRODUCT; API.</para></listitem>
-            <listitem><para>At the account, domain, or zone level, the DNS suffix can be assigned with the appropriate &PRODUCT; API commands: createAccount, editAccount, createDomain, editDomain, createZone, or editZone.</para></listitem>
-            <listitem><para>At the global level, use the configuration parameter guest.domain.suffix. You can also use the &PRODUCT; API command updateConfiguration. After modifying this global configuration, restart the Management Server to put the new setting into effect.</para></listitem>
-        </itemizedlist></listitem>
-        <listitem><para>To make the new DNS suffix take effect for an existing network, call the &PRODUCT; API command updateNetwork. This step is not necessary when the DNS suffix was specified while creating a new network.</para></listitem>
-        </orderedlist>
-    <para>The source of the network domain that is used depends on the following rules.</para>
-    <itemizedlist>
-        <listitem><para>For all networks, if a network domain is specified as part of a network's own configuration, that value is used.</para></listitem>
-        <listitem><para>For an account-specific network, the network domain specified for the account is used. If none is specified, the system looks for a value in the domain, zone, and global configuration, in that order.</para></listitem>
-        <listitem><para>For a domain-specific network, the network domain specified for the domain is used. If none is specified, the system looks for a value in the zone and global configuration, in that order.</para></listitem>
-        <listitem><para>For a zone-specific network, the network domain specified for the zone is used. If none is specified, the system looks for a value in the global configuration.</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/database-replication.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/database-replication.xml b/docs/en-US/database-replication.xml
deleted file mode 100644
index 8ca8071..0000000
--- a/docs/en-US/database-replication.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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" [
-<!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.
--->
-
-<section id="database-replication">
-    <title>Database Replication (Optional)</title>
-    <para>&PRODUCT; supports database replication from one MySQL node to another. This is achieved using standard MySQL replication. You may want to do this as insurance against MySQL server or storage loss. MySQL replication is implemented using a master/slave model. The master is the node that the Management Servers are configured to use. The slave is a standby node that receives all write operations from the master and applies them to a local, redundant copy of the database. The following steps are a guide to implementing MySQL replication.</para>
-    <note><para>Creating a replica is not a backup solution. You should develop a backup procedure for the MySQL data that is distinct from replication.</para></note>
-    <orderedlist>
-    <listitem><para>Ensure that this is a fresh install with no data in the master.</para></listitem>
-    <listitem>
-        <para>Edit my.cnf on the master and add the following in the [mysqld] section below datadir.</para>
-        <programlisting>
-log_bin=mysql-bin
-server_id=1
-        </programlisting>
-        <para>The server_id must be unique with respect to other servers. The recommended way to achieve this is to give the master an ID of 1 and each slave a sequential number greater than 1, so that the servers are numbered 1, 2, 3, etc.</para>
-    </listitem>
-    <listitem>
-        <para>Restart the MySQL service. On RHEL/CentOS systems, use:</para>
-        <programlisting>
-# service mysqld restart
-        </programlisting>
-        <para>On Debian/Ubuntu systems, use:</para>
-        <programlisting>
-# service mysql restart
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Create a replication account on the master and give it privileges. We will use the "cloud-repl" user with the password "password". This assumes that master and slave run on the 172.16.1.0/24 network.</para>
-        <programlisting>
-# mysql -u root
-mysql> create user 'cloud-repl'@'172.16.1.%' identified by 'password';
-mysql> grant replication slave on *.* TO 'cloud-repl'@'172.16.1.%';
-mysql> flush privileges;
-mysql> flush tables with read lock;
-        </programlisting>
-    </listitem>
-    <listitem><para>Leave the current MySQL session running.</para></listitem>
-    <listitem><para>In a new shell start a second MySQL session.</para></listitem>
-    <listitem>
-        <para>Retrieve the current position of the database.</para>
-        <programlisting>
-# mysql -u root
-mysql> show master status;
-+------------------+----------+--------------+------------------+
-| File             | Position | Binlog_Do_DB | Binlog_Ignore_DB |
-+------------------+----------+--------------+------------------+
-| mysql-bin.000001 |      412 |              |                  |
-+------------------+----------+--------------+------------------+
-        </programlisting>
-    </listitem>
-    <listitem><para>Note the file and the position that are returned by your instance.</para></listitem>
-    <listitem><para>Exit from this session.</para></listitem>
-    <listitem>
-        <para>Complete the master setup. Returning to your first session on the master, release the locks and exit MySQL.</para>
-        <programlisting>
-mysql> unlock tables;
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Install and configure the slave. On the slave server, run the following commands.</para>
-        <programlisting>
-# yum install mysql-server
-# chkconfig mysqld on
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Edit my.cnf and add the following lines in the [mysqld] section below datadir.</para>
-        <programlisting>
-server_id=2
-innodb_rollback_on_timeout=1
-innodb_lock_wait_timeout=600
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Restart MySQL. Use "mysqld" on RHEL/CentOS systems:</para>
-        <programlisting>
-# service mysqld restart
-        </programlisting>
-        <para>On Ubuntu/Debian systems use "mysql."</para>
-        <programlisting>
-# service mysql restart
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Instruct the slave to connect to and replicate from the master. Replace the IP address, password, log file, and position with the values you have used in the previous steps.</para>
-        <programlisting>
-mysql> change master to
-    -> master_host='172.16.1.217',
-    -> master_user='cloud-repl',
-    -> master_password='password',
-    -> master_log_file='mysql-bin.000001',
-    -> master_log_pos=412;
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Then start replication on the slave.</para>
-        <programlisting>
-mysql> start slave;
-        </programlisting>
-    </listitem>
-    <listitem>
-        <para>Optionally, open port 3306 on the slave as was done on the master earlier.</para>
-        <para>This is not required for replication to work. But if you choose not to do this, you will need to do it when failover to the replica occurs.</para>
-    </listitem>
-    </orderedlist>
-    <section id="database-failover">
-    <title>Failover</title>
-    <para>This will provide for a replicated database that can be used to implement manual failover for the Management Servers. &PRODUCT; failover from one MySQL instance to another is performed by the administrator. In the event of a database failure you should:</para>
-    <orderedlist>
-        <listitem><para>Stop the Management Servers (via service cloudstack-management stop).</para></listitem>
-        <listitem><para>Change the replica's configuration to be a master and restart it.</para></listitem>
-        <listitem><para>Ensure that the replica's port 3306 is open to the Management Servers.</para></listitem>
-        <listitem><para>Make a change so that the Management Server uses the new database. The simplest process here is to put the IP address of the new database server into each Management Server's /etc/cloudstack/management/db.properties.</para></listitem>
-        <listitem>
-        <para>Restart the Management Servers:</para>
-        <programlisting>
-# service cloudstack-management start
-        </programlisting>
-        </listitem>
-    </orderedlist>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/dates-in-usage-record.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dates-in-usage-record.xml b/docs/en-US/dates-in-usage-record.xml
deleted file mode 100644
index dc2f072..0000000
--- a/docs/en-US/dates-in-usage-record.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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.
--->
-
-    <section id="dates-in-usage-record">
-        <title>Dates in the Usage Record</title>
-        <para>Usage records include a start date and an end date. These dates define the period of time for which the raw usage number was calculated. If daily aggregation is used, the start date is midnight on the day in question and the end date is 23:59:59 on the day in question (with one exception; see below). A virtual machine could have been deployed at noon on that day, stopped at 6pm on that day, then started up again at 11pm. When usage is calculated on that day, there will be 7 hours of running VM usage (usage type 1) and 12 hours of allocated VM usage (usage type 2). If the same virtual machine runs for the entire next day, there will 24 hours of both running VM usage (type 1) and allocated VM usage (type 2).</para>
-        <para>Note: The start date is not the time a virtual machine was started, and the end date is not the time when a virtual machine was stopped. The start and end dates give the time range within which usage was calculated.</para>
-    <para>For network usage, the start date and end date again define the range in which the number of bytes transferred was calculated. If a user downloads 10 MB and uploads 1 MB in one day, there will be two records, one showing the 10 megabytes received and one showing the 1 megabyte sent.</para>
-    <para>There is one case where the start date and end date do not correspond to midnight and 11:59:59pm when daily aggregation is used. This occurs only for network usage records. When the usage server has more than one day's worth of unprocessed data, the old data will be included in the aggregation period. The start date in the usage record will show the date and time of the earliest event. For other types of usage, such as IP addresses and VMs, the old unprocessed data is not included in daily aggregation.</para>
-    </section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/dedicated-ha-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dedicated-ha-hosts.xml b/docs/en-US/dedicated-ha-hosts.xml
deleted file mode 100644
index 89c721f..0000000
--- a/docs/en-US/dedicated-ha-hosts.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-
-<section id="dedicated-ha-hosts">
-    <title>Dedicated HA Hosts</title>
-    <para>One or more hosts can be designated for use only by HA-enabled VMs that are restarting due to a host failure. Setting up a pool of such dedicated HA hosts as the recovery destination for all HA-enabled VMs is useful to:</para>
-    <itemizedlist>
-        <listitem><para>Make it easier to determine which VMs have been restarted as part of the &PRODUCT; high-availability function. If a VM is running on a dedicated HA host, then it must be an HA-enabled VM whose original host failed. (With one exception: It is possible for an administrator to manually migrate any VM to a dedicated HA host.).</para></listitem>
-        <listitem><para>Keep HA-enabled VMs from restarting on hosts which may be reserved for other purposes.</para></listitem>
-    </itemizedlist>
-    <para>The dedicated HA option is set through a special host tag when the host is created. To allow the administrator to dedicate hosts to only HA-enabled VMs, set the global configuration variable ha.tag to the desired tag (for example, "ha_host"), and restart the Management Server. Enter the value in the Host Tags field when adding the host(s) that you want to dedicate to HA-enabled VMs.</para>
-    <note><para>If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail to restart after a crash.</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/default-account-resource-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-account-resource-limit.xml b/docs/en-US/default-account-resource-limit.xml
deleted file mode 100644
index 5134e50..0000000
--- a/docs/en-US/default-account-resource-limit.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="default-account-resource-limit">
-    <title>Default Account Resource Limits</title>
-    <para>You can limit resource use by accounts. The default limits are set by using global
-        configuration parameters, and they affect all accounts within a cloud. The relevant
-        parameters are those beginning with max.account, for example: max.account.snapshots.</para>
-    <para>To override a default limit for a particular account, set a per-account resource limit.</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
-        <listitem><para>In the left navigation tree, click Accounts.</para></listitem>
-        <listitem><para>Select the account you want to modify. The current limits are displayed. A value of -1 shows
-                that there is no limit in place.</para></listitem>
-        <listitem><para>Click the Edit button.<inlinemediaobject>
-                    <imageobject>
-                        <imagedata fileref="./images/edit-icon.png"/>
-                    </imageobject>
-                    <textobject>
-                        <phrase>editbutton.png: edits the settings</phrase>
-                    </textobject>
-                </inlinemediaobject></para></listitem>
-    </orderedlist>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/default-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-template.xml b/docs/en-US/default-template.xml
deleted file mode 100644
index 16442c3..0000000
--- a/docs/en-US/default-template.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-
-<section id="default-template">
-    <title>The Default Template</title>
-    <para>&PRODUCT; includes a CentOS template. This template is downloaded by the Secondary Storage VM after the primary and secondary storage are configured. You can use this template in your production deployment or you can delete it and use custom templates.</para>
-    <para>The root password for the default template is "password".</para>
-    <para>A default template is provided for each of XenServer, KVM, and vSphere.  The templates that are downloaded depend on the hypervisor type that is available in your cloud.  Each template is approximately 2.5 GB physical size.</para>
-    <para>The default template includes the standard iptables rules, which will block most access to the template excluding ssh.</para>
-    <programlisting># iptables --list
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-RH-Firewall-1-INPUT  all  --  anywhere             anywhere
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination
-RH-Firewall-1-INPUT  all  --  anywhere             anywhere
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain RH-Firewall-1-INPUT (2 references)
-target     prot opt source               destination
-ACCEPT     all  --  anywhere             anywhere
-ACCEPT     icmp --  anywhere        anywhere       icmp any
-ACCEPT     esp  --  anywhere        anywhere
-ACCEPT     ah   --  anywhere        anywhere
-ACCEPT     udp  --  anywhere        224.0.0.251    udp dpt:mdns
-ACCEPT     udp  --  anywhere        anywhere       udp dpt:ipp
-ACCEPT     tcp  --  anywhere        anywhere       tcp dpt:ipp
-ACCEPT     all  --  anywhere        anywhere       state RELATED,ESTABLISHED
-ACCEPT     tcp  --  anywhere        anywhere       state NEW tcp dpt:ssh
-REJECT     all  --  anywhere        anywhere       reject-with icmp-host-
-</programlisting>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/delete-event-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml
deleted file mode 100644
index 392b37f..0000000
--- a/docs/en-US/delete-event-alerts.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="delete-event-alerts">
-  <title>Deleting and Archiving Events and Alerts</title>
-  <para>&PRODUCT; provides you the ability to delete or archive the existing alerts and events that
-    you no longer want to implement. You can regularly delete or archive any alerts or events that
-    you cannot, or do not want to resolve from the database.</para>
-  <para>You can delete or archive individual alerts or events either directly by using the Quickview
-    or by using the Details page. If you want to delete multiple alerts or events at the same time,
-    you can use the respective context menu. You can delete alerts or events by category for a time
-    period. For example, you can select categories such as <emphasis role="bold"
-      >USER.LOGOUT</emphasis>, <emphasis role="bold">VM.DESTROY</emphasis>, <emphasis role="bold"
-      >VM.AG.UPDATE</emphasis>, <emphasis role="bold">CONFIGURATION.VALUE.EDI</emphasis>, and so on.
-    You can also view the number of events or alerts archived or deleted.</para>
-  <para>In order to support the delete or archive alerts, the following global parameters have been
-    added:</para>
-  <itemizedlist>
-    <listitem>
-      <para><emphasis role="bold">alert.purge.delay</emphasis>: The alerts older than specified
-        number of days are purged. Set the value to 0 to never purge alerts automatically.</para>
-    </listitem>
-    <listitem>
-      <para><emphasis role="bold">alert.purge.interval</emphasis>: The interval in seconds to wait
-        before running the alert purge thread. The default is 86400 seconds (one day).</para>
-    </listitem>
-  </itemizedlist>
-  <note>
-    <para>Archived alerts or events cannot be viewed in the UI or by using the API. They are
-      maintained in the database for auditing or compliance purposes.</para>
-  </note>
-  <section id="permissions-events">
-    <title>Permissions</title>
-    <para>Consider the following:</para>
-    <itemizedlist>
-      <listitem>
-        <para>The root admin can delete or archive one or multiple alerts or events.</para>
-      </listitem>
-      <listitem>
-        <para>The domain admin or end user can delete or archive one or multiple events.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section id="del-archive">
-    <title>Procedure</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in as administrator to the &PRODUCT; UI.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation, click Events.</para>
-      </listitem>
-      <listitem>
-        <para>Perform either of the following:</para>
-        <itemizedlist>
-          <listitem>
-            <para>To archive events, click Archive Events, and specify event type and time
-              period.</para>
-          </listitem>
-          <listitem>
-            <para>To archive events, click Delete Events, and specify event type and time
-              period.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para>Click OK.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/delete-reset-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-reset-vpn.xml b/docs/en-US/delete-reset-vpn.xml
deleted file mode 100644
index 2fe85d2..0000000
--- a/docs/en-US/delete-reset-vpn.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="delete-reset-vpn">
-  <title>Restarting and Removing a VPN Connection</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>In the Select view, select VPC.</para>
-      <para>All the VPCs that you have created for the account is listed in the page.</para>
-    </listitem>
-    <listitem>
-      <para>Click the Configure button of the VPC to which you want to deploy the VMs.</para>
-      <para>The VPC page is displayed where all the tiers you created are listed in a
-        diagram.</para>
-    </listitem>
-    <listitem>
-      <para>Click the Settings icon.</para>
-      <para>For each tier, the following options are displayed:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Internal LB</para>
-        </listitem>
-        <listitem>
-          <para>Public LB IP</para>
-        </listitem>
-        <listitem>
-          <para>Static NAT</para>
-        </listitem>
-        <listitem>
-          <para>Virtual Machines</para>
-        </listitem>
-        <listitem>
-          <para>CIDR</para>
-        </listitem>
-      </itemizedlist>
-      <para>The following router information is displayed:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Private Gateways</para>
-        </listitem>
-        <listitem>
-          <para>Public IP Addresses</para>
-        </listitem>
-        <listitem>
-          <para>Site-to-Site VPNs</para>
-        </listitem>
-        <listitem>
-          <para>Network ACL Lists</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    <listitem>
-      <para>Select Site-to-Site VPN.</para>
-      <para>The Site-to-Site VPN page is displayed.</para>
-    </listitem>
-    <listitem>
-      <para>From the Select View drop-down, ensure that VPN Connection is selected.</para>
-      <para>All the VPN connections you created are displayed.</para>
-    </listitem>
-    <listitem>
-      <para>Select the VPN connection you want to work with.</para>
-      <para> The Details tab is displayed.</para>
-    </listitem>
-    <listitem>
-      <para>To remove a VPN connection, click the Delete VPN connection button<inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="./images/remove-vpn.png"/>
-          </imageobject>
-          <textobject>
-            <phrase>remove-vpn.png: button to remove a VPN connection</phrase>
-          </textobject>
-        </inlinemediaobject></para>
-      <para>To restart a VPN connection, click the Reset VPN connection button present in the
-        Details tab.<inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="./images/reset-vpn.png"/>
-          </imageobject>
-          <textobject>
-            <phrase>reset-vpn.png: button to reset a VPN connection</phrase>
-          </textobject>
-        </inlinemediaobject></para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/delete-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-templates.xml b/docs/en-US/delete-templates.xml
deleted file mode 100644
index f9351da..0000000
--- a/docs/en-US/delete-templates.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-
-<section id="delete-templates">
-    <title>Deleting Templates</title>
-    <para>Templates may be deleted. In general, when a template spans multiple Zones, only the copy that is selected for deletion will be deleted; the same template in other Zones will not be deleted. The provided CentOS template is an exception to this.  If the provided CentOS template is deleted, it will be deleted from all Zones.</para>
-    <para>When templates are deleted, the VMs instantiated from them will continue to run. However, new VMs cannot be created based on the deleted template.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/deleting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deleting-vms.xml b/docs/en-US/deleting-vms.xml
deleted file mode 100644
index 97245c8..0000000
--- a/docs/en-US/deleting-vms.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="deleting-vms">
-		<title>Deleting VMs</title>
-			<para>Users can delete their own virtual machines. A running virtual machine will be abruptly stopped before it is deleted. Administrators can delete any virtual machines.</para>
-			<para>To delete a virtual machine:</para>	
-			<orderedlist>
-				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-				<listitem><para>In the left navigation, click Instances.</para></listitem>
-				<listitem><para>Choose the VM that you want to delete.</para></listitem>
-				<listitem><para>Click the Destroy Instance button. <inlinemediaobject>
-					<imageobject>
-						<imagedata fileref="./images/destroy-instance.png"/>
-					</imageobject>
-					<textobject>
-						<phrase>Destroyinstance.png: button to destroy an instance</phrase>
-					</textobject>
-				</inlinemediaobject>
-			</para></listitem>
-			</orderedlist>
-	</section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/dell62xx-hardware.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dell62xx-hardware.xml b/docs/en-US/dell62xx-hardware.xml
deleted file mode 100644
index 8bc7770..0000000
--- a/docs/en-US/dell62xx-hardware.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="dell62xx-hardware">
-  <title>Dell 62xx</title>
-  <para>The following steps show how a Dell 62xx is configured for zone-level layer-3 switching.
-    These steps assume VLAN 201 is used to route untagged private IPs for pod 1, and pod 1’s layer-2
-    switch is connected to Ethernet port 1/g1.</para>
-  <para>The Dell 62xx Series switch supports up to 1024 VLANs.</para>
-  <orderedlist>
-    <listitem>
-      <para>Configure all the VLANs in the database.</para>
-      <programlisting>vlan database
-vlan 200-999
-exit</programlisting>
-    </listitem>
-    <listitem>
-      <para>Configure Ethernet port 1/g1.</para>
-      <programlisting>interface ethernet 1/g1
-switchport mode general
-switchport general pvid 201
-switchport general allowed vlan add 201 untagged
-switchport general allowed vlan add 300-999 tagged
-exit</programlisting>
-    </listitem>
-  </orderedlist>
-  <para>The statements configure Ethernet port 1/g1 as follows:</para>
-  <itemizedlist>
-    <listitem>
-      <para>VLAN 201 is the native untagged VLAN for port 1/g1.</para>
-    </listitem>
-    <listitem>
-      <para>All VLANs (300-999) are passed to all the pod-level layer-2 switches.</para>
-    </listitem>
-  </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/dell62xx-layer2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dell62xx-layer2.xml b/docs/en-US/dell62xx-layer2.xml
deleted file mode 100644
index 1c0eea0..0000000
--- a/docs/en-US/dell62xx-layer2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="dell62xx-layer2">
-  <title>Dell 62xx</title>
-  <para>The following steps show how a Dell 62xx is configured for pod-level layer-2
-    switching.</para>
-  <orderedlist>
-    <listitem>
-      <para>Configure all the VLANs in the database.</para>
-      <programlisting>vlan database
-vlan 300-999
-exit</programlisting>
-    </listitem>
-    <listitem>
-      <para>VLAN 201 is used to route untagged private IP addresses for pod 1, and pod 1 is connected to this layer-2 switch.</para>
-      <programlisting>interface range ethernet all
-switchport mode general
-switchport general allowed vlan add 300-999 tagged
-exit</programlisting>
-    </listitem>
-  </orderedlist>
-  <para>The statements configure all Ethernet ports to function as follows:</para>
-  <itemizedlist>
-    <listitem>
-      <para>All ports are configured the same way.</para>
-    </listitem>
-    <listitem>
-      <para>All VLANs (300-999) are passed through all the ports of the layer-2 switch.</para>
-    </listitem>
-  </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/deployment-architecture-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
deleted file mode 100644
index 835898c..0000000
--- a/docs/en-US/deployment-architecture-overview.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="deployment-architecture-overview">
-	<title>Deployment Architecture Overview</title>
-	<para>
-        A &PRODUCT; installation consists of two parts: the Management Server
-        and the cloud infrastructure that it manages. When you set up and 
-        manage a &PRODUCT; cloud, you provision resources such as hosts,
-        storage devices, and IP addresses into the Management Server, and
-        the Management Server manages those resources.
-	</para>
-	<para>
-        The minimum production installation consists of one machine running
-        the &PRODUCT; Management Server and another machine to act as the
-        cloud infrastructure (in this case, a very simple infrastructure
-        consisting of one host running hypervisor software). In its smallest 
-        deployment, a single machine can act as both the Management Server
-        and the hypervisor host (using the KVM hypervisor).
-	</para>
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="./images/basic-deployment.png" />
-		</imageobject>
-		<textobject><phrase>basic-deployment.png: Basic two-machine deployment</phrase></textobject>
-	</mediaobject>
-    <para>
-       A more full-featured installation consists of a highly-available
-       multi-node Management Server installation and up to tens of thousands of
-       hosts using any of several advanced networking setups. For 
-       information about deployment options, see the "Choosing a Deployment Architecture" 
-       section of the &PRODUCT; Installation Guide.
-	</para>
-	<xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="networking-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/detach-move-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
deleted file mode 100644
index 8922db1..0000000
--- a/docs/en-US/detach-move-volumes.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!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.
--->
-<section id="detach-move-volumes">
-  <title>Detaching and Moving Volumes</title>
-  <note>
-    <para>This procedure is different from moving volumes from one storage pool to another as described in <xref linkend="vm-storage-migration"/>.</para></note>
-  <para/>
-  <para>A volume can be detached from a guest VM and attached to another guest. Both &PRODUCT;
-    administrators and users can detach volumes from VMs and move them to other VMs.</para>
-  <para>If the two VMs are in different clusters, and the volume is large, it may take several
-    minutes for the volume to be moved to the new VM.</para>
-  <!-- <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
-  <orderedlist>
-    <listitem>
-      <para>Log in to the &PRODUCT; UI as a user or admin.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation bar, click Storage, and choose Volumes in Select View.
-        Alternatively, if you know which VM the volume is attached to, you can click Instances,
-        click the VM name, and click View Volumes.</para>
-    </listitem>
-    <listitem>
-      <para>Click the name of the volume you want to detach, then click the Detach Disk button. <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="./images/detach-disk-icon.png"/>
-          </imageobject>
-          <textobject>
-            <phrase>DetachDiskButton.png: button to detach a volume</phrase>
-          </textobject>
-        </inlinemediaobject>
-      </para>
-    </listitem>
-    <listitem>
-      <para>To move the volume to another VM, follow the steps in <xref linkend="attaching-volume"
-        />.</para>
-    </listitem>
-  </orderedlist>
-</section>


Mime
View raw message