cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [40/51] [partial] Removing docs from master
Date Tue, 08 Oct 2013 19:25:42 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/cloudmonkey.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudmonkey.xml b/docs/en-US/cloudmonkey.xml
deleted file mode 100644
index be4d17c..0000000
--- a/docs/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/blob/5586a221/docs/en-US/cloudstack-api.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack-api.xml b/docs/en-US/cloudstack-api.xml
deleted file mode 100644
index 891b19f..0000000
--- a/docs/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/blob/5586a221/docs/en-US/cloudstack.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack.ent b/docs/en-US/cloudstack.ent
deleted file mode 100644
index abb1885..0000000
--- a/docs/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/blob/5586a221/docs/en-US/cloudstack.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml
deleted file mode 100644
index 0b762a2..0000000
--- a/docs/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/blob/5586a221/docs/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml
deleted file mode 100644
index 3046c5e..0000000
--- a/docs/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/blob/5586a221/docs/en-US/compatibility-matrix.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compatibility-matrix.xml b/docs/en-US/compatibility-matrix.xml
deleted file mode 100644
index 8576f71..0000000
--- a/docs/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/blob/5586a221/docs/en-US/compute-disk-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compute-disk-service-offerings.xml b/docs/en-US/compute-disk-service-offerings.xml
deleted file mode 100644
index 1fd2a91..0000000
--- a/docs/en-US/compute-disk-service-offerings.xml
+++ /dev/null
@@ -1,50 +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. 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. Based on the user’s selected offering, &PRODUCT; emits usage records that can be integrated with billing systems. &PRODUCT; separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
-    <itemizedlist>
-        <listitem><para>Guest CPU</para></listitem>
-        <listitem><para>Guest 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).  An offering without a disk size will allow users to pick their own</para></listitem>
-        <listitem><para>Tags on the data disk</para></listitem>
-    </itemizedlist>
-    <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/blob/5586a221/docs/en-US/concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/concepts.xml b/docs/en-US/concepts.xml
deleted file mode 100644
index e20f442..0000000
--- a/docs/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>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-acl.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-acl.xml b/docs/en-US/configure-acl.xml
deleted file mode 100644
index 3ac2b74..0000000
--- a/docs/en-US/configure-acl.xml
+++ /dev/null
@@ -1,287 +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="configure-acl">
-  <title>Configuring Network Access Control List</title>
-  <para>Define Network Access Control List (ACL) on the VPC virtual router to control incoming
-    (ingress) and outgoing (egress) traffic between the VPC tiers, and the tiers and Internet. By
-    default, all incoming traffic to the guest networks is blocked and all outgoing traffic from
-    guest networks is allowed, once you add an ACL rule for outgoing traffic, then only outgoing
-    traffic specified in this ACL rule is allowed, the rest is blocked. To open the ports, you must
-    create a new network ACL. The network ACLs can be created for the tiers only if the NetworkACL
-    service is supported.</para>
-  <section id="network-acl">
-    <title>About Network ACL Lists</title>
-    <para>In &PRODUCT; terminology, Network ACL is a group of Network ACL items. Network ACL items
-      are nothing but numbered rules that are evaluated in order, starting with the lowest numbered
-      rule. These rules determine whether traffic is allowed in or out of any tier associated with
-      the network ACL. You need to add the Network ACL items to the Network ACL, then associate the
-      Network ACL with a tier. Network ACL is associated with a VPC and can be assigned to multiple
-      VPC tiers within a VPC. A Tier is associated with a Network ACL at all the times. Each tier
-      can be associated with only one ACL.</para>
-    <para>The default Network ACL is used when no ACL is associated. Default behavior is all the
-      incoming traffic is blocked and outgoing traffic is allowed from the tiers. Default network
-      ACL cannot be removed or modified. Contents of the default Network ACL is:</para>
-    <informaltable>
-      <tgroup cols="5" align="left" colsep="1" rowsep="1">
-        <colspec colnum="1" colname="c1" colwidth="31.5pt"/>
-        <colspec colnum="2" colname="c2" colwidth="58.5pt"/>
-        <colspec colnum="3" colname="c3" colwidth="66.0pt"/>
-        <colspec colnum="4" colname="c4" colwidth="48.0pt"/>
-        <colspec colnum="5" colname="c5" colwidth="58.5pt"/>
-        <thead>
-          <row>
-            <entry><para>Rule</para></entry>
-            <entry><para>Protocol</para></entry>
-            <entry><para>Traffic type</para></entry>
-            <entry><para>Action</para></entry>
-            <entry><para>CIDR</para></entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry><para>1</para></entry>
-            <entry><para>All</para></entry>
-            <entry><para>Ingress</para></entry>
-            <entry><para>Deny</para></entry>
-            <entry><para>0.0.0.0/0</para></entry>
-          </row>
-          <row>
-            <entry><para>2</para></entry>
-            <entry><para>All</para></entry>
-            <entry><para>Egress</para></entry>
-            <entry><para>Deny</para></entry>
-            <entry><para>0.0.0.0/0</para></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-  </section>
-  <section id="acl-list">
-    <title>Creating ACL Lists</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.</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 Network ACL Lists.</para>
-        <para>The following default rules are displayed in the Network ACLs page: default_allow,
-          default_deny.</para>
-      </listitem>
-      <listitem>
-        <para>Click Add ACL Lists, and specify the following:</para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">ACL List Name</emphasis>: A name for the ACL list.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Description</emphasis>: A short description of the ACL list
-              that can be displayed to users.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="add-acl-rule">
-    <title>Creating an ACL Rule</title>
-    <orderedlist>
-      <listitem>
-        <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
-      </listitem>
-      <listitem>
-        <para>In the left navigation, choose Network.</para>
-      </listitem>
-      <listitem>
-        <para>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.</para>
-      </listitem>
-      <listitem>
-        <para>Select Network ACL Lists.</para>
-        <para>In addition to the custom ACL lists you have created, the following default rules are
-          displayed in the Network ACLs page: default_allow, default_deny.</para>
-      </listitem>
-      <listitem>
-        <para>Select the desired ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Select the ACL List Rules tab.</para>
-        <para>To add an ACL rule, fill in the following fields to specify what kind of network
-          traffic is allowed in the VPC. </para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">Rule Number</emphasis>: The order in which the rules are
-              evaluated.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">CIDR</emphasis>: The CIDR acts as the Source CIDR for the
-              Ingress rules, and Destination CIDR for the Egress rules. To accept traffic only from
-              or to the IP addresses within a particular address block, enter a CIDR or a
-              comma-separated list of CIDRs. The CIDR is the base IP address of the incoming
-              traffic. For example, 192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Action</emphasis>: What action to be taken. Allow traffic or
-              block.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Protocol</emphasis>: The networking protocol that sources
-              use to send traffic to the tier. The TCP and UDP protocols are typically used for data
-              exchange and end-user communications. The ICMP protocol is typically used to send
-              error messages or network monitoring data. All supports all the traffic. Other option
-              is Protocol Number.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Start Port</emphasis>, <emphasis role="bold">End
-                Port</emphasis> (TCP, UDP only): A range of listening ports that are the destination
-              for the incoming traffic. If you are opening a single port, use the same number in
-              both fields.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Protocol Number</emphasis>: The protocol number associated
-              with IPv4 or IPv6. For more information, see <ulink
-                url="http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml">Protocol
-                Numbers</ulink>.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">ICMP Type</emphasis>, <emphasis role="bold">ICMP
-                Code</emphasis> (ICMP only): The type of message and error code that will be
-              sent.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Traffic Type</emphasis>: The type of traffic: Incoming or
-              outgoing.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para>Click Add. The ACL rule is added.</para>
-        <para>You can edit the tags assigned to the ACL rules and delete the ACL rules you have
-          created. Click the appropriate button in the Details tab.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="create-acl-tier">
-    <title>Creating a Tier with Custom ACL List</title>
-    <orderedlist>
-      <listitem>
-        <para>Create a VPC.</para>
-      </listitem>
-      <listitem>
-        <para>Create a custom ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Add ACL rules to the ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Create a tier in the VPC.</para>
-        <para>Select the desired ACL list while creating a tier.</para>
-      </listitem>
-      <listitem>
-        <para>Click OK.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-  <section id="assign-acl-tier">
-    <title>Assigning a Custom ACL List to a Tier</title>
-    <orderedlist>
-      <listitem>
-        <para>Create a VPC.</para>
-      </listitem>
-      <listitem>
-        <para>Create a tier in the VPC.</para>
-      </listitem>
-      <listitem>
-        <para>Associate the tier with the default ACL rule.</para>
-      </listitem>
-      <listitem>
-        <para>Create a custom ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Add ACL rules to the ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Select the tier for which you want to assign the custom ACL.</para>
-      </listitem>
-      <listitem>
-        <para>Click the Replace ACL List icon.<inlinemediaobject>
-            <imageobject>
-              <imagedata fileref="./images/replace-acl-icon.png"/>
-            </imageobject>
-            <textobject>
-              <phrase>replace-acl-icon.png: button to replace an ACL list</phrase>
-            </textobject>
-          </inlinemediaobject></para>
-        <para>The Replace ACL List dialog is displayed.</para>
-      </listitem>
-      <listitem>
-        <para>Select the desired ACL list.</para>
-      </listitem>
-      <listitem>
-        <para>Click OK.</para>
-      </listitem>
-    </orderedlist>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
deleted file mode 100644
index fb66850..0000000
--- a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
+++ /dev/null
@@ -1,79 +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="configure-guest-traffic-in-advanced-zone">
-  <title>Configure Guest Traffic in an Advanced Zone</title>
-  <para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base
-    guest network:</para>
-  <orderedlist>
-    <listitem>
-      <para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the
-        zone to which you want to add a network.</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>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="./images/add-guest-network.png"/>
-        </imageobject>
-        <textobject>
-          <phrase>networksetupzone.png: Depicts network setup in a single zone</phrase>
-        </textobject>
-      </mediaobject>
-    </listitem>
-    <listitem>
-      <para>Provide the following information:</para>
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Name</emphasis>. The name of the network. This will be
-            user-visible</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Display Text</emphasis>: The description of the network. This
-            will be user-visible</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Zone</emphasis>: The zone in which you are configuring the
-            guest network.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Network offering</emphasis>: If the administrator has
-            configured multiple network offerings, select the one you want to use for this
-            network</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should
-            use</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the
-            guests will use</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    <listitem>
-      <para>Click OK.</para>
-    </listitem>
-  </orderedlist>
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-package-repository.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml
deleted file mode 100644
index cda4677..0000000
--- a/docs/en-US/configure-package-repository.xml
+++ /dev/null
@@ -1,69 +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="configure-package-repository">
-    <title>Configure package repository</title>
-    <para>&PRODUCT; is only distributed from source from the official mirrors. 
-        However, members of the CloudStack community may build convenience binaries
-        so that users can install Apache CloudStack without needing to build from 
-        source.
-    </para>
-    <para>
-        If you didn't follow the steps to build your own packages from source 
-        in the sections for <xref linkend="sect-source-buildrpm" /> or
-        <xref linkend="sect-source-builddebs" /> you may find pre-built
-        DEB and RPM packages for your convenience linked from the
-        <ulink url="http://cloudstack.apache.org/downloads.html">downloads</ulink>
-        page.
-    </para>
-    <note>
-        <para>These repositories contain both the Management Server and KVM Hypervisor packages.</para>
-    </note>
-    <section id="configure-package-repository-deb">
-        <title>DEB package repository</title>
-        <para>You can add a DEB package repository to your apt sources with the following commands. Please note that only packages for Ubuntu 12.04 LTS (precise) are being built at this time.</para>
-        <para>Use your preferred editor and open (or create) <filename>/etc/apt/sources.list.d/cloudstack.list</filename>. Add the community provided repository to the file:</para>
-<programlisting>deb http://cloudstack.apt-get.eu/ubuntu precise 4.1</programlisting>
-        <para>We now have to add the public key to the trusted keys.</para>
-        <programlisting language="Bash"><prompt>$</prompt> <command>wget</command> -O - http://cloudstack.apt-get.eu/release.asc|apt-key add -</programlisting>
-        <para>Now update your local apt cache.</para>
-        <programlisting language="Bash"><prompt>$</prompt> <command>apt-get</command> update</programlisting>
-        <para>Your DEB package repository should now be configured and ready for use.</para>
-    </section>
-    <section id="configure-package-repository-rpm">
-        <title>RPM package repository</title>
-        <para>There is a RPM package repository for &PRODUCT; so you can easily install on RHEL based platforms.</para>
-        <para>If you're using an RPM-based system, you'll want to add the Yum repository so that you can install &PRODUCT; with Yum.</para>
-        <para>Yum repository information is found under <filename>/etc/yum.repos.d</filename>. You'll see several <filename>.repo</filename> files in this directory, each one denoting a specific repository.</para>
-        <para>To add the &PRODUCT; repository, create <filename>/etc/yum.repos.d/cloudstack.repo</filename> and insert the following information.</para>
-        <programlisting>
-[cloudstack]
-name=cloudstack
-baseurl=<replaceable>http://cloudstack.apt-get.eu/rhel/4.1/</replaceable>
-enabled=1
-gpgcheck=0
-        </programlisting>
-        <para>Now you should be able to install CloudStack using Yum.</para>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml b/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
deleted file mode 100644
index 7a61cd3..0000000
--- a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
+++ /dev/null
@@ -1,25 +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="configure-public-traffic-in-an-advanced-zone">
-  <title>Configure Public Traffic in an Advanced Zone</title>
-  <para>In a zone that uses advanced networking, you need to configure at least one range of IP
-    addresses for Internet traffic.</para>
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-snmp-rhel.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-snmp-rhel.xml b/docs/en-US/configure-snmp-rhel.xml
deleted file mode 100644
index bd227ff..0000000
--- a/docs/en-US/configure-snmp-rhel.xml
+++ /dev/null
@@ -1,86 +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="configure-snmp-rhel">
-  <title>Configuring SNMP Community String on a RHEL Server</title>
-  <para>The SNMP Community string is similar to a user id or password that provides access to a
-    network device, such as router. This string is sent along with all SNMP requests. If the
-    community string is correct, the device responds with the requested information. If the
-    community string is incorrect, the device discards the request and does not respond.</para>
-  <para>The NetScaler device uses SNMP to communicate with the VMs. You must install SNMP and
-    configure SNMP Community string for a secure communication between the NetScaler device and the
-    RHEL machine.</para>
-  <orderedlist>
-    <listitem>
-      <para>Ensure that you installed SNMP on RedHat. If not, run the following command:</para>
-      <screen>yum install net-snmp-utils</screen>
-    </listitem>
-    <listitem>
-      <para>Edit the /etc/snmp/snmpd.conf file to allow the SNMP polling from the NetScaler
-        device.</para>
-      <orderedlist>
-        <listitem>
-          <para>Map the community name into a security name (local and mynetwork, depending on where
-            the request is coming from):</para>
-          <note>
-            <para>Use a strong password instead of public when you edit the following table.</para>
-          </note>
-          <screen>#         sec.name   source        community
-com2sec    local      localhost     public
-com2sec   mynetwork   0.0.0.0       public</screen>
-          <note>
-            <para>Setting to 0.0.0.0 allows all IPs to poll the NetScaler server.</para>
-          </note>
-        </listitem>
-        <listitem>
-          <para>Map the security names into group names: </para>
-          <screen>#      group.name   sec.model  sec.name
-group   MyRWGroup     v1         local
-group   MyRWGroup     v2c        local
-group   MyROGroup     v1        mynetwork
-group   MyROGroup     v2c       mynetwork</screen>
-        </listitem>
-        <listitem>
-          <para>Create a view to allow the groups to have the permission to:</para>
-          <screen>incl/excl subtree mask view all included .1 </screen>
-        </listitem>
-        <listitem>
-          <para>Grant access with different write permissions to the two groups to the view you
-            created.</para>
-          <screen># context     sec.model     sec.level     prefix     read     write     notif
-  access      MyROGroup ""  any noauth     exact      all      none     none
-  access      MyRWGroup ""  any noauth     exact      all      all      all </screen>
-        </listitem>
-      </orderedlist>
-    </listitem>
-    <listitem>
-      <para>Unblock SNMP in iptables.</para>
-      <screen>iptables -A INPUT -p udp --dport 161 -j ACCEPT</screen>
-    </listitem>
-    <listitem>
-      <para>Start the SNMP service:</para>
-      <screen>service snmpd start</screen>
-    </listitem>
-    <listitem>
-      <para>Ensure that the SNMP service is started automatically during the system startup:</para>
-      <screen>chkconfig snmpd on</screen>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-usage-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-usage-server.xml b/docs/en-US/configure-usage-server.xml
deleted file mode 100644
index 83bed07..0000000
--- a/docs/en-US/configure-usage-server.xml
+++ /dev/null
@@ -1,104 +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="configure-usage-server">
-    <title>Configuring the Usage Server</title>
-    <para>To configure the usage server:</para>
-    <orderedlist>
-        <listitem><para>Be sure the Usage Server has been installed. This requires extra steps beyond just installing the &PRODUCT; software. See Installing the Usage Server (Optional) in the Advanced Installation Guide.</para></listitem>
-        <listitem><para>Log in to the &PRODUCT; UI as administrator.</para></listitem>
-        <listitem><para>Click Global Settings.</para></listitem>
-        <listitem><para>In Search, type usage. Find the configuration parameter that controls the behavior you want to set. See the table below for a description of the available parameters.</para></listitem>
-        <listitem><para>In Actions, click the Edit icon.</para></listitem>
-        <listitem><para>Type the desired value and click the Save icon.</para></listitem>
-        <listitem><para>Restart the Management Server (as usual with any global configuration change) and also the Usage Server:</para>
-         <programlisting language="Bash"># service cloudstack-management restart
-# service cloudstack-usage restart 
-</programlisting></listitem>
-    </orderedlist>
-    <para>The following table shows the global configuration settings that control the behavior of the Usage Server.</para>
-    <informaltable>
-        <tgroup cols="2" align="left" colsep="1" rowsep="1">
-            <thead>
-                <row>
-                    <entry><para>Parameter Name</para></entry>
-                    <entry><para>Description</para></entry>                                     
-                </row>
-                </thead>
-                <tbody> 
-                <row>
-                    <entry><para>enable.usage.server</para></entry>
-                    <entry><para>Whether the Usage Server is active.</para></entry>                
-                </row>
-                <row>
-                    <entry><para>usage.aggregation.timezone</para></entry>
-                    <entry><para>Time zone of usage records. Set this if the usage records and daily job execution are in different time zones. For example, with the following settings, the usage job will run at PST 00:15 and generate usage records for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:</para>
-                    <programlisting>usage.stats.job.exec.time = 00:15	
-usage.execution.timezone = PST
-usage.aggregation.timezone = GMT
-                        </programlisting>
-                        <para>Valid values for the time zone are specified in <xref linkend="time-zones"/></para>
-                        <para>Default: GMT</para>
-                    </entry>                    
-                </row>
-                <row>
-                    <entry><para>usage.execution.timezone</para></entry>
-                    <entry><para>The time zone of usage.stats.job.exec.time.  Valid values for the time zone are specified in <xref linkend="time-zones"/></para>
-                        <para>Default: The time zone of the management server.</para>
-                    </entry>                    
-                </row>
-                <row>
-                    <entry><para>usage.sanity.check.interval</para></entry>
-                    <entry><para>The number of days between sanity checks. Set this in order to periodically search for records with erroneous data before issuing customer invoices. For example, this checks for VM usage records created after the VM was destroyed, and similar checks for templates, volumes, and so on. It also checks for usage times longer than the aggregation range.  If any issue is found, the alert ALERT_TYPE_USAGE_SANITY_RESULT = 21 is sent.</para></entry>                    
-                </row>
-                <row>
-                    <entry><para>usage.stats.job.aggregation.range</para></entry>
-                    <entry><para>The time period in minutes between Usage Server processing jobs. For example, if you set it to 1440, the Usage Server will run once per day. If you set it to 600, it will run every ten hours. In general, when a Usage Server job runs, it processes all events generated since usage was last run.</para>
-                        <para>There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. &PRODUCT; assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. &PRODUCT; assumes this “midnight to midnight” is relative to the usage.execution.timezone.</para>
-                        <para>Default: 1440</para>
-                    </entry>                    
-                </row>
-                <row>
-                    <entry><para>usage.stats.job.exec.time</para></entry>
-                    <entry><para>The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter “10:30”.</para>
-                    <para>If usage.stats.job.aggregation.range is also set, and its value is not 1440, then its value will be added to usage.stats.job.exec.time to get the time to run the Usage Server job again. This is repeated until 24 hours have elapsed, and the next day's processing begins again at usage.stats.job.exec.time.</para>
-                        <para>Default: 00:15.</para>
-                    </entry>                    
-                </row>
-            </tbody>
-        </tgroup>
-    </informaltable>
-    <para>For example, suppose that your server is in GMT, your user population is predominantly in the East Coast of the United States, and you would like to process usage records every night at 2 AM local (EST) time. Choose these settings:</para>
-    <itemizedlist>
-        <listitem><para>enable.usage.server = true</para></listitem>
-        <listitem><para>usage.execution.timezone = America/New_York</para></listitem>
-        <listitem><para>usage.stats.job.exec.time = 07:00. This will run the Usage job at 2:00 AM EST. Note that this will shift by an hour as the East Coast of the U.S. enters and exits Daylight Savings Time.</para></listitem>
-        <listitem><para>usage.stats.job.aggregation.range = 1440</para></listitem>
-    </itemizedlist>
-    <para>With this configuration, the Usage job will run every night at 2 AM EST and will process records for the previous day’s midnight-midnight as defined by the EST (America/New_York) time zone.</para>
-    <note><para>Because the special value 1440 has been used for usage.stats.job.aggregation.range, the Usage
-            Server will ignore the data between midnight and 2 AM. That data will be included in the
-            next day's run.</para>
-        </note>
-    <para></para>    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-virtual-router.xml b/docs/en-US/configure-virtual-router.xml
deleted file mode 100644
index 8740c0c..0000000
--- a/docs/en-US/configure-virtual-router.xml
+++ /dev/null
@@ -1,36 +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="configure-virtual-router">
-    <title>Configuring the Virtual Router</title>
-    <para>You can set the following:</para>
-    <itemizedlist>
-        <listitem><para>IP range</para></listitem>
-        <listitem><para>Supported network services</para></listitem>
-        <listitem><para>Default domain name for the network serviced by the virtual router</para></listitem>
-        <listitem><para>Gateway IP address</para></listitem>
-        <listitem><para>How often &PRODUCT; fetches network usage statistics from &PRODUCT; virtual routers. If you want to collect traffic metering data from the virtual router, set the global configuration parameter router.stats.interval. If you are not using the virtual router to gather network usage statistics, set it to 0.</para></listitem>
-    </itemizedlist>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpc.xml b/docs/en-US/configure-vpc.xml
deleted file mode 100644
index e0e2ee9..0000000
--- a/docs/en-US/configure-vpc.xml
+++ /dev/null
@@ -1,37 +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="configure-vpc">
-  <title>Configuring a Virtual Private Cloud</title>
-  <xi:include href="vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="configure-acl.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-gateway-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-vm-to-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-vm-tier-sharednw.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="acquire-new-ip-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="release-ip-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="enable-disable-static-nat-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-loadbalancer-rule-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="add-portforward-rule-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="remove-tier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="remove-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml
deleted file mode 100644
index f389f30..0000000
--- a/docs/en-US/configure-vpn.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="configure-vpn">
-	<title>Configuring Remote Access VPN</title>
-	<para>To set up VPN for the cloud:</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-		<listitem><para>In the left navigation, click Global Settings.</para></listitem>
-		<listitem><para>Set the following global configuration parameters.</para>
-		<itemizedlist>
-			<listitem><para>remote.access.vpn.client.ip.range – The range of IP addresses to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.</para></listitem>
-			<listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
-			<listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users per account.</para></listitem>
-		</itemizedlist></listitem></orderedlist>
-		<para>To enable VPN for a particular network:</para>	
-		<orderedlist>
-			<listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>			
-			<listitem><para>In the left navigation, click Network.</para></listitem>
-			<listitem><para>Click the name of the network you want to work with.</para></listitem>
-			<listitem><para>Click View IP Addresses.</para></listitem>
-			<listitem><para>Click one of the displayed IP address names.</para></listitem>
-			<listitem><para>Click the Enable VPN button. <inlinemediaobject>
-					<imageobject>
-						<imagedata fileref="./images/vpn-icon.png"/>
-					</imageobject>
-					<textobject>
-						<phrase>AttachDiskButton.png: button to attach a volume</phrase>
-					</textobject>
-				</inlinemediaobject></para>
-				<para>The IPsec key is displayed in a popup window.</para></listitem>
-		</orderedlist>	
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configure-xenserver-dom0-memory.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-xenserver-dom0-memory.xml b/docs/en-US/configure-xenserver-dom0-memory.xml
deleted file mode 100644
index 0a02d3e..0000000
--- a/docs/en-US/configure-xenserver-dom0-memory.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="configure-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">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6</para>
-</section>
-      

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/configuring-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configuring-projects.xml b/docs/en-US/configuring-projects.xml
deleted file mode 100644
index af1fc53..0000000
--- a/docs/en-US/configuring-projects.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- 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.
--->
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-<section id="configuring-projects">
-    <title>Configuring Projects</title>
-    <para>Before &PRODUCT; users start using projects, the &PRODUCT; administrator must set
-        up various systems to support them, including membership invitations, limits on project
-        resources, and controls on who can create projects.</para>
-    <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="set-projects-creator-permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
-      


Mime
View raw message