cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [39/51] [partial] cloudstack-docs git commit: Remove all old docbook files
Date Thu, 01 Oct 2015 14:04:49 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/citrix-xenserver-installation.xml
----------------------------------------------------------------------
diff --git a/en-US/citrix-xenserver-installation.xml b/en-US/citrix-xenserver-installation.xml
deleted file mode 100644
index 09d07aa..0000000
--- a/en-US/citrix-xenserver-installation.xml
+++ /dev/null
@@ -1,757 +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="citrix-xenserver-installation">
-  <title>Citrix XenServer Installation for &PRODUCT;</title>
-  <para>If you want to use the Citrix XenServer hypervisor to run guest virtual machines, install
-    XenServer 6.0 or XenServer 6.0.2 on the host(s) in your cloud. For an initial installation,
-    follow the steps below. If you have previously installed XenServer and want to upgrade to
-    another version, see <xref linkend="xenserver-version-upgrading"/>.</para>
-  <section id="system-requirements-xenserver-hosts">
-    <title>System Requirements for XenServer Hosts</title>
-    <itemizedlist>
-      <listitem>
-        <para>The host must be certified as compatible with one of the following. See the Citrix
-          Hardware Compatibility Guide: <ulink url="http://hcl.xensource.com"
-            >http://hcl.xensource.com</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para>XenServer 5.6 SP2</para>
-          </listitem>
-          <listitem>
-            <para>XenServer 6.0</para>
-          </listitem>
-          <listitem>
-            <para>XenServer 6.0.2</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para>You must re-install Citrix XenServer if you are going to re-use a host from a previous
-          install.</para>
-      </listitem>
-      <listitem>
-        <para>Must support HVM (Intel-VT or AMD-V enabled)</para>
-      </listitem>
-      <listitem>
-        <para>Be sure all the hotfixes provided by the hypervisor vendor are applied. Track the
-          release of hypervisor patches through your hypervisor vendor’s support channel, and apply
-          patches as soon as possible after they are released. &PRODUCT; will not track or notify
-          you of required hypervisor patches. It is essential that your hosts are completely up to
-          date with the provided hypervisor patches. The hypervisor vendor is likely to refuse to
-          support any system that is not up to date with patches.</para>
-      </listitem>
-      <listitem>
-        <para>All hosts within a cluster must be homogeneous. The CPUs must be of the same type,
-          count, and feature flags.</para>
-      </listitem>
-      <listitem>
-        <para>Must support HVM (Intel-VT or AMD-V enabled in BIOS)</para>
-      </listitem>
-      <listitem>
-        <para>64-bit x86 CPU (more cores results in better performance)</para>
-      </listitem>
-      <listitem>
-        <para>Hardware virtualization support required</para>
-      </listitem>
-      <listitem>
-        <para>4 GB of memory</para>
-      </listitem>
-      <listitem>
-        <para>36 GB of local disk</para>
-      </listitem>
-      <listitem>
-        <para>At least 1 NIC</para>
-      </listitem>
-      <listitem>
-        <para>Statically allocated IP Address</para>
-      </listitem>
-      <listitem>
-        <para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already
-          running</para>
-      </listitem>
-    </itemizedlist>
-    <warning>
-      <para>The lack of up-do-date hotfixes can lead to data corruption and lost VMs.</para>
-    </warning>
-  </section>
-  <section id="xenserver-installation-steps">
-    <title>XenServer Installation Steps</title>
-    <orderedlist>
-      <listitem>
-        <para>From <ulink url="https://www.citrix.com/English/ss/downloads/"
-            >https://www.citrix.com/English/ss/downloads/</ulink>, download the appropriate version
-          of XenServer for your &PRODUCT; version (see <xref
-            linkend="system-requirements-xenserver-hosts"/>). Install it using the Citrix XenServer
-        Installation Guide.</para>
-    <note><title>Older Versions of XenServer</title>
-        <para>Note that you can download the most recent release of XenServer without having a Citrix account. If you wish to download older versions, you will need to create an account and look through the download archives.</para>
-    </note>
-      </listitem>
-      <listitem>
-        <para>After installation, perform the following configuration steps, which are described in
-          the next few sections:</para>
-        <informaltable frame="all">
-          <tgroup cols="2" align="left" colsep="1" rowsep="1">
-            <colspec colname="c1"/>
-            <colspec colname="c2"/>
-            <thead>
-              <row>
-                <entry><para>Required</para></entry>
-                <entry><para>Optional</para></entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry><para><xref linkend="config-xenserver-dom0-memory"/></para></entry>
-                <entry><para><xref linkend="xenserver-support-pkg-installation"/></para></entry>
-              </row>
-              <row>
-                <entry><para><xref linkend="xenserver-username-password"/></para></entry>
-                <entry><para>Set up SR if not using NFS, iSCSI, or local disk; see <xref
-                      linkend="xenserver-primary-storage-setup"/></para></entry>
-              </row>
-              <row>
-                <entry><para><xref linkend="xenserver-time-sync"/></para></entry>
-                <entry><para><xref linkend="xenserver-iscsi-multipath-setup"/></para></entry>
-              </row>
-              <row>
-                <entry><para><xref linkend="xenserver-get-deploy-license"/></para></entry>
-                <entry><para><xref linkend="xenserver-physical-network-setup"/></para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="config-xenserver-dom0-memory">
-    <title>Configure XenServer dom0 Memory</title>
-    <para>Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable
-      XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for
-      XenServer dom0. For instructions on how to do this, see <ulink
-        url="http://support.citrix.com/article/CTX126531"
-        >http://support.citrix.com/article/CTX126531</ulink>. The article refers to XenServer 5.6,
-      but the same information applies to XenServer 6.0.</para>
-  </section>
-  <section id="xenserver-username-password">
-    <title>Username and Password</title>
-    <para>All XenServers in a cluster must have the same username and password as configured in
-      &PRODUCT;.</para>
-  </section>
-  <section id="xenserver-time-sync">
-    <title>Time Synchronization</title>
-    <para>The host must be set to use NTP. All hosts in a pod must have the same time.</para>
-    <orderedlist>
-      <listitem>
-        <para>Install NTP.</para>
-        <programlisting># yum install ntp</programlisting>
-      </listitem>
-      <listitem>
-        <para>Edit the NTP configuration file to point to your NTP server.</para>
-        <programlisting># vi /etc/ntp.conf</programlisting>
-        <para>Add one or more server lines in this file with the names of the NTP servers you want
-          to use. For example:</para>
-        <programlisting>server 0.xenserver.pool.ntp.org
-server 1.xenserver.pool.ntp.org
-server 2.xenserver.pool.ntp.org
-server 3.xenserver.pool.ntp.org
-    </programlisting>
-      </listitem>
-      <listitem>
-        <para>Restart the NTP client.</para>
-        <programlisting># service ntpd restart</programlisting>
-      </listitem>
-      <listitem>
-        <para>Make sure NTP will start again upon reboot.</para>
-        <programlisting># chkconfig ntpd on</programlisting>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="xenserver-licensing">
-    <title>Licensing</title>
-    <para>Citrix XenServer Free version provides 30 days usage without a license. Following the 30
-      day trial, XenServer requires a free activation and license. You can choose to install a
-      license now or skip this step. If you skip this step, you will need to install a license when
-      you activate and license the XenServer.</para>
-    <section id="xenserver-get-deploy-license">
-      <title>Getting and Deploying a License</title>
-      <para>If you choose to install a license now you will need to use the XenCenter to activate
-        and get a license.</para>
-      <orderedlist>
-        <listitem>
-          <para>In XenCenter, click Tools > License manager.</para>
-        </listitem>
-        <listitem>
-          <para>Select your XenServer and select Activate Free XenServer.</para>
-        </listitem>
-        <listitem>
-          <para>Request a license.</para>
-        </listitem>
-      </orderedlist>
-      <para>You can install the license with XenCenter or using the xe command line tool.</para>
-    </section>
-  </section>
-  <section id="xenserver-support-pkg-installation">
-    <title>Install &PRODUCT; XenServer Support Package (CSP)</title>
-    <para>(Optional)</para>
-    <para>To enable security groups, elastic load balancing, and elastic IP on XenServer, download
-      and install the &PRODUCT; XenServer Support Package (CSP). After installing XenServer, perform
-      the following additional steps on each XenServer host.</para>
-    <orderedlist>
-      <listitem>
-        <para>Download the CSP software onto the XenServer host from one of the following
-          links:</para>
-        <para>For XenServer 6.0.2:</para>
-        <para><ulink
-            url="http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz"
-            >http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz</ulink></para>
-        <para>For XenServer 5.6 SP2:</para>
-        <para><ulink url="http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz"
-            >http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz</ulink></para>
-        <para>For XenServer 6.0:</para>
-        <para><ulink url="http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz"
-            >http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz</ulink></para>
-      </listitem>
-      <listitem>
-        <para>Extract the file:</para>
-        <programlisting># tar xf xenserver-cloud-supp.tgz</programlisting>
-      </listitem>
-      <listitem>
-        <para>Run the following script:</para>
-        <programlisting># xe-install-supplemental-pack xenserver-cloud-supp.iso</programlisting>
-      </listitem>
-      <listitem>
-        <para>If the XenServer host is part of a zone that uses basic networking, disable Open
-          vSwitch (OVS):</para>
-        <programlisting># xe-switch-network-backend  bridge</programlisting>
-        <para>Restart the host machine when prompted.</para>
-      </listitem>
-    </orderedlist>
-    <para>The XenServer host is now ready to be added to &PRODUCT;.</para>
-  </section>
-  <section id="xenserver-primary-storage-setup">
-    <title>Primary Storage Setup for XenServer</title>
-    <para>&PRODUCT; natively supports NFS, iSCSI and local storage. If you are using one of these
-      storage types, there is no need to create the XenServer Storage Repository ("SR").</para>
-    <para>If, however, you would like to use storage connected via some other technology, such as
-      FiberChannel, you must set up the SR yourself. To do so, perform the following steps. If you
-      have your hosts in a XenServer pool, perform the steps on the master node. If you are working
-      with a single XenServer which is not part of a cluster, perform the steps on that
-      XenServer.</para>
-    <orderedlist>
-      <listitem>
-        <para>Connect FiberChannel cable to all hosts in the cluster and to the FiberChannel storage
-          host.</para>
-      </listitem>
-      <listitem id="rescan-scsi">
-        <para>Rescan the SCSI bus. Either use the following command or use XenCenter to perform an
-          HBA rescan.</para>
-        <programlisting># scsi-rescan</programlisting>
-      </listitem>
-      <listitem>
-          <para>Repeat step <xref linkend="rescan-scsi"/> on every host.</para>
-      </listitem>
-      <listitem id="verify-scsi">
-        <para>Check to be sure you see the new SCSI disk.</para>
-        <programlisting># ls /dev/disk/by-id/scsi-360a98000503365344e6f6177615a516b -l</programlisting>
-        <para>The output should look like this, although the specific file name will be different
-          (scsi-&lt;scsiID&gt;):</para>
-        <programlisting>lrwxrwxrwx 1 root root 9 Mar 16 13:47
-/dev/disk/by-id/scsi-360a98000503365344e6f6177615a516b -> ../../sdc
-    </programlisting>
-      </listitem>
-      <listitem>
-          <para>Repeat step <xref linkend="verify-scsi"/> on every host.</para>
-      </listitem>
-      <listitem>
-        <para>On the storage server, run this command to get a unique ID for the new SR.</para>
-        <programlisting># uuidgen</programlisting>
-        <para>The output should look like this, although the specific ID will be different:</para>
-        <programlisting>e6849e96-86c3-4f2c-8fcc-350cc711be3d</programlisting>
-      </listitem>
-      <listitem>
-        <para>Create the FiberChannel SR. In name-label, use the unique ID you just
-          generated.</para>
-        <programlisting>
-# xe sr-create type=lvmohba shared=true
-device-config:SCSIid=360a98000503365344e6f6177615a516b
-name-label=&quot;e6849e96-86c3-4f2c-8fcc-350cc711be3d&quot;
-    </programlisting>
-        <para>This command returns a unique ID for the SR, like the following example (your ID will
-          be different):</para>
-        <programlisting>7a143820-e893-6c6a-236e-472da6ee66bf</programlisting>
-      </listitem>
-      <listitem>
-        <para>To create a human-readable description for the SR, use the following command. In uuid,
-          use the SR ID returned by the previous command. In name-description, set whatever friendly
-          text you prefer.</para>
-        <programlisting># xe sr-param-set uuid=7a143820-e893-6c6a-236e-472da6ee66bf name-description=&quot;Fiber Channel storage repository&quot;</programlisting>
-        <para>Make note of the values you will need when you add this storage to &PRODUCT; later
-          (see <xref linkend="primary-storage-add"/>). In the Add Primary Storage dialog, in
-          Protocol, you will choose PreSetup. In SR Name-Label, you will enter the name-label you
-          set earlier (in this example, e6849e96-86c3-4f2c-8fcc-350cc711be3d).</para>
-      </listitem>
-      <listitem>
-        <para>(Optional) If you want to enable multipath I/O on a FiberChannel SAN, refer to the
-          documentation provided by the SAN vendor.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="xenserver-iscsi-multipath-setup">
-    <title>iSCSI Multipath Setup for XenServer (Optional)</title>
-    <para>When setting up the storage repository on a Citrix XenServer, you can enable multipath
-      I/O, which uses redundant physical components to provide greater reliability in the connection
-      between the server and the SAN. To enable multipathing, use a SAN solution that is supported
-      for Citrix servers and follow the procedures in Citrix documentation. The following links
-      provide a starting point:</para>
-    <itemizedlist>
-      <listitem>
-        <para><ulink url="http://support.citrix.com/article/CTX118791"
-            >http://support.citrix.com/article/CTX118791</ulink></para>
-      </listitem>
-      <listitem>
-        <para><ulink url="http://support.citrix.com/article/CTX125403"
-            >http://support.citrix.com/article/CTX125403</ulink></para>
-      </listitem>
-    </itemizedlist>
-    <para>You can also ask your SAN vendor for advice about setting up your Citrix repository for
-      multipathing.</para>
-    <para>Make note of the values you will need when you add this storage to the &PRODUCT; later
-      (see <xref linkend="primary-storage-add"/>). In the Add Primary Storage dialog, in Protocol,
-      you will choose PreSetup. In SR Name-Label, you will enter the same name used to create the
-      SR.</para>
-    <para>If you encounter difficulty, address the support team for the SAN provided by your vendor.
-      If they are not able to solve your issue, see Contacting Support.</para>
-  </section>
-  <section id="xenserver-physical-network-setup">
-    <title>Physical Networking Setup for XenServer</title>
-    <para>Once XenServer has been installed, you may need to do some additional network
-      configuration. At this point in the installation, you should have a plan for what NICs the
-      host will have and what traffic each NIC will carry. The NICs should be cabled as necessary to
-      implement your plan.</para>
-    <para>If you plan on using NIC bonding, the NICs on all hosts in the cluster must be cabled
-      exactly the same. For example, if eth0 is in the private bond on one host in a cluster, then
-      eth0 must be in the private bond on all hosts in the cluster.</para>
-    <para>The IP address assigned for the management network interface must be static. It can be set
-      on the host itself or obtained via static DHCP.</para>
-    <para>&PRODUCT; configures network traffic of various types to use different NICs or bonds on
-      the XenServer host. You can control this process and provide input to the Management Server
-      through the use of XenServer network name labels. The name labels are placed on physical
-      interfaces or bonds and configured in &PRODUCT;. In some simple cases the name labels are not
-      required.</para>
-    <para>When configuring networks in a XenServer environment, network traffic labels must be
-      properly configured to ensure that the virtual interfaces are created by &PRODUCT; are bound
-      to the correct physical device. The name-label of the XenServer network must match the
-      XenServer traffic label specified while creating the &PRODUCT; network. This is set by running
-      the following command:</para>
-    <programlisting>xe network-param-set uuid=&lt;network id&gt; name-label=&lt;CloudStack traffic label&gt;</programlisting>
-    <section id="xenserver-public-network-config">
-      <title>Configuring Public Network with a Dedicated NIC for XenServer (Optional)</title>
-      <para>&PRODUCT; supports the use of a second NIC (or bonded pair of NICs, described in <xref
-          linkend="xenserver-nic-bonding"/>) for the public network. If bonding is not used, the
-        public network can be on any NIC and can be on different NICs on the hosts in a cluster. For
-        example, the public network can be on eth0 on node A and eth1 on node B. However, the
-        XenServer name-label for the public network must be identical across all hosts. The
-        following examples set the network label to &quot;cloud-public&quot;. After the management
-        server is installed and running you must configure it with the name of the chosen network
-        label (e.g. &quot;cloud-public&quot;); this is discussed in <xref
-          linkend="management-server-install-flow"/>.</para>
-      <para>If you are using two NICs bonded together to create a public network, see <xref
-          linkend="xenserver-nic-bonding"/>.</para>
-      <para>If you are using a single dedicated NIC to provide public network access, follow this
-        procedure on each new host that is added to &PRODUCT; before adding the host.</para>
-      <orderedlist>
-        <listitem>
-          <para>Run xe network-list and find the public network. This is usually attached to the NIC
-            that is public. Once you find the network make note of its UUID. Call this
-            &lt;UUID-Public&gt;.</para>
-        </listitem>
-        <listitem>
-          <para>Run the following command.</para>
-          <programlisting># xe network-param-set name-label=cloud-public uuid=&lt;UUID-Public&gt;</programlisting>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="xenserver-multi-guest-network-config">
-      <title>Configuring Multiple Guest Networks for XenServer (Optional)</title>
-      <para>&PRODUCT; supports the use of multiple guest networks with the XenServer hypervisor.
-        Each network is assigned a name-label in XenServer. For example, you might have two networks
-        with the labels &quot;cloud-guest&quot; and &quot;cloud-guest2&quot;. After the management
-        server is installed and running, you must add the networks and use these labels so that
-        &PRODUCT; is aware of the networks.</para>
-      <para>Follow this procedure on each new host before adding the host to &PRODUCT;:</para>
-      <orderedlist>
-        <listitem>
-          <para>Run xe network-list and find one of the guest networks. Once you find the network
-            make note of its UUID. Call this &lt;UUID-Guest&gt;.</para>
-        </listitem>
-        <listitem>
-          <para>Run the following command, substituting your own name-label and uuid values.</para>
-          <programlisting># xe network-param-set name-label=&lt;cloud-guestN&gt; uuid=&lt;UUID-Guest&gt;</programlisting>
-        </listitem>
-        <listitem>
-          <para>Repeat these steps for each additional guest network, using a different name-label
-            and uuid each time.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="xenserver-separate-storage-network">
-      <title>Separate Storage Network for XenServer (Optional)</title>
-      <para>You can optionally set up a separate storage network. This should be done first on the
-        host, before implementing the bonding steps below. This can be done using one or two
-        available NICs. With two NICs bonding may be done as above. It is the administrator&apos;s
-        responsibility to set up a separate storage network.</para>
-      <para>Give the storage network a different name-label than what will be given for other
-        networks.</para>
-      <para>For the separate storage network to work correctly, it must be the only interface that
-        can ping the primary storage device&apos;s IP address. For example, if eth0 is the
-        management network NIC, ping -I eth0 &lt;primary storage device IP&gt; must fail. In all
-        deployments, secondary storage devices must be pingable from the management network NIC or
-        bond. If a secondary storage device has been placed on the storage network, it must also be
-        pingable via the storage network NIC or bond on the hosts as well.</para>
-      <para>You can set up two separate storage networks as well. For example, if you intend to
-        implement iSCSI multipath, dedicate two non-bonded NICs to multipath. Each of the two
-        networks needs a unique name-label.</para>
-      <para>If no bonding is done, the administrator must set up and name-label the separate storage
-        network on all hosts (masters and slaves).</para>
-      <para>Here is an example to set up eth5 to access a storage network on 172.16.0.0/24.</para>
-      <programlisting>
-# xe pif-list host-name-label=&apos;hostname&apos; device=eth5
-uuid(RO): ab0d3dd4-5744-8fae-9693-a022c7a3471d
-device ( RO): eth5
-#xe pif-reconfigure-ip DNS=172.16.3.3 gateway=172.16.0.1 IP=172.16.0.55 mode=static netmask=255.255.255.0 uuid=ab0d3dd4-5744-8fae-9693-a022c7a3471d</programlisting>
-    </section>
-    <section id="xenserver-nic-bonding">
-      <title>NIC Bonding for XenServer (Optional)</title>
-      <para>XenServer supports Source Level Balancing (SLB) NIC bonding. Two NICs can be bonded
-        together to carry public, private, and guest traffic, or some combination of these. Separate
-        storage networks are also possible. Here are some example supported configurations:</para>
-      <itemizedlist>
-        <listitem>
-          <para>2 NICs on private, 2 NICs on public, 2 NICs on storage</para>
-        </listitem>
-        <listitem>
-          <para>2 NICs on private, 1 NIC on public, storage uses management network</para>
-        </listitem>
-        <listitem>
-          <para>2 NICs on private, 2 NICs on public, storage uses management network</para>
-        </listitem>
-        <listitem>
-          <para>1 NIC for private, public, and storage</para>
-        </listitem>
-      </itemizedlist>
-      <para>All NIC bonding is optional.</para>
-      <para>XenServer expects all nodes in a cluster will have the same network cabling and same
-        bonds implemented. In an installation the master will be the first host that was added to
-        the cluster and the slave hosts will be all subsequent hosts added to the cluster. The bonds
-        present on the master set the expectation for hosts added to the cluster later. The
-        procedure to set up bonds on the master and slaves are different, and are described below.
-        There are several important implications of this:</para>
-      <itemizedlist>
-        <listitem>
-          <para>You must set bonds on the first host added to a cluster. Then you must use xe
-            commands as below to establish the same bonds in the second and subsequent hosts added
-            to a cluster.</para>
-        </listitem>
-        <listitem>
-          <para>Slave hosts in a cluster must be cabled exactly the same as the master. For example,
-            if eth0 is in the private bond on the master, it must be in the management network for
-            added slave hosts.</para>
-        </listitem>
-      </itemizedlist>
-      <section id="management-network-bonding">
-        <title>Management Network Bonding</title>
-        <para>The administrator must bond the management network NICs prior to adding the host to
-          &PRODUCT;.</para>
-      </section>
-      <section id="first-host-private-bond">
-        <title>Creating a Private Bond on the First Host in the Cluster</title>
-        <para>Use the following steps to create a bond in XenServer. These steps should be run on
-          only the first host in a cluster. This example creates the cloud-private network with two
-          physical NICs (eth0 and eth1) bonded into it.</para>
-        <orderedlist>
-          <listitem>
-            <para>Find the physical NICs that you want to bond together.</para>
-            <programlisting># xe pif-list host-name-label=&apos;hostname&apos; device=eth0
-# xe pif-list host-name-label=&apos;hostname&apos; device=eth1</programlisting>
-            <para>These command shows the eth0 and eth1 NICs and their UUIDs. Substitute the ethX
-              devices of your choice. Call the UUID&apos;s returned by the above command slave1-UUID
-              and slave2-UUID.</para>
-          </listitem>
-          <listitem>
-            <para>Create a new network for the bond. For example, a new network with name
-              &quot;cloud-private&quot;.</para>
-            <para><emphasis role="bold">This label is important. &PRODUCT; looks for a network by a
-                name you configure. You must use the same name-label for all hosts in the cloud for
-                the management network.</emphasis></para>
-            <programlisting># xe network-create name-label=cloud-private
-# xe bond-create network-uuid=[uuid of cloud-private created above]
-pif-uuids=[slave1-uuid],[slave2-uuid]</programlisting>
-          </listitem>
-        </orderedlist>
-        <para>Now you have a bonded pair that can be recognized by &PRODUCT; as the management
-          network.</para>
-      </section>
-      <section id="public-network-bonding">
-        <title>Public Network Bonding</title>
-        <para>Bonding can be implemented on a separate, public network. The administrator is
-          responsible for creating a bond for the public network if that network will be bonded and
-          will be separate from the management network.</para>
-      </section>
-      <section id="first-host-public-network-bond">
-        <title>Creating a Public Bond on the First Host in the Cluster</title>
-        <para>These steps should be run on only the first host in a cluster. This example creates
-          the cloud-public network with two physical NICs (eth2 and eth3) bonded into it.</para>
-        <orderedlist>
-          <listitem>
-            <para>Find the physical NICs that you want to bond together.</para>
-            <programlisting>#xe pif-list host-name-label=&apos;hostname&apos; device=eth2
-# xe pif-list host-name-label=&apos;hostname&apos; device=eth3</programlisting>
-            <para>These command shows the eth2 and eth3 NICs and their UUIDs. Substitute the ethX
-              devices of your choice. Call the UUID&apos;s returned by the above command slave1-UUID
-              and slave2-UUID.</para>
-          </listitem>
-          <listitem>
-            <para>Create a new network for the bond. For example, a new network with name
-              &quot;cloud-public&quot;.</para>
-            <para><emphasis role="bold">This label is important. &PRODUCT; looks for a network by a
-                name you configure. You must use the same name-label for all hosts in the cloud for
-                the public network.</emphasis></para>
-            <programlisting># xe network-create name-label=cloud-public
-# xe bond-create network-uuid=[uuid of cloud-public created above]
-pif-uuids=[slave1-uuid],[slave2-uuid]</programlisting>
-          </listitem>
-        </orderedlist>
-        <para>Now you have a bonded pair that can be recognized by &PRODUCT; as the public
-          network.</para>
-      </section>
-      <section id="adding-more-hosts">
-        <title>Adding More Hosts to the Cluster</title>
-        <para>With the bonds (if any) established on the master, you should add additional, slave
-          hosts. Run the following command for all additional hosts to be added to the cluster. This
-          will cause the host to join the master in a single XenServer pool.</para>
-        <programlisting># xe pool-join master-address=[master IP] master-username=root
-master-password=[your password]</programlisting>
-      </section>
-      <section id="complete-bonding-setup">
-        <title>Complete the Bonding Setup Across the Cluster</title>
-        <para>With all hosts added to the pool, run the cloud-setup-bond script. This script will
-          complete the configuration and set up of the bonds across all hosts in the cluster.</para>
-        <orderedlist>
-          <listitem>
-            <para>Copy the script from the Management Server in
-              /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
-              master host and ensure it is executable.</para>
-          </listitem>
-          <listitem>
-            <para>Run the script:</para>
-            <programlisting># ./cloud-setup-bonding.sh</programlisting>
-          </listitem>
-        </orderedlist>
-        <para>Now the bonds are set up and configured properly across the cluster.</para>
-      </section>
-    </section>
-  </section>
-  <section id="xenserver-version-upgrading">
-    <title>Upgrading XenServer Versions</title>
-    <para>This section tells how to upgrade XenServer software on &PRODUCT; hosts. The actual
-      upgrade is described in XenServer documentation, but there are some additional steps you must
-      perform before and after the upgrade.</para>
-    <note>
-      <para>Be sure the hardware is certified compatible with the new version of XenServer.</para>
-    </note>
-    <para>To upgrade XenServer:</para>
-    <orderedlist>
-      <listitem>
-        <para>Upgrade the database. On the Management Server node:</para>
-        <orderedlist numeration="loweralpha">
-          <listitem>
-            <para>Back up the database:</para>
-            <programlisting># mysqldump --user=root --databases cloud > cloud.backup.sql
-# mysqldump --user=root --databases cloud_usage > cloud_usage.backup.sql</programlisting>
-          </listitem>
-          <listitem>
-            <para>You might need to change the OS type settings for VMs running on the upgraded
-              hosts.</para>
-            <itemizedlist>
-              <listitem>
-                <para>If you upgraded from XenServer 5.6 GA to XenServer 5.6 SP2, change any VMs
-                  that have the OS type CentOS 5.5 (32-bit), Oracle Enterprise Linux 5.5 (32-bit),
-                  or Red Hat Enterprise Linux 5.5 (32-bit) to Other Linux (32-bit). Change any VMs
-                  that have the 64-bit versions of these same OS types to Other Linux
-                  (64-bit).</para>
-              </listitem>
-              <listitem>
-                <para>If you upgraded from XenServer 5.6 SP2 to XenServer 6.0.2, change any VMs that
-                  have the OS type CentOS 5.6 (32-bit), CentOS 5.7 (32-bit), Oracle Enterprise Linux
-                  5.6 (32-bit), Oracle Enterprise Linux 5.7 (32-bit), Red Hat Enterprise Linux 5.6
-                  (32-bit) , or Red Hat Enterprise Linux 5.7 (32-bit) to Other Linux (32-bit).
-                  Change any VMs that have the 64-bit versions of these same OS types to Other Linux
-                  (64-bit).</para>
-              </listitem>
-              <listitem>
-                <para>If you upgraded from XenServer 5.6 to XenServer 6.0.2, do all of the
-                  above.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para>Restart the Management Server and Usage Server. You only need to do this once for
-              all clusters.</para>
-            <programlisting># service cloudstack-management start
-# service cloudstack-usage start</programlisting>
-          </listitem>
-        </orderedlist>
-      </listitem>
-      <listitem>
-        <para>Disconnect the XenServer cluster from &PRODUCT;.</para>
-        <orderedlist numeration="loweralpha">
-          <listitem>
-            <para>Log in to the &PRODUCT; UI as root.</para>
-          </listitem>
-          <listitem>
-            <para>Navigate to the XenServer cluster, and click Actions – Unmanage.</para>
-          </listitem>
-          <listitem>
-            <para>Watch the cluster status until it shows Unmanaged.</para>
-          </listitem>
-        </orderedlist>
-      </listitem>
-      <listitem>
-        <para>Log in to one of the hosts in the cluster, and run this command to clean up the
-          VLAN:</para>
-        <programlisting># . /opt/xensource/bin/cloud-clean-vlan.sh</programlisting>
-      </listitem>
-      <listitem>
-        <para>Still logged in to the host, run the upgrade preparation script:</para>
-        <programlisting># /opt/xensource/bin/cloud-prepare-upgrade.sh</programlisting>
-        <para>Troubleshooting: If you see the error &quot;can&apos;t eject CD,&quot; log in to the
-          VM and umount the CD, then run the script again.</para>
-      </listitem>
-      <listitem>
-        <para>Upgrade the XenServer software on all hosts in the cluster. Upgrade the master
-          first.</para>
-        <orderedlist numeration="loweralpha">
-          <listitem>
-            <para>Live migrate all VMs on this host to other hosts. See the instructions for live
-              migration in the Administrator&apos;s Guide.</para>
-            <para>Troubleshooting: You might see the following error when you migrate a VM:</para>
-            <programlisting>[root@xenserver-qa-2-49-4 ~]# xe vm-migrate live=true host=xenserver-qa-2-49-5 vm=i-2-8-VM
-You attempted an operation on a VM which requires PV drivers to be installed but the drivers were not detected.
-vm: b6cf79c8-02ee-050b-922f-49583d9f1a14 (i-2-8-VM)</programlisting>
-            <para>To solve this issue, run the following:</para>
-            <programlisting># /opt/xensource/bin/make_migratable.sh  b6cf79c8-02ee-050b-922f-49583d9f1a14</programlisting>
-          </listitem>
-          <listitem>
-            <para>Reboot the host.</para>
-          </listitem>
-          <listitem>
-            <para>Upgrade to the newer version of XenServer. Use the steps in XenServer
-              documentation.</para>
-          </listitem>
-          <listitem>
-            <para>After the upgrade is complete, copy the following files from the management server
-              to this host, in the directory locations shown below:</para>
-            <informaltable frame="all">
-              <tgroup cols="2" align="left" colsep="1" rowsep="1">
-                <colspec colname="c1"/>
-                <colspec colname="c2"/>
-                <thead>
-                  <row>
-                    <entry><para>Copy this Management Server file...</para></entry>
-                    <entry><para>...to this location on the XenServer host</para></entry>
-                  </row>
-                </thead>
-                <tbody>
-                  <row>
-                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
-                    <entry><para>/opt/xensource/sm/NFSSR.py</para></entry>
-                  </row>
-                  <row>
-                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
-                    <entry><para>/opt/xensource/bin/setupxenserver.sh</para></entry>
-                  </row>
-                  <row>
-                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
-                    <entry><para>/opt/xensource/bin/make_migratable.sh</para></entry>
-                  </row>
-                  <row>
-                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
-                    <entry><para>/opt/xensource/bin/cloud-clean-vlan.sh</para></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </informaltable>
-          </listitem>
-          <listitem>
-            <para>Run the following script:</para>
-            <programlisting># /opt/xensource/bin/setupxenserver.sh</programlisting>
-            <para>Troubleshooting: If you see the following error message, you can safely ignore
-              it.</para>
-            <programlisting>mv: cannot stat `/etc/cron.daily/logrotate&apos;: No such file or directory</programlisting>
-          </listitem>
-          <listitem>
-            <para>Plug in the storage repositories (physical block devices) to the XenServer
-              host:</para>
-            <programlisting># for pbd in `xe pbd-list currently-attached=false| grep ^uuid | awk &apos;{print $NF}&apos;`; do xe pbd-plug uuid=$pbd ; done</programlisting>
-            <para>Note: If you add a host to this XenServer pool, you need to migrate all VMs on
-              this host to other hosts, and eject this host from XenServer pool.</para>
-          </listitem>
-        </orderedlist>
-      </listitem>
-      <listitem>
-        <para>Repeat these steps to upgrade every host in the cluster to the same version of
-          XenServer.</para>
-      </listitem>
-      <listitem>
-        <para>Run the following command on one host in the XenServer cluster to clean up the host
-          tags:</para>
-        <programlisting># for host in $(xe host-list | grep ^uuid | awk &apos;{print $NF}&apos;) ; do xe host-param-clear uuid=$host param-name=tags; done;</programlisting>
-        <note>
-          <para>When copying and pasting a command, be sure the command has pasted as a single line
-            before executing. Some document viewers may introduce unwanted line breaks in copied
-            text.</para>
-        </note>
-      </listitem>
-      <listitem>
-        <para>Reconnect the XenServer cluster to &PRODUCT;.</para>
-        <orderedlist numeration="loweralpha">
-          <listitem>
-            <para>Log in to the &PRODUCT; UI as root.</para>
-          </listitem>
-          <listitem>
-            <para>Navigate to the XenServer cluster, and click Actions – Manage.</para>
-          </listitem>
-          <listitem>
-            <para>Watch the status to see that all the hosts come up.</para>
-          </listitem>
-        </orderedlist>
-      </listitem>
-      <listitem>
-        <para>After all hosts are up, run the following on one host in the cluster:</para>
-        <programlisting># /opt/xensource/bin/cloud-clean-vlan.sh</programlisting>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloud-infrastructure-concepts.xml
----------------------------------------------------------------------
diff --git a/en-US/cloud-infrastructure-concepts.xml b/en-US/cloud-infrastructure-concepts.xml
deleted file mode 100644
index 2ba228a..0000000
--- a/en-US/cloud-infrastructure-concepts.xml
+++ /dev/null
@@ -1,35 +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.
--->
-
-<chapter id="cloud-infrastructure-concepts">
-  <title>Cloud Infrastructure Concepts</title>
-  <xi:include href="about-regions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
-  <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloud-infrastructure-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/cloud-infrastructure-overview.xml b/en-US/cloud-infrastructure-overview.xml
deleted file mode 100644
index 49a4138..0000000
--- a/en-US/cloud-infrastructure-overview.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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" [
-<!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="cloud-infrastructure-overview">
-    <title>Cloud Infrastructure Overview</title>
-    <para>
-        The Management Server manages one or more zones (typically,
-        datacenters) containing host computers where guest virtual
-        machines will run. The cloud infrastructure is organized as follows:
-    </para>
-    <itemizedlist>
-        <listitem>
-            <para>
-               Zone: Typically, a zone is equivalent to a single
-               datacenter. A zone consists of one or more pods and secondary
-               storage.
-            </para>
-        </listitem>
-        <listitem>
-           <para>
-              Pod: A pod is usually one rack of hardware that includes a
-              layer-2 switch and one or more clusters.
-           </para>
-        </listitem>
-        <listitem>
-            <para>
-               Cluster: A cluster consists of one or more hosts and primary
-               storage.
-            </para>
-        </listitem>
-        <listitem>
-            <para>
-               Host: A single compute node within a cluster. The hosts are
-               where the actual cloud services run in the form of guest
-               virtual machines.
-            </para>
-        </listitem>
-        <listitem>
-            <para>
-               Primary storage is associated with a cluster, and it stores
-               the disk volumes for all the VMs running on hosts in that cluster.
-            </para></listitem>
-        <listitem>
-            <para>
-                Secondary storage is associated with a zone, and it stores
-                templates, ISO images, and disk volume snapshots.
-            </para>
-        </listitem>
-    </itemizedlist>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/infrastructure-overview.png" />
-        </imageobject>
-        <textobject><phrase>infrastructure_overview.png: Nested organization of a zone</phrase></textobject>
-    </mediaobject>
-    <para><emphasis role="bold">More Information</emphasis></para>
-    <para>For more information, see documentation on cloud infrastructure concepts.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloudmonkey.xml
----------------------------------------------------------------------
diff --git a/en-US/cloudmonkey.xml b/en-US/cloudmonkey.xml
deleted file mode 100644
index be4d17c..0000000
--- a/en-US/cloudmonkey.xml
+++ /dev/null
@@ -1,264 +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="cloudmonkey">
-    <title>CloudMonkey</title>
-    <para>CloudMonkey is the &PRODUCT; Command Line Interface (CLI). It is written in Python. CloudMonkey can be used both as an interactive shell and as a command line tool which simplifies &PRODUCT; configuration and management. It can be used with &PRODUCT; releases since the 4.0.x branch.</para>
-    <warning>
-        <para>CloudMonkey is still under development and should be considered a Work In Progress (WIP), the wiki is the most up to date documentation:</para>
-        <para><ulink url="https://cwiki.apache.org/CLOUDSTACK/cloudstack-cloudmonkey-cli.html">https://cwiki.apache.org/CLOUDSTACK/cloudstack-cloudmonkey-cli.html</ulink></para>
-    </warning>
-
-    <section id="gettingcloudmonkey">
-    <title>Installing CloudMonkey</title>
-        <para>CloudMonkey is dependent on <emphasis>readline, pygments, prettytable</emphasis>, when installing from source you will need to resolve those dependencies. Using the cheese shop, the dependencies will be automatically installed.</para>
-        <para>There are three ways to get CloudMonkey. Via the official &PRODUCT; source releases or via a community maintained distribution at <ulink url="http://pypi.python.org/pypi/cloudmonkey/">the cheese shop</ulink>. Developers can also get it directly from the git repository in <emphasis>tools/cli/</emphasis>.</para>
-        <para>
-        <itemizedlist>
-            <listitem>
-                <para>Via the official Apache &PRODUCT; releases as well as the git repository.</para>
-                    <programlisting>
-    <![CDATA[
-$ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git # (optional if using a release download)
-$ mvn clean install -P developer
-$ cd tools/cli # cloudmonkey-x.x.x.tar.gz will be built in dist
-$ python setup.py build
-$ python setup.py install
-    ]]>
-                    </programlisting>
-            </listitem>
-            <listitem>
-                <para>Via a community maintained package on Cheese Shop</para>
-                <para><programlisting>pip install cloudmonkey</programlisting></para>
-            </listitem>
-        </itemizedlist>
-        </para>
-    </section>
-
-    <section id="configuringcloudmonkey">
-    <title>Configuration</title>
-    <para>To configure CloudMonkey you can edit the ~/.cloudmonkey/config file in the user's home directory as shown below. The values can also be set interactively at the cloudmonkey prompt. Logs are kept in ~/.cloudmonkey/log, and history is stored in ~/.cloudmonkey/history. Discovered apis are listed in ~/.cloudmonkey/cache. Only the log and history files can be custom paths and can be configured by setting appropriate file paths in ~/.cloudmonkey/config</para>
-    <programlisting>
-$ cat ~/.cloudmonkey/config 
-[core]
-log_file = /Users/sebastiengoasguen/.cloudmonkey/log
-asyncblock = true
-paramcompletion = false
-history_file = /Users/sebastiengoasguen/.cloudmonkey/history
-
-[ui]
-color = true
-prompt = > 
-tabularize = false
-
-[user]
-secretkey =VDaACYb0LV9eNjTetIOElcVQkvJck_J_QljX_FcHRj87ZKiy0z0ty0ZsYBkoXkY9b7eq1EhwJaw7FF3akA3KBQ 
-apikey = plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdMkAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg
-
-[server]
-path = /client/api
-host = localhost
-protocol = http
-port = 8080
-timeout = 3600
-    </programlisting>
-    <para>The values can also be set at the CloudMonkey prompt. The API and secret keys are obtained via the &PRODUCT; UI or via a raw api call.</para>
-    <programlisting>
-<![CDATA[
-$ cloudmonkey
-☁ Apache CloudStack cloudmonkey 4.1.0-snapshot. Type help or ? to list commands.
-
-> set prompt myprompt>
-myprompt> set host localhost
-myprompt> set port 8080
-myprompt> set apikey <your api key>
-myprompt> set secretkey <your secret key>
-]]>
-    </programlisting>
-    <para>You can use CloudMonkey to interact with a local cloud, and even with a remote public cloud. You just need to set the host value properly and obtain the keys from the cloud administrator.</para>
-    </section>
-    
-    <section id="cliapidiscovery">
-    <title>API Discovery</title>
-    <note>
-    <para>In &PRODUCT; 4.0.* releases, the list of api calls available will be pre-cached, while starting with &PRODUCT; 4.1 releases and above an API discovery service is enabled. CloudMonkey will discover automatically the api calls available on the management server. The sync command in CloudMonkey pulls a list of apis which are accessible to your user role, along with help docs etc. and stores them in ~/.cloudmonkey/cache. This allows cloudmonkey to be adaptable to changes in mgmt server, so in case the sysadmin enables a plugin such as Nicira NVP for that user role, the users can get those changes. New verbs and grammar (DSL) rules are created on the fly.</para>
-    </note>
-    <para>To discover the APIs available do:</para>
-    <programlisting>
- > sync
-324 APIs discovered and cached
-    </programlisting>
-    </section>
-
-    <section id="clitabularoutput">
-    <title>Tabular Output</title>
-    <para>The number of key/value pairs returned by the api calls can be large resulting in a very long output. To enable easier viewing of the output, a tabular formatting can be setup. You may enable tabular listing and even choose set of column fields, this allows you to create your own field using the filter param which takes in comma separated argument. If argument has a space, put them under double quotes. The create table will have the same sequence of field filters provided</para>
-    <para>To enable it, use the <emphasis>set</emphasis> function and create filters like so:</para>
-    <programlisting>
-> set tabularize true
-> list users filter=id,domain,account
-count = 1
-user:
-+--------------------------------------+--------+---------+
-|                  id                  | domain | account |
-+--------------------------------------+--------+---------+
-| 7ed6d5da-93b2-4545-a502-23d20b48ef2a |  ROOT  |  admin  |
-+--------------------------------------+--------+---------+
-    </programlisting>
-    </section>
-
-    <section id="interactivecli">
-    <title>Interactive Shell Usage</title>
-    <para>To start learning CloudMonkey, the best is to use the interactive shell. Simply type CloudMonkey at the prompt and you should get the interactive shell.</para>
-    <para>At the CloudMonkey prompt press the tab key twice, you will see all potential verbs available. Pick on, enter a space and then press tab twice. You will see all actions available for that verb</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>
-EOF        assign     cancel     create     detach     extract    ldap       prepare    reconnect  restart    shell      update     
-activate   associate  change     delete     disable    generate   list       query      register   restore    start      upload     
-add        attach     configure  deploy     enable     get        mark       quit       remove     revoke     stop       
-api        authorize  copy       destroy    exit       help       migrate    reboot     reset      set        suspend    
-cloudmonkey>create 
-account                diskoffering           loadbalancerrule       portforwardingrule     snapshot               tags                   vpc
-autoscalepolicy        domain                 network                privategateway         snapshotpolicy         template               vpcoffering
-autoscalevmgroup       firewallrule           networkacl             project                sshkeypair             user                   vpnconnection
-autoscalevmprofile     instancegroup          networkoffering        remoteaccessvpn        staticroute            virtualrouterelement   vpncustomergateway
-condition              ipforwardingrule       physicalnetwork        securitygroup          storagenetworkiprange  vlaniprange            vpngateway
-counter                lbstickinesspolicy     pod                    serviceoffering        storagepool            volume                 zone
-]]>
-    </programlisting>
-    <para>Picking one action and entering a space plus the tab key, you will obtain the list of parameters for that specific api call.</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>create network 
-account=            domainid=           isAsync=            networkdomain=      projectid=          vlan=               
-acltype=            endip=              name=               networkofferingid=  startip=            vpcid=              
-displaytext=        gateway=            netmask=            physicalnetworkid=  subdomainaccess=    zoneid=             
-]]>
-    </programlisting>
-    <para>To get additional help on that specific api call you can use the following:</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>create network -h
-Creates a network
-Required args: displaytext name networkofferingid zoneid
-Args: account acltype displaytext domainid endip gateway isAsync name netmask networkdomain networkofferingid physicalnetworkid projectid startip subdomainaccess vlan vpcid zoneid
-
-cloudmonkey>create network -help
-Creates a network
-Required args: displaytext name networkofferingid zoneid
-Args: account acltype displaytext domainid endip gateway isAsync name netmask networkdomain networkofferingid physicalnetworkid projectid startip subdomainaccess vlan vpcid zoneid
-
-cloudmonkey>create network --help
-Creates a network
-Required args: displaytext name networkofferingid zoneid
-Args: account acltype displaytext domainid endip gateway isAsync name netmask networkdomain networkofferingid physicalnetworkid projectid startip subdomainaccess vlan vpcid zoneid
-cloudmonkey>    
-]]>
-    </programlisting>
-    <para>Note the required arguments necessary for the calls.</para>
-    <note><para>To find out the required parameters value, using a debugger console on the &PRODUCT; UI might be very useful. For instance using Firebug on Firefox, you can navigate the UI and check the parameters values for each call you are making as you navigate the UI.</para></note>
-    </section>
-
-    <section id="startingavmexample">
-    <title>Starting a Virtual Machine instance with CloudMonkey</title>
-    <para>To start a virtual machine instance we will use the <emphasis>deploy virtualmachine</emphasis> call.</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>deploy virtualmachine -h
-Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.
-Required args: serviceofferingid templateid zoneid
-Args: account diskofferingid displayname domainid group hostid hypervisor ipaddress iptonetworklist isAsync keyboard keypair name networkids projectid securitygroupids securitygroupnames serviceofferingid size startvm templateid userdata zoneid
-]]>
-    </programlisting>
-    <para>The required arguments are <emphasis>serviceofferingid, templateid and zoneid</emphasis></para>
-    <para>In order to specify the template that we want to use, we can list all available templates with the following call:</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>list templates templatefilter=all
-count = 2
-template:
-========
-domain = ROOT
-domainid = 8a111e58-e155-4482-93ce-84efff3c7c77
-zoneid = e1bfdfaf-3d9b-43d4-9aea-2c9f173a1ae7
-displaytext = SystemVM Template (XenServer)
-ostypeid = 849d7d0a-9fbe-452a-85aa-70e0a0cbc688
-passwordenabled = False
-id = 6d360f79-4de9-468c-82f8-a348135d298e
-size = 2101252608
-isready = True
-templatetype = SYSTEM
-zonename = devcloud
-...<snipped>
-]]>
-    </programlisting>
-    <para>In this snippet, I used DevCloud and only showed the beginning output of the first template, the SystemVM template</para>
-    <para>Similarly to get the <emphasis>serviceofferingid</emphasis> you would do:</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>list serviceofferings | grep id
-id = ef2537ad-c70f-11e1-821b-0800277e749c
-id = c66c2557-12a7-4b32-94f4-48837da3fa84
-id = 3d8b82e5-d8e7-48d5-a554-cf853111bc50
-]]>
-    </programlisting>
-    <para>Note that we can use the linux pipe as well as standard linux commands within the interactive shell. Finally we would start an instance with the following call:</para>
-    <programlisting>
-<![CDATA[
-cloudmonkey>deploy virtualmachine templateid=13ccff62-132b-4caf-b456-e8ef20cbff0e zoneid=e1bfdfaf-3d9b-43d4-9aea-2c9f173a1ae7 serviceofferingid=ef2537ad-c70f-11e1-821b-0800277e749c
-jobprocstatus = 0
-created = 2013-03-05T13:04:51-0800
-cmd = com.cloud.api.commands.DeployVMCmd
-userid = 7ed6d5da-93b2-4545-a502-23d20b48ef2a
-jobstatus = 1
-jobid = c441d894-e116-402d-aa36-fdb45adb16b7
-jobresultcode = 0
-jobresulttype = object
-jobresult:
-=========
-virtualmachine:
-==============
-domain = ROOT
-domainid = 8a111e58-e155-4482-93ce-84efff3c7c77
-haenable = False
-templatename = tiny Linux
-...<snipped>
-]]>
-    </programlisting>
-    <para>The instance would be stopped with:</para>
-    <programlisting>
-cloudmonkey>stop virtualmachine id=7efe0377-4102-4193-bff8-c706909cc2d2
-    </programlisting>
-    <note><para>The <emphasis>ids</emphasis> that you will use will differ from this example. Make sure you use the ones that corresponds to your &PRODUCT; cloud.</para></note>
-    </section>
-
-    <section id="scriptingcli">
-    <title>Scripting with CloudMonkey</title>
-    <para>All previous examples use CloudMonkey via the interactive shell, however it can be used as a straightfoward CLI, passing the commands to the <emphasis>cloudmonkey</emphasis> command like shown below.</para>
-    <para><programlisting>$cloudmonkey list users</programlisting></para>
-    <para>As such it can be used in shell scripts, it can received commands via stdin and its output can be parsed like any other unix commands as mentioned before.</para>
-    </section>
-
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloudstack-api.xml
----------------------------------------------------------------------
diff --git a/en-US/cloudstack-api.xml b/en-US/cloudstack-api.xml
deleted file mode 100644
index 891b19f..0000000
--- a/en-US/cloudstack-api.xml
+++ /dev/null
@@ -1,31 +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="cloudstack-api">
-    <title>&PRODUCT; API</title>
-    <para>The &PRODUCT; API is a low level API that has been used to implement the &PRODUCT; web UIs. It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF standards.</para>
-    <para>Many &PRODUCT; API calls are asynchronous. These will return a Job ID immediately when called. This Job ID can be used to query the status of the job later. Also, status calls on impacted resources will provide some indication of their state.</para>
-    <para>The API has a REST-like query basis and returns results in XML or JSON.</para>
-    <para>See <ulink url="http://support.citrix.com/product/cs">the Developer’s Guide</ulink> and <ulink url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack">the API Reference</ulink>.</para>
-   </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloudstack.ent
----------------------------------------------------------------------
diff --git a/en-US/cloudstack.ent b/en-US/cloudstack.ent
deleted file mode 100644
index abb1885..0000000
--- a/en-US/cloudstack.ent
+++ /dev/null
@@ -1,22 +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.
--->
-
-<!ENTITY PRODUCT "CloudStack">
-<!ENTITY BOOKID "Technical Documentation">
-<!ENTITY YEAR "2012">
-<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cloudstack.xml
----------------------------------------------------------------------
diff --git a/en-US/cloudstack.xml b/en-US/cloudstack.xml
deleted file mode 100644
index 0b762a2..0000000
--- a/en-US/cloudstack.xml
+++ /dev/null
@@ -1,80 +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.
--->
-
-<book>
-    <bookinfo id="cloudstack_all">
-        <title>&PRODUCT; Complete Documentation</title>
-        <productname>Apache CloudStack</productname>
-        <productnumber>4.0.0-incubating</productnumber>
-        <edition>1</edition>
-        <pubsnumber></pubsnumber>
-        <abstract>
-            <para>
-                Complete documentation for &PRODUCT;.
-            </para>
-        </abstract>
-        <corpauthor>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
-                </imageobject>
-            </inlinemediaobject>
-        </corpauthor>
-        <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    </bookinfo>
-    <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="provisioning-steps.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="global-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="hypervisor-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="additional-installation-options.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="choosing-a-deployment-architecture.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="accounts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-up-network-for-users.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="virtual-machines.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="working-with-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="working-with-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="work-with-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="working-with-system-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sys-reliability-and-ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="manage-cloud.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="api-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="tuning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="whats-new.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="api-calls.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="working-with-usage-data.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="event-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/en-US/cluster-add.xml b/en-US/cluster-add.xml
deleted file mode 100644
index 3046c5e..0000000
--- a/en-US/cluster-add.xml
+++ /dev/null
@@ -1,31 +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="cluster-add">
-	<title>Adding a Cluster</title>
-    <para>You need to tell &PRODUCT; about the hosts that it will manage. Hosts exist inside clusters, so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
-    <xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <!--    <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-    <xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/compatibility-matrix.xml
----------------------------------------------------------------------
diff --git a/en-US/compatibility-matrix.xml b/en-US/compatibility-matrix.xml
deleted file mode 100644
index 8576f71..0000000
--- a/en-US/compatibility-matrix.xml
+++ /dev/null
@@ -1,116 +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="compatibility-matrix">
-    <title>Compatibility Matrix</title>
-            <informaltable>
-                    <tgroup cols="7" align="left" colsep="1" rowsep="1">
-                        <thead>
-                            <row>
-                                <entry><para>Hypervisor</para></entry>
-                                <entry><para>CloudStack 2.1.x</para></entry>
-                                <entry><para>CloudStack 2.2.x</para></entry>
-                                <entry><para>CloudStack 3.0.0</para></entry>
-                                <entry><para>CloudStack 3.0.1</para></entry>
-                                <entry><para>CloudStack 3.0.2</para></entry>
-                                <entry><para>CloudStack 3.0.3</para></entry>
-                            </row>
-                        </thead>
-                        <tbody>
-                            <row>
-                                <entry><para>XenServer 5.6</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                            </row>
-                            <row>
-                                <entry><para>XenServer 5.6 FP1</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>    
-                            </row>
-                            <row>
-                                        <entry><para>XenServer 5.6 SP2</para></entry>
-                                        <entry><para>Yes</para></entry>
-                                        <entry><para>Yes</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>Yes</para></entry>
-                                        <entry><para>Yes</para></entry>
-                                    </row>
-                                    <row>
-                                        <entry><para>XenServer 6.0.0</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>No</para></entry>
-                                        <entry><para>Yes</para></entry>
-                                    </row>
-                                <row>
-                                    <entry><para>XenServer 6.0.2</para></entry>
-                                    <entry><para>No</para></entry>
-                                    <entry><para>No</para></entry>
-                                    <entry><para>Yes</para></entry>
-                                    <entry><para>Yes</para></entry>
-                                    <entry><para>Yes</para></entry>
-                                    <entry><para>Yes</para></entry>
-                                </row>
-                            <row>
-                                <entry><para>XenServer 6.1</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                                <entry><para>No</para></entry>
-                            </row>
-                            <row>
-                                <entry><para>KVM (RHEL 6.0 or 6.1)</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                            </row>
-                            <row>
-                                <entry><para>VMware (vSphere and vCenter, both version 4.1)</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                                <entry><para>Yes</para></entry>
-                            </row>
-                                </tbody>
-                            </tgroup>
-                        </informaltable>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/compute-disk-service-offerings.xml
----------------------------------------------------------------------
diff --git a/en-US/compute-disk-service-offerings.xml b/en-US/compute-disk-service-offerings.xml
deleted file mode 100644
index 0800517..0000000
--- a/en-US/compute-disk-service-offerings.xml
+++ /dev/null
@@ -1,88 +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="compute-disk-service-offerings">
-  <title>Compute and Disk Service Offerings</title>
-  <para>A service offering is a set of virtual hardware features such as CPU core count and speed,
-    memory, and disk size. The &PRODUCT; administrator can set up various offerings, and then end
-    users choose from the available offerings when they create a new VM. Based on the user’s
-    selected offering, &PRODUCT; emits usage records that can be integrated with billing
-    systems.</para>
-  <para>Some characteristics of service offerings must be defined by the &PRODUCT; administrator,
-    and others can be left undefined so that the end-user can enter their own desired values. This
-    is useful to reduce the number of offerings the &PRODUCT; administrator has to define. Instead
-    of defining a compute offering for every imaginable combination of values that a user might
-    want, the administrator can define offerings that provide some flexibility to the users and can
-    serve as the basis for several different VM configurations.</para>
-  <para>A service offering includes the following elements:</para>
-  <itemizedlist>
-    <listitem>
-      <para>CPU, memory, and network resource guarantees</para>
-    </listitem>
-    <listitem>
-      <para>How resources are metered</para>
-    </listitem>
-    <listitem>
-      <para>How the resource usage is charged</para>
-    </listitem>
-    <listitem>
-      <para>How often the charges are generated</para>
-    </listitem>
-  </itemizedlist>
-  <para>For example, one service offering might allow users to create a virtual machine instance
-    that is equivalent to a 1 GHz Intel® Core™ 2 CPU, with 1 GB memory at $0.20/hour, with network
-    traffic metered at $0.10/GB.</para>
-  <para>&PRODUCT; separates service offerings into compute offerings and disk offerings. The compute
-    service offering specifies:</para>
-  <itemizedlist>
-    <listitem>
-      <para>Guest CPU (optional). If not defined by the &PRODUCT; administrator, users can pick the
-        CPU attributes.</para>
-    </listitem>
-    <listitem>
-      <para>Guest RAM (optional). If not defined by the &PRODUCT; administrator, users can pick the
-        RAM.</para>
-    </listitem>
-    <listitem>
-      <para>Guest Networking type (virtual or direct)</para>
-    </listitem>
-    <listitem>
-      <para>Tags on the root disk</para>
-    </listitem>
-  </itemizedlist>
-  <para>The disk offering specifies:</para>
-  <itemizedlist>
-    <listitem>
-      <para>Disk size (optional). If not defined by the &PRODUCT; administrator, users can pick the
-        disk size.</para>
-    </listitem>
-    <listitem>
-      <para>Tags on the data disk</para>
-    </listitem>
-  </itemizedlist>
-  <xi:include href="dynamic-compute-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="creating-compute-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="creating-disk-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="modify-delete-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
-  />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/concepts.xml
----------------------------------------------------------------------
diff --git a/en-US/concepts.xml b/en-US/concepts.xml
deleted file mode 100644
index e20f442..0000000
--- a/en-US/concepts.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.
--->
-<chapter id="concepts">
-	<title>Concepts</title>
-    <xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		<xi:include href="feature-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		<xi:include href="deployment-architecture-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>


Mime
View raw message