cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [29/81] [abbrv] [partial] Removing docs from master
Date Mon, 14 Oct 2013 17:17:21 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/maintenance-mode-for-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/maintenance-mode-for-primary-storage.xml b/docs/en-US/maintenance-mode-for-primary-storage.xml
deleted file mode 100644
index 54c3a0d..0000000
--- a/docs/en-US/maintenance-mode-for-primary-storage.xml
+++ /dev/null
@@ -1,28 +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="maintenance-mode-for-primary-storage.xml">
-        <title>Maintenance Mode for Primary Storage</title>
-            <para>Primary storage may be placed into maintenance mode. This is useful, for example, to replace faulty RAM in a storage device. Maintenance mode for a storage device will first stop any new guests from being provisioned on the storage device. Then it will stop all guests that have any volume on that storage device. When all such guests are stopped the storage device is in maintenance mode and may be shut down. When the storage device is online again you may cancel maintenance mode for the device. The &PRODUCT; will bring the device back online and attempt to start all guests that were running at the time of the entry into maintenance mode.</para>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/making-api-request.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/making-api-request.xml b/docs/en-US/making-api-request.xml
deleted file mode 100644
index 49ea158..0000000
--- a/docs/en-US/making-api-request.xml
+++ /dev/null
@@ -1,54 +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="making-api-request">
-        <title>Making API Requests</title>
-        <para>All &PRODUCT; API requests are submitted in the form of a HTTP GET/POST with an associated command and any parameters. A request is composed of the following whether in HTTP or HTTPS:
-        </para>
-        <itemizedlist>
-            <listitem><para>&PRODUCT; API URL: This is the web services API entry point(for example, http://www.cloud.com:8080/client/api)</para></listitem> 
-            <listitem><para>Command: The web services command you wish to execute, such as start a virtual machine or create a disk volume</para></listitem>
-            <listitem><para>Parameters: Any additional required or optional parameters for the command</para></listitem>
-        </itemizedlist>
-        <para>A sample API GET request looks like the following:</para>
-        <programlisting>http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D
-        </programlisting>
-        <para>Or in a more readable format:</para>
-        <programlisting>
-1. http://localhost:8080/client/api
-2. ?command=deployVirtualMachine
-3. &amp;serviceOfferingId=1
-4. &amp;diskOfferingId=1
-5. &amp;templateId=2
-6. &amp;zoneId=4
-7. &amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXqjB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ
-8. &amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D
-        </programlisting>
-        <para>The first line is the &PRODUCT; API URL. This is the Cloud instance you wish to interact with.</para>
-        <para>The second line refers to the command you wish to execute.  In our example, we are attempting to deploy a fresh new virtual machine.  It is preceded by a (?) to separate itself from the &PRODUCT; API URL.</para>
-        <para>Lines 3-6 are the parameters for this given command.  To see the command and its request parameters, please refer to the appropriate section in the &PRODUCT; API documentation.  Each parameter field-value pair (field=value) is preceded by an ampersand character (&amp;).</para>
-        <para>Line 7 is the user API Key that uniquely identifies the account.  See Signing API Requests on page 7.</para>
-        <para>Line 8 is the signature hash created to authenticate the user account executing the API command.  See Signing API Requests on page 7.</para>            
-    </section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/manage-cloud.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manage-cloud.xml b/docs/en-US/manage-cloud.xml
deleted file mode 100644
index 6bc45e2..0000000
--- a/docs/en-US/manage-cloud.xml
+++ /dev/null
@@ -1,33 +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.
--->
-
-<chapter id="manage-cloud">
-  <title>Managing the Cloud</title>
-  <xi:include href="tagging-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="change-database-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="change-database-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="admin-alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="customizing-dns.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="stop-restart-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-client.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-client.xml b/docs/en-US/management-server-install-client.xml
deleted file mode 100644
index 2c5ded7..0000000
--- a/docs/en-US/management-server-install-client.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="management-server-install">
-  <title>Install the Management Server on the First Host</title>
-  <para>The first step in installation, whether you are installing the Management Server on one host
-    or many, is to install the software on a single node. </para>
-  <note>
-    <para>If you are planning to install the Management Server on multiple nodes for high
-      availability, do not proceed to the additional nodes yet. That step will come later.</para>
-  </note>
-  <para>The &PRODUCT; Management server can be installed using either RPM or DEB packages. These
-    packages will depend on everything you need to run the Management server.</para>
-  <section id="management-server-install-rhel">
-    <title>Install on CentOS/RHEL</title>
-    <para>We start by installing the required packages:</para>
-    <programlisting language="Bash">yum install cloudstack-management</programlisting>
-  </section>
-  <section id="management-server-install-ubuntu">
-    <title>Install on Ubuntu</title>
-    <programlisting language="Bash">apt-get install cloudstack-mangagement</programlisting>
-  </section>
-
-  <section id="vhd-util">
-    <title>Downloading vhd-util</title>
-    <para>This procedure is required only for installations where XenServer is installed on the
-      hypervisor hosts.</para>
-    <para>Before setting up the Management Server, download vhd-util from <ulink
-        url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink>.</para>
-    <para>If the Management Server is RHEL or CentOS, copy vhd-util to
-      /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
-    <para>If the Management Server is Ubuntu, copy vhd-util to
-      /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
-  </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-complete.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-complete.xml b/docs/en-US/management-server-install-complete.xml
deleted file mode 100644
index 8f4aa6f..0000000
--- a/docs/en-US/management-server-install-complete.xml
+++ /dev/null
@@ -1,39 +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="installation-complete">
-    <title>Installation Complete! Next Steps</title>
-    <para>Congratulations! You have now installed &PRODUCT; Management Server and the database it uses to persist system data.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/installation-complete.png" />
-        </imageobject>
-        <textobject><phrase>installation-complete.png: Finished installs with single Management Server and multiple Management Servers</phrase></textobject>
-    </mediaobject>
-    <para>What should you do next?</para>
-    <itemizedlist>
-        <listitem><para>Even without adding any cloud infrastructure, you can run the UI to get a feel for what's offered and how you will interact with &PRODUCT; on an ongoing basis. See Log In to the UI.</para></listitem>
-        <listitem><para>When you're ready, add the cloud infrastructure and try running some virtual machines on it, so you can watch how &PRODUCT; manages the infrastructure. See Provision Your Cloud Infrastructure.</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-db-external.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-db-external.xml b/docs/en-US/management-server-install-db-external.xml
deleted file mode 100644
index 2950720..0000000
--- a/docs/en-US/management-server-install-db-external.xml
+++ /dev/null
@@ -1,145 +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="management-server-install-db-external">
-  <title>Install the Database on a Separate Node</title>
-  <para>This section describes how to install MySQL on a standalone machine, separate from the
-    Management Server. This technique is intended for a deployment that includes several Management
-    Server nodes. If you have a single-node Management Server deployment, you will typically use the
-    same node for MySQL. See <xref linkend="management-server-install-db-local"/>.</para>
-  <note>
-    <para>The management server doesn't require a specific distribution for the MySQL node. You can
-      use a distribution or Operating System of your choice. Using the same distribution as the
-      management server is recommended, but not required. See <xref
-        linkend="management-server-system-requirements"/>.</para>
-  </note>
-  <orderedlist>
-    <listitem>
-      <para>Install MySQL from the package repository from your distribution:</para>
-      <para condition="community">On RHEL or CentOS:</para>
-      <programlisting language="Bash">yum install mysql-server</programlisting>
-      <para condition="community">On Ubuntu:</para>
-      <programlisting language="Bash">apt-get install mysql-server</programlisting>
-    </listitem>
-    <listitem>
-      <para>Edit the MySQL configuration (/etc/my.cnf or /etc/mysql/my.cnf, depending on your OS)
-        and insert the following lines in the [mysqld] section. You can put these lines below the
-        datadir line. The max_connections parameter should be set to 350 multiplied by the number of
-        Management Servers you are deploying. This example assumes two Management Servers.</para>
-      <note>
-        <para>On Ubuntu, you can also create /etc/mysql/conf.d/cloudstack.cnf file and add these
-          directives there. Don't forget to add [mysqld] on the first line of the file.</para>
-      </note>
-      <programlisting language="Bash">innodb_rollback_on_timeout=1
-innodb_lock_wait_timeout=600
-max_connections=700
-log-bin=mysql-bin
-binlog-format = 'ROW'
-bind-address = 0.0.0.0</programlisting>
-    </listitem>
-    <listitem>
-      <para>Start or restart MySQL to put the new configuration into effect.</para>
-      <para>On RHEL/CentOS, MySQL doesn't automatically start after installation. Start it
-        manually.</para>
-      <programlisting language="Bash">service mysqld start</programlisting>
-      <para>On Ubuntu, restart MySQL.</para>
-      <programlisting language="Bash">service mysqld restart</programlisting>
-    </listitem>
-    <listitem>
-      <para>(CentOS and RHEL only; not required on Ubuntu)</para>
-      <warning>
-        <para>On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly
-          recommended that you set a root password as a security precaution.</para>
-      </warning>
-      <para>Run the following command to secure your installation. You can answer "Y" to all
-        questions except "Disallow root login remotely?". Remote root login is required to set up
-        the databases.</para>
-      <programlisting language="Bash">mysql_secure_installation</programlisting>
-    </listitem>
-    <listitem>
-      <para>If a firewall is present on the system, open TCP port 3306 so external MySQL connections
-        can be established.</para>
-      <para>On Ubuntu, UFW is the default firewall. Open the port with this command:</para>
-      <programlisting language="Bash">ufw allow mysql</programlisting>
-      <para>On RHEL/CentOS:</para>
-      <orderedlist numeration="loweralpha">
-        <listitem>
-          <para>Edit the /etc/sysconfig/iptables file and add the following line at the beginning of
-            the INPUT chain.</para>
-          <programlisting language="Bash">-A INPUT -p tcp --dport 3306 -j ACCEPT</programlisting>
-        </listitem>
-        <listitem>
-          <para>Now reload the iptables rules.</para>
-          <programlisting language="Bash">service iptables restart</programlisting>
-        </listitem>
-      </orderedlist>
-    </listitem>
-    <listitem>
-      <para>Return to the root shell on your first Management Server.</para>
-    </listitem>
-    <listitem>
-      <para>Set up the database. The following command creates the cloud user on the
-        database.</para>
-      <itemizedlist>
-        <listitem>
-          <para>In dbpassword, specify the password to be assigned to the cloud user. You can choose
-            to provide no password.</para>
-        </listitem>
-        <listitem>
-          <para>In deploy-as, specify the username and password of the user deploying the database.
-            In the following command, it is assumed the root user is deploying the database and
-            creating the cloud user.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For encryption_type, use file or web to indicate the technique used to
-            pass in the database encryption password. Default: file. See <xref
-              linkend="about-password-encryption"/>.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For management_server_key, substitute the default key that is used to
-            encrypt confidential parameters in the &PRODUCT; properties file. Default: password. It
-            is highly recommended that you replace this with a more secure value. See About Password
-            and Key Encryption.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For database_key, substitute the default key that is used to encrypt
-            confidential parameters in the &PRODUCT; database. Default: password. It is highly
-            recommended that you replace this with a more secure value. See <xref
-              linkend="about-password-encryption"/>.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For management_server_ip, you may explicitly specify cluster management
-             server node IP. If not specified, the local IP address will be used.</para>
-        </listitem>
-      </itemizedlist>
-      <programlisting language="Bash">cloudstack-setup-databases cloud:&lt;dbpassword&gt;@&lt;ip address mysql server&gt; \
---deploy-as=root:&lt;password&gt; \
--e &lt;encryption_type&gt; \
--m &lt;management_server_key&gt; \
--k &lt;database_key&gt; \
--i &lt;management_server_ip&gt;</programlisting>
-      <para>When this script is finished, you should see a message like “Successfully initialized
-        the database.”</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-db-local.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-db-local.xml b/docs/en-US/management-server-install-db-local.xml
deleted file mode 100644
index ff5ab60..0000000
--- a/docs/en-US/management-server-install-db-local.xml
+++ /dev/null
@@ -1,167 +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="management-server-install-db-local">
-  <title>Install the Database on the Management Server Node</title>
-  <para>This section describes how to install MySQL on the same machine with the Management Server.
-    This technique is intended for a simple deployment that has a single Management Server node. If
-    you have a multi-node Management Server deployment, you will typically use a separate node for
-    MySQL. See <xref linkend="management-server-install-db-external"/>.</para>
-  <orderedlist>
-    <listitem>
-      <para>Install MySQL from the package repository of your distribution:</para>
-      <para condition="community">On RHEL or CentOS:</para>
-      <programlisting language="Bash">yum install mysql-server</programlisting>
-      <para condition="community">On Ubuntu:</para>
-      <programlisting language="Bash">apt-get install mysql-server</programlisting>
-    </listitem>
-    <listitem>
-      <para>Open the MySQL configuration file. The configuration file is <filename>/etc/my.cnf</filename> or
-        <filename>/etc/mysql/my.cnf</filename>, depending on your OS.</para>
-    </listitem>
-    <listitem>
-      <para>Insert the following lines in the [mysqld] section. </para>
-      <para>You can put these lines below the datadir line. The max_connections parameter should be
-        set to 350 multiplied by the number of Management Servers you are deploying. This example
-        assumes one Management Server.</para>
-      <note>
-        <para>On Ubuntu, you can also create a file <filename>/etc/mysql/conf.d/cloudstack.cnf</filename> and add these
-          directives there. Don't forget to add [mysqld] on the first line of the file.</para>
-      </note>
-      <programlisting language="Bash">innodb_rollback_on_timeout=1
-innodb_lock_wait_timeout=600
-max_connections=350
-log-bin=mysql-bin
-binlog-format = 'ROW'</programlisting>
-    </listitem>
-    <listitem>
-      <para>Start or restart MySQL to put the new configuration into effect.</para>
-      <para>On RHEL/CentOS, MySQL doesn't automatically start after installation. Start it
-        manually.</para>
-      <programlisting language="Bash">service mysqld start</programlisting>
-      <para>On Ubuntu, restart MySQL.</para>
-      <programlisting language="Bash">service mysqld restart</programlisting>
-    </listitem>
-    <listitem>
-      <para>(CentOS and RHEL only; not required on Ubuntu)</para>
-      <warning>
-        <para>On RHEL and CentOS, MySQL does not set a root password by default. It is very strongly
-          recommended that you set a root password as a security precaution. </para>
-      </warning>
-      <para>Run the following command to secure your installation. You can answer "Y" to all
-        questions.</para>
-      <programlisting language="Bash">mysql_secure_installation</programlisting>
-    </listitem>
-    <listitem>
-      <para>&PRODUCT; can be blocked by security mechanisms, such as SELinux. Disable SELinux to
-        ensure + that the Agent has all the required permissions.</para>
-      <para>Configure SELinux (RHEL and CentOS):</para>
-      <orderedlist numeration="loweralpha">
-        <listitem>
-          <para>Check whether SELinux is installed on your machine. If not, you can skip this
-            section.</para>
-          <para>In RHEL or CentOS, SELinux is installed and enabled by default. You can verify this
-            with:</para>
-          <programlisting language="Bash"><command>$ rpm -qa | grep selinux</command></programlisting>
-        </listitem>
-        <listitem>
-          <para>Set the SELINUX variable in <filename>/etc/selinux/config</filename> to
-            "permissive". This ensures that the permissive setting will be maintained after a system
-            reboot.</para>
-          <para>In RHEL or CentOS:</para>
-          <programlisting language="Bash">vi /etc/selinux/config</programlisting>
-          <para>Change the following line</para>
-          <programlisting>SELINUX=enforcing</programlisting>
-          <para>to this:</para>
-          <programlisting>SELINUX=permissive</programlisting>
-        </listitem>
-        <listitem>
-          <para>Set SELinux to permissive starting immediately, without requiring a system
-            reboot.</para>
-          <programlisting language="Bash"><command>$ setenforce permissive</command></programlisting>
-        </listitem>
-      </orderedlist>
-    </listitem>
-    <listitem>
-      <para>Set up the database. The following command creates the "cloud" user on the
-        database.</para>
-      <itemizedlist>
-        <listitem>
-          <para>In dbpassword, specify the password to be assigned to the "cloud" user. You can
-            choose to provide no password although that is not recommended.</para>
-        </listitem>
-        <listitem>
-          <para>In deploy-as, specify the username and password of the user deploying the database.
-            In the following command, it is assumed the root user is deploying the database and
-            creating the "cloud" user.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For encryption_type, use file or web to indicate the technique used to
-            pass in the database encryption password. Default: file. See <xref
-              linkend="about-password-encryption"/>.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For management_server_key, substitute the default key that is used to
-            encrypt confidential parameters in the &PRODUCT; properties file. Default: password. It
-            is highly recommended that you replace this with a more secure value. See <xref
-              linkend="about-password-encryption"/>.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For database_key, substitute the default key that is used to encrypt
-            confidential parameters in the &PRODUCT; database. Default: password. It is highly
-            recommended that you replace this with a more secure value. See <xref
-              linkend="about-password-encryption"/>.</para>
-        </listitem>
-        <listitem>
-          <para>(Optional) For management_server_ip, you may explicitly specify cluster management
-            server node IP. If not specified, the local IP address will be used.</para>
-        </listitem>
-      </itemizedlist>
-      <programlisting language="Bash">cloudstack-setup-databases cloud:&lt;dbpassword&gt;@localhost \
---deploy-as=root:&lt;password&gt; \
--e &lt;encryption_type&gt; \
--m &lt;management_server_key&gt; \
--k &lt;database_key&gt; \
--i &lt;management_server_ip&gt;</programlisting>
-      <para>When this script is finished, you should see a message like “Successfully initialized
-        the database.”</para>
-      <note>
-	<para>If the script is unable to connect to the MySQL database, check
-          the "localhost" loopback address in <filename>/etc/hosts</filename>. It should
-          be pointing to the IPv4 loopback address "127.0.0.1" and not the IPv6 loopback
-          address ::1. Alternatively, reconfigure MySQL to bind to the IPv6 loopback
-          interface.
-        </para>
-      </note>
-    </listitem>
-    <listitem>
-      <para>If you are running the KVM hypervisor on the same machine with the Management Server,
-        edit /etc/sudoers and add the following line:</para>
-      <programlisting language="Bash">Defaults:cloud !requiretty</programlisting>
-    </listitem>
-    <listitem>
-      <para>Now that the database is set up, you can finish configuring the OS for the Management
-        Server. This command will set up iptables, sudoers, and start the Management Server.</para>
-      <programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
-      <para>You should see the message “&PRODUCT; Management Server setup is done.”</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-db.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-db.xml b/docs/en-US/management-server-install-db.xml
deleted file mode 100644
index 9d41af2..0000000
--- a/docs/en-US/management-server-install-db.xml
+++ /dev/null
@@ -1,34 +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="management-server-install-db">
-    <title>Install the database server</title>
-    <para>The &PRODUCT; management server uses a MySQL database server to store its data.
-        When you are installing the management server on a single node, you can install the MySQL server locally.
-        For an installation that has multiple management server nodes, we assume the MySQL database also runs on a separate node.
-    </para>
-    <para>&PRODUCT; has been tested with MySQL 5.1 and 5.5. These versions are included in RHEL/CentOS and Ubuntu.</para>
-    <xi:include href="management-server-install-db-local.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="management-server-install-db-external.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-flow.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-flow.xml b/docs/en-US/management-server-install-flow.xml
deleted file mode 100644
index cd73c69..0000000
--- a/docs/en-US/management-server-install-flow.xml
+++ /dev/null
@@ -1,42 +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="management-server-install-flow">
-  <title>Management Server Installation</title>
-  <xi:include href="management-server-install-overview.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-prepare-os.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-client.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-db.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="about-password-encryption.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="password-storage-engine.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-nfs-shares.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-multi-node.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-systemvm.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="management-server-install-complete.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-multi-node.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-multi-node.xml b/docs/en-US/management-server-install-multi-node.xml
deleted file mode 100644
index 480d84e..0000000
--- a/docs/en-US/management-server-install-multi-node.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="install-management-server-multi-nodes">
-  <title>Prepare and Start Additional Management Servers</title>
-  <para>For your second and subsequent Management Servers, you will install the Management Server
-    software, connect it to the database, and set up the OS for the Management Server. </para>
-  <orderedlist>
-    <listitem>
-      <para> Perform the steps in <xref linkend="prepare-os"/> and <xref
-linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
-        appropriate. </para>
-    </listitem>
-    <listitem>
-      <para>This step is required only for installations where XenServer is installed on the hypervisor hosts.</para>
-      <para>Download vhd-util from <ulink
-          url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink></para>
-      <para>Copy vhd-util to
-        /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
-    </listitem>
-    <listitem>
-      <para> Ensure that necessary services are started and set to start on boot.
-        <programlisting><prompt>#</prompt> service rpcbind start
-<prompt>#</prompt> service nfs start
-<prompt>#</prompt> chkconfig nfs on
-<prompt>#</prompt> chkconfig rpcbind on
-</programlisting>
-      </para>
-    </listitem>
-    <listitem>
-      <para>Configure the database client. Note the absence of the --deploy-as argument in this
-        case. (For more details about the arguments to this command, see <xref
-          linkend="management-server-install-db-external"/>.) </para>
-      <programlisting><prompt>#</prompt> cloudstack-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable>
-      </programlisting>
-    </listitem>
-    <listitem>
-      <para>Configure the OS and start the Management Server:</para>
-      <programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
-      <para>The Management Server on this node should now be running.</para>
-    </listitem>
-    <listitem>
-      <para>Repeat these steps on each additional Management Server. </para>
-    </listitem>
-    <listitem>
-      <para>Be sure to configure a load balancer for the Management Servers. See <xref linkend="management-server-lb"/>.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-nfs-shares.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-nfs-shares.xml b/docs/en-US/management-server-install-nfs-shares.xml
deleted file mode 100644
index a12e09c..0000000
--- a/docs/en-US/management-server-install-nfs-shares.xml
+++ /dev/null
@@ -1,40 +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="prepare-nfs-shares">
-    <title>Prepare NFS Shares</title>
-    <para>&PRODUCT; needs a place to keep primary and secondary storage (see Cloud Infrastructure Overview). Both of these can be NFS shares. This section tells how to set up the NFS shares before adding the storage to &PRODUCT;.</para>
-    <note><title>Alternative Storage</title>
-        <para>NFS is not the only option for primary or secondary storage. For example, you may use Ceph RBD, GlusterFS, iSCSI, and others. The choice of storage system will depend on the choice of hypervisor and whether you are dealing with primary or secondary storage.</para>
-    </note>
-    <para>The requirements for primary and secondary storage are described in:</para>
-    <itemizedlist>
-        <listitem><para><xref linkend="about-primary-storage"/></para></listitem>
-        <listitem><para><xref linkend="about-secondary-storage"/></para></listitem>
-    </itemizedlist>
-    <para>A production installation typically uses a separate NFS server. See <xref linkend="nfs-shares-on-separate-server"/>.</para>
-    <para>You can also use the Management Server node as the NFS server. This is more typical of a trial installation, but is technically possible in a larger deployment. See <xref linkend="nfs-shares-on-management-server"/>.</para>
-    <xi:include href="nfs-shares-on-separate-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="nfs-shares-on-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-overview.xml b/docs/en-US/management-server-install-overview.xml
deleted file mode 100644
index 5f46b00..0000000
--- a/docs/en-US/management-server-install-overview.xml
+++ /dev/null
@@ -1,48 +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="management-server-installation-overview">
-    <title>Management Server Installation Overview</title>
-    <para>This section describes installing the Management Server. There are two slightly different installation flows, depending on how many Management Server nodes will be in your cloud:</para>
-    <itemizedlist>
-        <listitem><para>A single Management Server node, with MySQL on the same node.</para></listitem>
-        <listitem><para>Multiple Management Server nodes, with MySQL on a node separate from the Management Servers.</para></listitem>
-    </itemizedlist>
-    <para>In either case, each machine must meet the system requirements described in System Requirements.</para> 
-    <warning><para>For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.</para></warning>
-    <para>The procedure for installing the Management Server is:</para>
-    <orderedlist>
-                <listitem>
-      <para>Prepare the Operating System</para>
-    </listitem>
-    <listitem>
-      <para>(XenServer only) Download and install vhd-util.</para>
-    </listitem>
-                <listitem><para>Install the First Management Server</para></listitem>
-                <listitem><para>Install and Configure the MySQL database</para></listitem>
-                <listitem><para>Prepare NFS Shares</para></listitem>
-                <listitem><para>Prepare and Start Additional Management Servers (optional)</para></listitem>
-                <listitem><para>Prepare the System VM Template</para></listitem>
-            </orderedlist>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-prepare-os.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-prepare-os.xml b/docs/en-US/management-server-install-prepare-os.xml
deleted file mode 100644
index 02453a0..0000000
--- a/docs/en-US/management-server-install-prepare-os.xml
+++ /dev/null
@@ -1,54 +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="prepare-os">
-    <title>Prepare the Operating System</title>
-    <para>The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.</para>
-    <orderedlist>
-        <listitem><para>Log in to your OS as root.</para></listitem>
-        <listitem>
-            <para>Check for a fully qualified hostname.</para>
-            <programlisting language="Bash">hostname --fqdn</programlisting>
-            <para>This should return a fully qualified hostname such as "management1.lab.example.org".  If it does not, edit /etc/hosts so that it does.</para>
-        </listitem>
-        <listitem>
-            <para>Make sure that the machine can reach the Internet.</para>
-            <programlisting language="Bash">ping www.cloudstack.org</programlisting>
-        </listitem>
-        <listitem>
-            <para>Turn on NTP for time synchronization.</para>
-            <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
-            <orderedlist numeration="loweralpha">
-                <listitem>
-                    <para>Install NTP.</para>
-                    <para condition="community">On RHEL or CentOS:</para>
-                    <programlisting language="Bash">yum install ntp</programlisting>
-                    <para condition="community">On Ubuntu:</para>
-                    <programlisting language="Bash">apt-get install openntpd</programlisting>
-                </listitem>
-            </orderedlist>
-        </listitem>
-        <listitem><para>Repeat all of these steps on every host where the Management Server will be installed.</para></listitem>
-    </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-install-systemvm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml
deleted file mode 100644
index 0d930ad..0000000
--- a/docs/en-US/management-server-install-systemvm.xml
+++ /dev/null
@@ -1,76 +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="prepare-system-vm-template">
-  <title>Prepare the System VM Template</title>
-  <para>Secondary storage must be seeded with a template that is used for &PRODUCT; system
-    VMs.</para>
-  <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>
-  <orderedlist>
-    <listitem>
-      <para>On the Management Server, run one or more of the following cloud-install-sys-tmplt
-        commands to retrieve and decompress the system VM template. Run the command for each
-        hypervisor type that you expect end users to run in this Zone.</para>
-      <para>If your secondary storage mount point is not named /mnt/secondary, substitute your own
-        mount point name.</para>
-      <para>If you set the &PRODUCT; database encryption type to "web" when you set up the database,
-          you must now add the parameter -s &lt;management-server-secret-key&gt;. See <xref linkend="about-password-encryption" />.</para>
-      <para>This process will require approximately 5 GB of free space on the local file system and
-        up to 30 minutes each time it runs.</para>
-      <itemizedlist>
-        <listitem>
-          <para>For XenServer:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h xenserver -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For vSphere:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h vmware -s &lt;optional-management-server-secret-key&gt;  -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For KVM:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-        <listitem>
-          <para>For LXC:</para>
-          <programlisting># /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h lxc -s &lt;optional-management-server-secret-key&gt; -F</programlisting>
-        </listitem>
-      </itemizedlist>
-      <para>On Ubuntu, use the following path instead:</para>
-      <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
-    </listitem>
-    <listitem>
-      <para>If you are using a separate NFS server, perform this step. If you are using the
-        Management Server as the NFS server, you MUST NOT perform this step.</para>
-      <para>When the script has finished, unmount secondary storage and remove the created
-        directory.</para>
-      <programlisting># umount /mnt/secondary
-# rmdir /mnt/secondary</programlisting>
-    </listitem>
-    <listitem>
-      <para>Repeat these steps for each secondary storage server.</para>
-    </listitem>
-  </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-lb.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-lb.xml b/docs/en-US/management-server-lb.xml
deleted file mode 100644
index 13f8756..0000000
--- a/docs/en-US/management-server-lb.xml
+++ /dev/null
@@ -1,66 +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="management-server-lb">
-  <title>Management Server Load Balancing</title>
-  <para>&PRODUCT; can use a load balancer to provide a virtual IP for multiple Management
-    Servers. The administrator is responsible for creating the load balancer rules for the
-    Management Servers. The application requires persistence or stickiness across multiple sessions.
-    The following chart lists the ports that should be load balanced and whether or not persistence
-    is required.</para>
-  <para>Even if persistence is not required, enabling it is permitted.</para>
-  <informaltable>
-    <tgroup cols="4" align="left" colsep="1" rowsep="1">
-      <thead>
-        <row>
-          <entry><para>Source Port</para></entry>
-          <entry><para>Destination Port</para></entry>
-          <entry><para>Protocol</para></entry>
-          <entry><para>Persistence Required?</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><para>80 or 443</para></entry>
-          <entry><para>8080 (or 20400 with AJP)</para></entry>
-          <entry><para>HTTP (or AJP)</para></entry>
-          <entry><para>Yes</para></entry>
-        </row>
-        <row>
-          <entry><para>8250</para></entry>
-          <entry><para>8250</para></entry>
-          <entry><para>TCP</para></entry>
-          <entry><para>Yes</para></entry>
-        </row>
-        <row>
-          <entry><para>8096</para></entry>
-          <entry><para>8096</para></entry>
-          <entry><para>HTTP</para></entry>
-          <entry><para>No</para></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-  <para>In addition to above settings, the administrator is responsible for setting the 'host' global
-    config value from the management server IP to load balancer virtual IP address.
-    If the 'host' value is not set to the VIP for Port 8250 and one of your management servers crashes,
-    the UI is still available but the system VMs will not be able to contact the management server.
-  </para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/management-server-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-overview.xml b/docs/en-US/management-server-overview.xml
deleted file mode 100644
index b8e2d53..0000000
--- a/docs/en-US/management-server-overview.xml
+++ /dev/null
@@ -1,76 +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="management-server-overview">
-    <title>Management Server Overview</title>
-    <para>
-       The Management Server is the &PRODUCT; software that manages cloud
-       resources. By interacting with the Management Server through its UI or
-       API, you can configure and manage your cloud infrastructure.
-    </para>
-    <para>
-       The Management Server runs on a dedicated server or VM. It controls
-       allocation of virtual machines to hosts and assigns storage and IP
-       addresses to the virtual machine instances. The Management Server
-       runs in a Tomcat container and requires a MySQL database for persistence.
-    </para>
-    <para>
-       The machine must meet the system requirements described in System 
-       Requirements.
-    </para>
-    <para>The Management Server:
-    </para>
-        <itemizedlist>
-        <listitem>
-            <para>
-               Provides the web user interface for the administrator and a
-               reference user interface for end users.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Provides the APIs for &PRODUCT;.</para>
-        </listitem>
-        <listitem>
-            <para>Manages the assignment of guest VMs to particular hosts.</para>
-        </listitem>
-        <listitem>
-            <para>
-               Manages the assignment of public and private IP addresses to
-               particular accounts.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Manages the allocation of storage to guests as virtual disks.</para>
-        </listitem>
-        <listitem>
-            <para>
-               Manages snapshots, templates, and ISO images, possibly 
-               replicating them across data centers.
-            </para>
-        </listitem>
-        <listitem>
-            <para>Provides a single point of configuration for the cloud.</para>
-        </listitem>
-        </itemizedlist>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manual-live-migration.xml b/docs/en-US/manual-live-migration.xml
deleted file mode 100644
index 1daa6d3..0000000
--- a/docs/en-US/manual-live-migration.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.
--->
-<section id="manual-live-migration">
-	<title>Moving VMs Between Hosts (Manual Live Migration)</title>
-		<para>The &PRODUCT; administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
-		<itemizedlist>
-			<listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
-			<listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>	
-			<listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
-			<listitem><para>(KVM) The VM must not be using local disk storage. (On XenServer and VMware, VM live migration
-				with local disk is enabled by &PRODUCT; support for XenMotion and vMotion.)</para></listitem>
-			<listitem><para>(KVM) The destination host must be in the same cluster as the original host.
-				(On XenServer and VMware, VM live migration from one cluster to another is enabled by &PRODUCT; support for XenMotion and vMotion.)</para></listitem>				
-            <!--            <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem> -->
-		</itemizedlist>
-		<para>To manually live migrate a virtual machine</para>
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation, click Instances.</para></listitem>
-			<listitem><para>Choose the VM that you want to migrate.</para></listitem>
-			<listitem><para>Click the Migrate Instance button.<inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/migrate-instance.png" />
-				</imageobject>
-				<textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
-			</inlinemediaobject>
-				</para></listitem>
-			<listitem><para>From the list of  suitable hosts, choose the one to which you want to move the VM.</para>
-				<note><para>If the VM's storage has to be migrated along with the VM, this will be noted in the host
-					list. &PRODUCT; will take care of the storage migration for you.</para></note>
-				<para/></listitem>
-			<listitem><para>Click OK.</para></listitem>
-		</orderedlist>
-	</section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/marvin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/marvin.xml b/docs/en-US/marvin.xml
deleted file mode 100644
index 8fd2c96..0000000
--- a/docs/en-US/marvin.xml
+++ /dev/null
@@ -1,33 +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="marvin">
-    <title>Marvin</title>
-    <para>Marvin is the &PRODUCT; automation framework. It originated as a tool for integration testing but is now also used to build DevCloud as well as to provide a Python &PRODUCT; API binding.</para>
-    <note>
-        <para>Marvin's complete documenation is on the wiki at <ulink url="https://cwiki.apache.org/CLOUDSTACK/testing-with-python.html">https://cwiki.apache.org/CLOUDSTACK/testing-with-python.html</ulink></para>
-        <para>The source code is located at <emphasis>tools/marvin</emphasis></para>
-    </note>
-    <xi:include href="building-marvin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/max-result-page-returned.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/max-result-page-returned.xml b/docs/en-US/max-result-page-returned.xml
deleted file mode 100644
index fdbf639..0000000
--- a/docs/en-US/max-result-page-returned.xml
+++ /dev/null
@@ -1,38 +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="max-result-page-returned">
-        <title>Maximum Result Pages Returned</title>
-        <para>
-            For each cloud, there is a default upper limit on the number of results that any API command will return in a single page. This is to help prevent overloading the cloud servers and prevent DOS attacks. For example, if the page size limit is 500 and a command returns 10,000 results, the command will return 20 pages.
-        </para>
-        <para>The default page size limit can be different for each cloud. It is set in the global configuration parameter default.page.size. If your cloud has many users with lots of VMs, you might need to increase the value of this parameter. At the same time, be careful not to set it so high that your site can be taken down by an enormous return from an API call. For more information about how to set global configuration parameters, see "Describe Your Deployment" in the Installation Guide.</para>
-        <para>To decrease the page size limit for an individual API command, override the global setting with the page and pagesize parameters, which are available in any list* command (listCapabilities, listDiskOfferings, etc.).</para>
-        <itemizedlist>
-            <listitem><para>Both parameters must be specified together.</para></listitem>
-            <listitem><para>The value of the pagesize parameter must be smaller than the value of default.page.size. That is, you can not increase the number of possible items in a result page, only decrease it.</para></listitem>
-        </itemizedlist>
-        <para>For syntax information on the list* commands, see the API Reference.</para>
-    </section>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml b/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
deleted file mode 100644
index 1ed6bbd..0000000
--- a/docs/en-US/migrate-datadisk-volume-new-storage-pool.xml
+++ /dev/null
@@ -1,78 +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="migrate-datadisk-volume-new-storage-pool">
-    <title>Migrating a Data Volume to a New Storage Pool</title>
-    <para>There are two situations when you might want to migrate a disk:</para>
-    <itemizedlist>
-        <listitem><para>Move the disk to new storage, but leave it attached to the same running VM.</para></listitem>
-        <listitem><para>Detach the disk from its current VM, move it to new storage, and attach it to a new VM.</para></listitem>
-    </itemizedlist>
-    <section id="migrate-storage-same-vm">
-        <title>Migrating Storage For a Running VM</title>
-        <para>(Supported on XenServer and VMware)</para>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-            <listitem><para>In the left navigation bar, click Instances, click the VM name, and click View Volumes.</para></listitem>
-            <listitem><para>Click the volume you want to migrate.</para></listitem>
-            <listitem><para>Detach the disk from the VM.
-                See <xref linkend="detach-move-volumes"/> but skip the “reattach” step at the end. You
-                will do that after migrating to new storage.</para></listitem>
-            <listitem><para>Click the Migrate Volume button<inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/migrate-instance.png"/>
-                </imageobject>
-                <textobject>
-                    <phrase>Migrateinstance.png: button to migrate a volume</phrase>
-                </textobject>
-            </inlinemediaobject>
-                and choose the destination from the dropdown list.</para></listitem>
-            <listitem><para>Watch for the volume status to change to Migrating, then back to Ready.</para></listitem>
-        </orderedlist>
-    </section>
-    <section id="migrate-storage-change-vm">
-        <title>Migrating Storage and Attaching to a Different VM</title>
-        <orderedlist>
-            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-            <listitem><para>Detach the disk from the VM.
-                See <xref linkend="detach-move-volumes"/> but skip the “reattach” step at the end. You
-                will do that after migrating to new storage.</para></listitem>
-            <listitem><para>Click the Migrate Volume button<inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/migrate-instance.png"/>
-                </imageobject>
-                <textobject>
-                    <phrase>Migrateinstance.png: button to migrate a volume</phrase>
-                </textobject>
-            </inlinemediaobject>
-                and choose the destination from the dropdown list.</para></listitem>
-            <listitem><para>Watch for the volume status to change to Migrating, then back to Ready. You can find the
-                volume by clicking Storage in the left navigation bar. Make sure that Volumes is
-                displayed at the top of the window, in the Select View dropdown.</para></listitem>
-            <listitem><para>Attach the volume to any desired VM running in the same cluster as the new storage server. See
-                <xref linkend="attaching-volume"/>
-            </para></listitem>
-        </orderedlist>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml b/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
deleted file mode 100644
index 3bcaff5..0000000
--- a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
+++ /dev/null
@@ -1,47 +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="migrate-vm-rootvolume-volume-new-storage-pool">
-	<title>Migrating a VM Root Volume to a New Storage Pool</title>
-	<para>(XenServer, VMware) You can live migrate a VM's root disk from one storage pool to another, without stopping the VM first.</para>
-	<para>(KVM) When migrating the root disk volume, the VM must first be stopped, and users can not access the VM. After migration is complete, the VM can be restarted.</para>
-	<orderedlist>
-		<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-		<listitem><para>In the left navigation bar, click Instances, and click the VM name.</para></listitem>
-		<listitem><para>(KVM only) Stop the VM.</para></listitem>
-		<listitem><para>Click the Migrate button <inlinemediaobject>
-			<imageobject>
-				<imagedata fileref="./images/migrate-instance.png"/>
-			</imageobject>
-			<textobject>
-				<phrase>Migrateinstance.png: button to migrate a VM or volume</phrase>
-			</textobject>
-		</inlinemediaobject>
-			and choose the destination from the dropdown list.</para>
-			<note><para>If the VM's storage has to be migrated along with the VM, this will be noted in the host
-				list. &PRODUCT; will take care of the storage migration for you.</para></note><para/></listitem>
-		<listitem><para>Watch for the volume status to change to Migrating, then back to Running (or Stopped, in the case of KVM). This
-			can take some time.</para></listitem>
-		<listitem><para>(KVM only) Restart the VM.</para></listitem>
-	</orderedlist>
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
deleted file mode 100644
index 870ef68..0000000
--- a/docs/en-US/minimum-system-requirements.xml
+++ /dev/null
@@ -1,74 +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="minimum-system-requirements">
-		<title>Minimum System Requirements</title>
-		<section id="management-server-system-requirements">
-			<title>Management Server, Database, and Storage System Requirements</title>
-		<para>
-			The machines that will run the Management Server and MySQL database must meet the following requirements. 
-			The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. 
-			The Management Server may be placed on a virtual machine.
-		</para>
-		<itemizedlist>
-			<listitem><para>Operating system:</para>
-				<itemizedlist>
-                    <listitem><para>Preferred: CentOS/RHEL 6.3+ or Ubuntu 12.04(.1)</para></listitem>
-				</itemizedlist>
-			</listitem>
-			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
-			<listitem><para>4 GB of memory</para></listitem>
-			<listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
-			<listitem><para>At least 1 NIC</para></listitem>
-			<listitem><para>Statically allocated IP address</para></listitem>
-			<listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
-		</itemizedlist>
-		</section>
-		<section id="hypervisor-system-requirements">
-		<title>Host/Hypervisor System Requirements</title>
-		<para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
-		<itemizedlist>
-            <listitem><para>Must support HVM (Intel-VT or AMD-V enabled).</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><note><para>If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used for these hosts and the DHCP router created by &PRODUCT;.</para></note></listitem>
-			<listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
-			<listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</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>
-		</itemizedlist>
-		<para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
-        <warning>
-            <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.</para>
-        </warning>
-        <itemizedlist>
-            <listitem><para><xref linkend="hypervisor-kvm-requirements"/></para></listitem>
-            <listitem><para><xref linkend="system-requirements-xenserver-hosts"/></para></listitem>
-            <listitem><para><xref linkend="vmware-requirements"/></para></listitem>
-            <!--            <listitem><para><xref linkend="ovm-requirements"/></para></listitem> -->
-            <listitem><para><xref linkend="lxc-requirements"/></para></listitem>
-        </itemizedlist>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/modify-delete-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/modify-delete-service-offerings.xml b/docs/en-US/modify-delete-service-offerings.xml
deleted file mode 100644
index b917af4..0000000
--- a/docs/en-US/modify-delete-service-offerings.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="modify-delete-service-offerings">
-    <title>Modifying or Deleting a Service Offering</title>
-    <para>Service offerings cannot be changed once created. This applies to both compute offerings and disk offerings.</para>
-    <para>A service offering can be deleted. If it is no longer in use, it is deleted immediately and permanently. If the service offering is still in use, it will remain in the database until all the virtual machines referencing it have been deleted. After deletion by the administrator, a service offering will not be available to end users that are creating new instances.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/multi_node_management_server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/multi_node_management_server.xml b/docs/en-US/multi_node_management_server.xml
deleted file mode 100644
index 1ff713d..0000000
--- a/docs/en-US/multi_node_management_server.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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="multi_node_management_server">
-    <title>Multi-Node Management Server</title>
-    <para>The &PRODUCT; Management Server is deployed on one or more front-end servers connected to a single MySQL database. Optionally a pair of hardware load balancers distributes requests from the web. A backup management server set may be deployed using MySQL replication at a remote site to add DR capabilities.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/multi-node-management-server.png" />
-        </imageobject>
-        <textobject><phrase>Multi-Node Management Server</phrase></textobject>
-    </mediaobject>
-    <para>The administrator must decide the following.</para>
-    <itemizedlist>
-        <listitem><para>Whether or not load balancers will be used.</para></listitem>
-        <listitem><para>How many Management Servers will be deployed.</para></listitem>
-        <listitem><para>Whether MySQL replication will be deployed to enable disaster recovery.</para></listitem>
-    </itemizedlist>
-</section>


Mime
View raw message