http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/upload-template.xml
----------------------------------------------------------------------
diff --git a/en-US/upload-template.xml b/en-US/upload-template.xml
deleted file mode 100644
index f270c89..0000000
--- a/en-US/upload-template.xml
+++ /dev/null
@@ -1,67 +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="upload-template">
-       <title>Uploading Templates</title>
-    <warning><title>vSphere Templates and ISOs</title><para>If you are 
uploading a template that was created using vSphere Client, be sure the OVA 
file does not contain an ISO. If it does, the deployment of VMs from the 
template will fail.</para></warning>
-       <para>Templates are uploaded based on a URL. HTTP is the supported 
access protocol. Templates are frequently large files. You can optionally gzip 
them to decrease upload times.</para>
-       <para>To upload a template:</para>
-       <orderedlist>
-               <listitem><para>In the left navigation bar, click 
Templates.</para></listitem>
-               <listitem><para>Click Register Template.</para></listitem>
-               <listitem><para>Provide the following:</para>
-               <itemizedlist>
-                       <listitem><para><emphasis role="bold">Name and 
Description</emphasis>. These will be shown in the UI, so
-                                               choose something 
descriptive.</para></listitem>
-                       <listitem><para><emphasis role="bold">URL</emphasis>. 
The Management Server will download the file from the
-                                               specified URL, such as 
http://my.web.server/filename.vhd.gz.</para></listitem>
-                       <listitem><para><emphasis role="bold">Zone</emphasis>. 
Choose the zone where you want the template to be
-                                               available, or All Zones to make 
it available throughout
-                                               &PRODUCT;.</para></listitem>
-                       <listitem><para><emphasis role="bold">OS 
Type</emphasis>: This helps &PRODUCT; and the hypervisor perform
-                                               certain operations and make 
assumptions that improve the performance of the
-                                               guest. Select one of the 
following:</para>
-                               <itemizedlist>
-                                       <listitem><para>If the operating system 
of the stopped VM is listed, choose it.</para></listitem>
-                                       <listitem><para>If the OS type of the 
stopped VM is not listed, choose Other.</para>
-            <note><para>You should not choose an older version of the OS than 
the version in the image. For example, choosing CentOS 5.4 to support a CentOS 
6.2 image will in general not work. In those cases you should choose 
Other.</para></note></listitem>
-                               </itemizedlist>                 
-                       </listitem>     
-                       <listitem><para><emphasis 
role="bold">Hypervisor</emphasis>: The supported hypervisors are listed. Select 
the desired one.</para></listitem>
-                       <listitem><para><emphasis 
role="bold">Format</emphasis>. The format of the template upload file, such as 
VHD
-                                               or OVA.</para></listitem>
-                       <listitem><para><emphasis role="bold">Password 
Enabled</emphasis>. Choose Yes if your template has the
-                                               &PRODUCT; password change 
script installed. See Adding Password
-                                               Management to Your 
Templates</para></listitem>
-                       <listitem><para><emphasis 
role="bold">Extractable</emphasis>. Choose Yes if the template is available for 
extraction. If this option is selected, end users can 
-                                download a full image of a 
template.</para></listitem>
-                       <listitem><para><emphasis 
role="bold">Public</emphasis>. Choose Yes to make this template accessible to 
all
-                                               users of this &PRODUCT; 
installation. The template will appear in the
-                                               Community Templates list. See 
<xref linkend="private-public-template"/>.</para></listitem>
-                       <listitem><para><emphasis 
role="bold">Featured</emphasis>. Choose Yes if you would like this template to 
be
-                                               more prominent for users to 
select. The template will appear in the Featured
-                                               Templates list. Only an 
administrator can make a template Featured.</para></listitem>
-                       </itemizedlist></listitem>
-               
-       </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/usage-record-format.xml
----------------------------------------------------------------------
diff --git a/en-US/usage-record-format.xml b/en-US/usage-record-format.xml
deleted file mode 100644
index 7f7db06..0000000
--- a/en-US/usage-record-format.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="usage-record-format">
-    <title>Usage Record Format</title>
-    <xi:include href="virtual-machine-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="network-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="ipaddress-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="disk-volume-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="template-iso-snapshot-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="lb-policy-pfwd-rule-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="network-offering-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="VPN-user-usage-record-format.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/usage-types.xml
----------------------------------------------------------------------
diff --git a/en-US/usage-types.xml b/en-US/usage-types.xml
deleted file mode 100644
index 5a18902..0000000
--- a/en-US/usage-types.xml
+++ /dev/null
@@ -1,109 +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="usage-types">
-    <title>Usage Types</title>
-    <para>The following table shows all usage types.</para>
-<informaltable>
-    <tgroup cols="3">
-        <colspec colname="c1" colnum="1" colwidth="4cm" />
-        <colspec colname="c2" colnum="2" colwidth="8cm" />
-        <colspec colname="c3" colnum="3" colwidth="5cm" />
-        <thead>
-            <row>
-                <entry>Type ID</entry>
-                <entry>Type Name</entry>
-                <entry>Description</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>1</entry>
-                <entry>RUNNING_VM</entry>
-                <entry>Tracks the total running time of a VM per usage record 
period.  If the VM is upgraded during the usage period, you will get a separate 
Usage Record for the new upgraded VM.</entry>
-            </row>
-            <row>
-                <entry><para>2</para></entry>
-                <entry><para>ALLOCATED_VM</para></entry>
-                <entry><para>Tracks the total time the VM has been created to 
the time when it has been destroyed.  This usage type is also useful in 
determining usage for specific templates such as Windows-based 
templates.</para></entry>
-            </row>
-            <row>
-                <entry><para>3</para></entry>
-                <entry><para>IP_ADDRESS</para></entry>
-                <entry><para>Tracks the public IP address owned by the 
account.</para></entry>
-            </row>
-            <row>
-                <entry><para>4</para></entry>
-                <entry><para>NETWORK_BYTES_SENT</para></entry>
-                <entry><para>Tracks the total number of bytes sent by all the 
VMs for an account.  Cloud.com does not currently track network traffic per 
VM.</para></entry>
-            </row>
-            <row>
-                <entry><para>5</para></entry>
-                <entry><para>NETWORK_BYTES_RECEIVED</para></entry>
-                <entry><para>Tracks the total number of bytes received by all 
the VMs for an account.  Cloud.com does not currently track network traffic per 
VM.</para></entry>
-            </row>
-            <row>
-                <entry><para>6</para></entry>
-                <entry><para>VOLUME</para></entry>
-                <entry><para>Tracks the total time a disk volume has been 
created to the time when it has been destroyed.</para></entry>
-            </row>
-            <row>
-                <entry><para>7</para></entry>
-                <entry><para>TEMPLATE</para></entry>
-                <entry><para>Tracks the total time a template (either created 
from a snapshot or uploaded to the cloud) has been created to the time it has 
been destroyed.  The size of the template is also returned.</para></entry>
-            </row>
-            <row>
-                <entry><para>8</para></entry>
-                <entry><para>ISO</para></entry>
-                <entry><para>Tracks the total time an ISO has been uploaded to 
the time it has been removed from the cloud.  The size of the ISO is also 
returned.</para></entry>
-            </row>
-            <row>
-                <entry><para>9</para></entry>
-                <entry><para>SNAPSHOT</para></entry>
-                <entry><para>Tracks the total time from when a snapshot has 
been created to the time it have been destroyed.</para></entry>
-            </row>
-            <row>
-                <entry><para>11</para></entry>
-                <entry><para>LOAD_BALANCER_POLICY</para></entry>
-                <entry><para>Tracks the total time a load balancer policy has 
been created to the time it has been removed.  Cloud.com does not track whether 
a VM has been assigned to a policy.</para></entry>
-            </row>
-            <row>
-                <entry><para>12</para></entry>
-                <entry><para>PORT_FORWARDING_RULE</para></entry>
-                <entry><para>Tracks the time from when a port forwarding rule 
was created until the time it was removed.</para></entry>
-            </row>
-            <row>
-                <entry><para>13</para></entry>
-                <entry><para>NETWORK_OFFERING</para></entry>
-                <entry><para>The time from when a network offering was 
assigned to a VM until it is removed.</para></entry>
-            </row>
-            <row>
-                <entry><para>14</para></entry>
-                <entry><para>VPN_USERS</para></entry>
-                <entry><para>The time from when a VPN user is created until it 
is removed.</para></entry>
-            </row>
-        </tbody>
-    </tgroup>
-</informaltable> 
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/use-project-view.xml
----------------------------------------------------------------------
diff --git a/en-US/use-project-view.xml b/en-US/use-project-view.xml
deleted file mode 100644
index df874d8..0000000
--- a/en-US/use-project-view.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="use-project-view">
-    <title>Using the Project View</title>
-    <para>If you are a member of a project, you can use &PRODUCT;’s project 
view to see project members, resources consumed, and more. The project view 
shows only information related to one project. It is a useful way to filter out 
other information so you can concentrate on a project status and 
resources.</para>
-    <orderedlist>        
-    <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
-      <listitem><para>Click Project View.</para></listitem>
-        <listitem><para>The project dashboard appears, showing the project’s 
VMs, volumes, users, events, network settings, and more. From the dashboard, 
you can:</para>
-        <itemizedlist>
-            <listitem><para>Click the Accounts tab to view and manage project 
members. If you are the project administrator, you can add new members, remove 
members, or change the role of a member from user to admin. Only one member at 
a time can have the admin role, so if you set another user’s role to admin, 
your role will change to regular user.</para></listitem>
-            <listitem><para>(If invitations are enabled) Click the Invitations 
tab to view and manage invitations that have been sent to new project members 
but not yet accepted. Pending invitations will remain in this list until the 
new member accepts, the invitation timeout is reached, or you cancel the 
invitation.</para></listitem>
-        </itemizedlist>
-        </listitem>
-     </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/user-data-and-meta-data.xml
----------------------------------------------------------------------
diff --git a/en-US/user-data-and-meta-data.xml 
b/en-US/user-data-and-meta-data.xml
deleted file mode 100644
index 3400701..0000000
--- a/en-US/user-data-and-meta-data.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="user-data-and-meta-data">
-    <title>User Data and Meta Data</title>
-    <para>&PRODUCT; provides API access to attach up to 32KB of user data to a 
deployed VM. Deployed VMs also have access to instance metadata via the virtual 
router.</para>
-    <para>User data can be accessed once the IP address of the virtual router 
is known. Once the IP address is known, use the following steps to access the 
user data:</para>
-    <orderedlist>
-        <listitem><para>Run the following command to find the virtual 
router.</para>
-            <programlisting># cat /var/lib/dhclient/dhclient-eth0.leases | 
grep dhcp-server-identifier | tail -1</programlisting>
-        </listitem>
-        <listitem><para>Access user data by running the following command 
using the result of the above command</para><programlisting># curl 
http://10.1.1.1/latest/user-data</programlisting></listitem>
-    </orderedlist>
-    <para>Meta Data can be accessed similarly, using a URL of the form 
http://10.1.1.1/latest/meta-data/{metadata type}. (For backwards compatibility, 
the previous URL http://10.1.1.1/latest/{metadata type} is also supported.) For 
metadata type, use one of the following:</para>
-    <itemizedlist>
-        <listitem><para>service-offering. A description of the VMs service 
offering</para></listitem>
-        <listitem><para>availability-zone. The Zone name</para></listitem>
-        <listitem><para>local-ipv4. The guest IP of the VM</para></listitem>
-        <listitem><para>local-hostname. The hostname of the 
VM</para></listitem>
-        <listitem><para>public-ipv4. The first public IP for the router. (E.g. 
the first IP of eth2)</para></listitem>
-        <listitem><para>public-hostname. This is the same as 
public-ipv4</para></listitem>
-        <listitem><para>instance-id. The instance name of the 
VM</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/user-services-overview.xml
----------------------------------------------------------------------
diff --git a/en-US/user-services-overview.xml b/en-US/user-services-overview.xml
deleted file mode 100644
index ad27375..0000000
--- a/en-US/user-services-overview.xml
+++ /dev/null
@@ -1,72 +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="user-services-overview">
-    <title>User Services Overview</title>
-  <para>In addition to the physical and logical infrastructure of your cloud
-    and the &PRODUCT; software and servers, you also need a layer of user
-    services so that people can actually make use of the cloud. This means
-    not just a user UI, but a set of options and resources that users can
-    choose from, such as templates for creating virtual machines, disk
-    storage, and more. If you are running a commercial service, you will be
-    keeping track of what services and resources users are consuming and
-    charging them for that usage. Even if you do not charge anything for
-    people to use your cloud – say, if the users are strictly internal to 
your
-    organization, or just friends who are sharing your cloud – you can still
-    keep track of what services they use and how much of them.
-  </para>
-  <section id="offerings-and-templates">
-    <title>Service Offerings, Disk Offerings, Network Offerings, and 
Templates</title>
-    <para>A user creating a new instance can make a variety of choices about
-      its characteristics and capabilities. &PRODUCT; provides several ways to
-      present users with choices when creating a new instance:
-    </para>
-    <itemizedlist>
-      <listitem><para>Service Offerings, defined by the &PRODUCT; 
administrator,
-        provide a choice of CPU speed, number of CPUs, RAM size, tags on the
-        root disk, and other choices. See Creating a New Compute 
Offering.</para>
-      </listitem>
-      <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator,
-        provide a choice of disk size and IOPS (Quality of Service) for primary
-        data storage. See Creating a New Disk Offering.</para>
-      </listitem>
-      <listitem><para>Network Offerings, defined by the &PRODUCT; 
administrator,
-        describe the feature set that is available to end users from the 
virtual
-        router or external networking devices on a given guest network. See
-        Network Offerings.</para>
-      </listitem>
-      <listitem><para>Templates, defined by the &PRODUCT; administrator or by
-        any &PRODUCT; user, are the base OS images that the user can choose
-        from when creating a new instance. For example, &PRODUCT; includes
-        CentOS as a template. See Working with Templates.</para>
-      </listitem>
-    </itemizedlist>
-    <para>In addition to these choices that are provided for users, there is
-      another type of service offering which is available only to the &PRODUCT;
-      root administrator, and is used for configuring virtual infrastructure
-      resources. For more information, see Upgrading a Virtual Router with
-      System Service Offerings.
-    </para>
-  </section>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-multiple-guest-networks.xml
----------------------------------------------------------------------
diff --git a/en-US/using-multiple-guest-networks.xml 
b/en-US/using-multiple-guest-networks.xml
deleted file mode 100644
index cb7e9c7..0000000
--- a/en-US/using-multiple-guest-networks.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="using-multiple-guest-networks">
-       <title>Using Multiple Guest Networks</title>
-       <para>In zones that use advanced networking, additional networks for 
guest traffic may be added at any time after the initial installation. You can 
also customize the domain name associated with the network by specifying a DNS 
suffix for each network.</para>
-       <para>A VM's networks are defined at VM creation time.  A VM cannot add 
or remove networks after it has been created, although the user can go into the 
guest and remove the IP address from the NIC on a particular network.</para>
-       <para>Each VM has just one default network.  The virtual router's DHCP 
reply will set the guest's default gateway as that for the default network.  
Multiple non-default networks may be added to a guest in addition to the 
single, required default network. The administrator can control which networks 
are available as the default network.</para>
-    <para>Additional networks can either be available to all accounts or be 
assigned to a specific account. Networks that are available to all accounts are 
zone-wide. Any user with access to the zone can create a VM with access to that 
network.  These zone-wide networks provide little or no isolation between 
guests.Networks that are assigned to a specific account provide strong 
isolation.</para>
-    <xi:include href="add-additional-guest-network.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="add-remove-nic-ui.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="change-network-offering-on-guest-network.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-netscaler-load-balancers.xml
----------------------------------------------------------------------
diff --git a/en-US/using-netscaler-load-balancers.xml 
b/en-US/using-netscaler-load-balancers.xml
deleted file mode 100644
index 7d18331..0000000
--- a/en-US/using-netscaler-load-balancers.xml
+++ /dev/null
@@ -1,90 +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="using-netscaler-load-balancers">
-  <title>About Using a NetScaler Load Balancer</title>
-  <para>Citrix NetScaler is supported as an external network element for load 
balancing in zones
-    that use isolated networking in advanced zones. Set up an external load 
balancer when you want
-    to provide load balancing through means other than &PRODUCT;’s provided 
virtual router.</para>
-  <note>
-    <para>In a Basic zone, load balancing service is supported only if Elastic 
IP or Elastic LB
-      services are enabled.</para>
-  </note>
-  <para>When NetScaler load balancer is used to provide EIP or ELB services in 
a Basic zone, ensure
-    that all guest VM traffic must enter and exit through the NetScaler 
device. When inbound traffic
-    goes through the NetScaler device, traffic is routed by using the NAT 
protocol depending on the
-    EIP/ELB configured on the public IP to the private IP. The traffic that is 
originated from the
-    guest VMs usually goes through the layer 3 router. To ensure that outbound 
traffic goes through
-    NetScaler device providing EIP/ELB, layer 3 router must have a 
policy-based routing. A
-    policy-based route must be set up so that all traffic originated from the 
guest VM's are
-    directed to NetScaler device. This is required to ensure that the outbound 
traffic from the
-    guest VM's is routed to a public IP by using NAT.For more information on 
Elastic IP, see <xref
-      linkend="elastic-ip"/>. </para>
-  <para>The NetScaler can be set up in direct (outside the firewall) mode. It 
must be added before
-    any load balancing rules are deployed on guest VMs in the zone.</para>
-  <para>The functional behavior of the NetScaler with &PRODUCT; is the same as 
described in the
-    &PRODUCT; documentation for using an F5 external load balancer. The only 
exception is that the
-    F5 supports routing domains, and NetScaler does not. NetScaler can not yet 
be used as a
-    firewall.</para>
-  <para>To install and enable an external load balancer for &PRODUCT; 
management, see <phrase
-      condition="install"><xref 
linkend="external-guest-lb-integration"/>.</phrase>
-    <phrase condition="admin">External Guest Load Balancer Integration in the 
Installation
-      Guide.</phrase>
-  </para>
-  <para>The Citrix NetScaler comes in three varieties. The following table 
summarizes how these
-    variants are treated in &PRODUCT;.</para>
-  <informaltable>
-    <tgroup cols="3" align="left" colsep="1" rowsep="1">
-      <thead>
-        <row>
-          <entry><para>NetScaler ADC Type</para></entry>
-          <entry><para>Description of Capabilities</para></entry>
-          <entry><para>&PRODUCT; Supported Features</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><para>MPX</para></entry>
-          <entry><para>Physical appliance. Capable of deep packet inspection. 
Can act as application
-              firewall and load balancer</para></entry>
-          <entry><para>In advanced zones, load balancer functionality fully 
supported without
-              limitation. In basic zones, static NAT, elastic IP (EIP), and 
elastic load balancing
-              (ELB) are also provided.</para></entry>
-        </row>
-        <row>
-          <entry><para>VPX</para></entry>
-          <entry><para>Virtual appliance. Can run as VM on XenServer, ESXi, 
and Hyper-V hypervisors.
-              Same functionality as MPX</para></entry>
-          <entry><para>Supported on ESXi and XenServer. Same functional 
support as for MPX.
-              &PRODUCT; will treat VPX and MPX as the same device 
type.</para></entry>
-        </row>
-        <row>
-          <entry><para>SDX</para></entry>
-          <entry><para>Physical appliance. Can create multiple fully isolated 
VPX instances on a
-              single appliance to support multi-tenant usage</para></entry>
-          <entry><para>&PRODUCT; will dynamically provision, configure, and 
manage the life cycle of
-              VPX instances on the SDX. Provisioned instances are added into 
&PRODUCT; automatically
-              – no manual configuration by the administrator is required. 
Once a VPX instance is
-              added into &PRODUCT;, it is treated the same as a VPX on an ESXi 
host.</para></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-sshkeys.xml
----------------------------------------------------------------------
diff --git a/en-US/using-sshkeys.xml b/en-US/using-sshkeys.xml
deleted file mode 100644
index f34dfa0..0000000
--- a/en-US/using-sshkeys.xml
+++ /dev/null
@@ -1,112 +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="using-sshkeys">
-    <title>Using SSH Keys for Authentication</title>
-    <para>In addition to the username and password authentication, &PRODUCT; 
supports using SSH keys to log in to the cloud infrastructure for additional 
security. You can use the createSSHKeyPair API to generate the SSH keys.</para>
-    <para>Because each cloud user has their own SSH key, one cloud user cannot 
log in to another cloud user's instances unless they share their SSH key files. 
 Using a single SSH key pair, you can manage multiple instances.</para>
-        <section id="create-ssh-template">
-        <title> Creating an Instance Template that Supports SSH Keys</title>
-            <para>Create a instance template that supports SSH Keys.</para>
-            <orderedlist>
-                <listitem><para>Create a new instance by using the template 
provided by cloudstack.</para>
-                    <para>For more information on creating a new instance, see 
</para>
-                </listitem>
-                <listitem><para>Download the cloudstack script from  <ulink 
url="http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/";>The
 SSH Key Gen Script</ulink>to the instance you have created.</para>
-                    <programlisting>wget 
http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcloudstack%2Ffiles%2FSSH%2520Key%2520Gen%2520Script%2F&amp;ts=1331225219&amp;use_mirror=iweb</programlisting>
-                </listitem>
-                <listitem><para>Copy the file to /etc/init.d.</para>
-                    <programlisting>cp cloud-set-guest-sshkey.in 
/etc/init.d/</programlisting>
-                </listitem>
-                <listitem><para>Give the necessary permissions on the 
script:</para>
-                    <programlisting>chmod +x 
/etc/init.d/cloud-set-guest-sshkey.in</programlisting>
-                </listitem>  
-                <listitem><para>Run the script while starting up the operating 
system:</para>
-                    <programlisting>chkconfig --add 
cloud-set-guest-sshkey.in</programlisting>
-                </listitem>                    
-                <listitem><para>Stop the instance.</para>
-                </listitem>
-            </orderedlist>
-        </section>
-        <section id="create-ssh-keypair">
-        <title>Creating the SSH Keypair</title>
-            <para>You must make a call to the createSSHKeyPair api method. You 
can either use the &PRODUCT; Python API library or the curl commands to make 
the call to the cloudstack api.</para>
-            <para>For example, make a call from the cloudstack server to 
create a SSH keypair called "keypair-doc" for the admin account in the root 
domain:</para>
-            <note><para>Ensure that you adjust these values to meet your 
needs. If you are making the API call from a different server, your URL/PORT 
will be different, and you will need to use the API keys.</para></note>
-            <orderedlist>
-                <listitem><para>Run the following curl command:</para>
-                <programlisting>curl --globoff 
"http://localhost:8096/?command=createSSHKeyPair&amp;name=keypair-doc&amp;account=admin&amp;domainid=5163440e-c44b-42b5-9109-ad75cae8e8a2";</programlisting>
-                <para>The output is something similar to what is given 
below:</para>
-                <programlisting>&lt;?xml version="1.0" 
encoding="ISO-8859-1"?&gt;&lt;createsshkeypairresponse 
cloud-stack-version="3.0.0.20120228045507"&gt;&lt;keypair&gt;&lt;name&gt;keypair-doc&lt;/name&gt;&lt;fingerprint&gt;f6:77:39:d5:5e:77:02:22:6a:d8:7f:ce:ab:cd:b3:56&lt;/fingerprint&gt;&lt;privatekey&gt;-----BEGIN
 RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
-dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
-AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
-mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
-QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
-VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
-lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
-nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
-4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
-KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
------END RSA PRIVATE KEY-----
-&lt;/privatekey&gt;&lt;/keypair&gt;&lt;/createsshkeypairresponse&gt;</programlisting></listitem>
-                <listitem><para>Copy the key data into a file. The file looks 
like this:</para>
-                <programlisting>-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
-dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
-AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
-mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
-QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
-VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
-lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
-nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
-4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
-KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
------END RSA PRIVATE KEY-----</programlisting></listitem>
-                <listitem><para>Save the file.</para></listitem>
-            </orderedlist>
-        </section>
-        <section id="creating-ssh-instance">
-        <title>Creating an Instance</title>
-        <para>After you save the SSH keypair file, you must create an instance 
by using the template that you created at <xref 
linkend="create-ssh-template"/>. Ensure that you use the same SSH key name that 
you created at <xref linkend="create-ssh-keypair"/>.</para>
-        <note><para>You cannot create the instance by using the GUI at this 
time and associate the instance with the newly created SSH 
keypair.</para></note>
-        <para>A sample curl command to create a new instance is:</para>
-        <programlisting>curl --globoff http://localhost:&lt;port 
number&gt;/?command=deployVirtualMachine\&amp;zoneId=1\&amp;serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&amp;templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&amp;securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&amp;account=admin\&amp;domainid=1\&amp;keypair=keypair-doc</programlisting>
-        <para>Substitute the template, service offering and security group IDs 
(if you are using the security group feature) that are in your cloud 
environment.</para>
-        </section>
-        <section id="logging-in-ssh">
-            <title>Logging In Using the SSH Keypair</title>
-            <para>To test your SSH key generation is successful, check whether 
you can log in to the cloud setup.</para>
-            <para>For exaple, from a Linux OS, run:</para>
-            <programlisting>ssh -i ~/.ssh/keypair-doc &lt;ip 
address&gt;</programlisting>
-        <para>The -i parameter tells the ssh client to use a ssh key found at 
~/.ssh/keypair-doc.</para>
-        </section>
-    <section id="reset-ssh">
-        <title>Resetting SSH Keys</title>
-        <para>With the API command resetSSHKeyForVirtualMachine, a user can 
set or reset the SSH keypair
-            assigned to a virtual machine. A lost or compromised SSH keypair
-            can be changed, and the user can access the VM by using the new 
keypair. Just create or register a
-            new keypair, then call resetSSHKeyForVirtualMachine.</para>
-    </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-swift-for-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/en-US/using-swift-for-secondary-storage.xml 
b/en-US/using-swift-for-secondary-storage.xml
deleted file mode 100644
index 329cf81..0000000
--- a/en-US/using-swift-for-secondary-storage.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="using-swift-for-secondary-storage">
-    <title>Using Swift for Secondary Storage</title>
-    <para>&PRODUCT; supports OpenStack Object Storage (<ulink 
url="http://swift.openstack.org/";> Swift</ulink>) for secondary storage. When 
using Swift, you configure Swift storage for the entire &PRODUCT;, then set up 
NFS secondary storage for each zone as usual. The NFS storage in each zone acts 
as a staging area through which all templates and other secondary storage data 
pass before being forwarded to Swift. The Swift storage acts as a cloud-wide 
resource, making templates and other data available to any zone in the cloud. 
There is no hierarchy in the Swift storage, just one Swift container per 
storage object. Any secondary storage in the whole cloud can pull a container 
from Swift at need. It is not necessary to copy templates and snapshots from 
one zone to another, as would be required when using zone NFS alone. Everything 
is available everywhere</para>
-    <para>Swift storage must be set up before you add NFS secondary storage to 
zones. This is accomplished through some additional configuration steps on a 
fresh Management Server installation, before you add the first zone. The 
procedure is described in Adding a Zone in the Advanced Installation 
Guide.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-vpn-with-mac.xml
----------------------------------------------------------------------
diff --git a/en-US/using-vpn-with-mac.xml b/en-US/using-vpn-with-mac.xml
deleted file mode 100644
index 7696824..0000000
--- a/en-US/using-vpn-with-mac.xml
+++ /dev/null
@@ -1,41 +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="using-vpn-with-mac">
-    <title>Using Remote Access VPN with Mac OS X</title>
-    <para>First, be sure you've configured the VPN settings in your &PRODUCT; 
install. This section is only concerned with connecting via Mac OS X to your 
VPN.</para>
-    <para>Note, these instructions were written on Mac OS X 10.7.5. They may 
differ slightly in older or newer releases of Mac OS X.</para>
-    <orderedlist>
-        <listitem><para>On your Mac, open System Preferences and click 
Network.</para></listitem>
-        <listitem><para>Make sure Send all traffic over VPN connection is not 
checked.</para></listitem>
-        <listitem><para>If your preferences are locked, you'll need to click 
the lock in the bottom left-hand corner to make any changes and provide your 
administrator credentials.</para></listitem>
-        <listitem><para>You will need to create a new network entry. Click the 
plus icon on the bottom left-hand side and you'll see a dialog that says 
"Select the interface and enter a name for the new service." Select VPN from 
the Interface drop-down menu, and "L2TP over IPSec" for the VPN Type. Enter 
whatever you like within the "Service Name" field.</para></listitem>
-        <listitem><para>You'll now have a new network interface with the name 
of whatever you put in the "Service Name" field. For the purposes of this 
example, we'll assume you've named it "CloudStack." Click on that interface and 
provide the IP address of the interface for your VPN under the Server Address 
field, and the user name for your VPN under Account Name.</para></listitem>
-        <listitem><para>Click Authentication Settings, and add the user's 
password under User Authentication and enter the pre-shared IPSec key in the 
Shared Secret field under Machine Authentication. Click OK.</para></listitem>
-        <listitem><para>You may also want to click the "Show VPN status in 
menu bar" but that's entirely optional.</para></listitem>
-        <listitem><para>Now click "Connect" and you will be connected to the 
CloudStack VPN.</para></listitem>
-    </orderedlist>
-
-
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/using-vpn-with-windows.xml
----------------------------------------------------------------------
diff --git a/en-US/using-vpn-with-windows.xml b/en-US/using-vpn-with-windows.xml
deleted file mode 100644
index 82e556c..0000000
--- a/en-US/using-vpn-with-windows.xml
+++ /dev/null
@@ -1,42 +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="using-vpn-with-windows">
-    <title>Using Remote Access VPN with Windows</title>
-    <para>The procedure to use VPN varies by Windows version.  Generally, the 
user must edit the VPN properties and make sure that the default route is not 
the VPN. The following steps are for Windows L2TP clients on Windows Vista. The 
commands should be similar for other Windows versions.</para>
-    <orderedlist>
-        <listitem id="source-nat"><para>Log in to the &PRODUCT; UI and click 
on the source NAT IP for the account. The VPN tab should display the IPsec 
preshared key. Make a note of this and the source NAT IP. The UI also lists one 
or more users and their passwords. Choose one of these users, or, if none 
exists, add a user and password.</para></listitem>
-        <listitem><para>On the Windows box, go to Control Panel, then select 
Network and Sharing center. Click Setup a connection or 
network.</para></listitem>
-        <listitem><para>In the next dialog, select No, create a new 
connection.</para></listitem>
-        <listitem><para>In the next dialog, select Use my Internet Connection 
(VPN).</para></listitem>
-        <listitem><para>In the next dialog, enter the source NAT IP from step 
<xref linkend="source-nat"/> and give the connection a name. Check Don't 
connect now.</para></listitem>
-        <listitem><para>In the next dialog, enter the user name and password 
selected in step <xref linkend="source-nat"/>.</para></listitem>
-        <listitem><para>Click Create.</para></listitem>
-        <listitem><para>Go back to the Control Panel and click Network 
Connections to see the new connection. The connection is not active 
yet.</para></listitem>
-        <listitem><para>Right-click the new connection and select Properties. 
In the Properties dialog, select the Networking tab.</para></listitem>
-        <listitem><para>In Type of VPN, choose L2TP IPsec VPN, then click 
IPsec settings. Select Use preshared key. Enter the preshared key from step 
<xref linkend="source-nat"/>.</para></listitem>
-        <listitem><para>The connection is ready for activation. Go back to 
Control Panel -> Network Connections and double-click the created 
connection.</para></listitem>
-        <listitem><para>Enter the user name and password from step <xref 
linkend="source-nat"/>.</para></listitem>
-        </orderedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/vcenter-maintenance-mode.xml
----------------------------------------------------------------------
diff --git a/en-US/vcenter-maintenance-mode.xml 
b/en-US/vcenter-maintenance-mode.xml
deleted file mode 100644
index d36dd7c..0000000
--- a/en-US/vcenter-maintenance-mode.xml
+++ /dev/null
@@ -1,41 +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="vcenter-maintenance-mode">
-    <title>vCenter and Maintenance Mode</title>
-    <para>To enter maintenance mode on a vCenter host, both vCenter and 
&PRODUCT; must be used in concert. &PRODUCT; and vCenter have separate 
maintenance modes that work closely together.</para>
-    <orderedlist>
-        <listitem><para>Place the host into &PRODUCT;'s "scheduled 
maintenance" mode. This does not invoke the vCenter maintenance mode, but only 
causes VMs to be migrated off the host</para>
-        <para>When the &PRODUCT; maintenance mode is requested, the host first 
moves into the Prepare for Maintenance state. In this state it cannot be the 
target of new guest VM starts. Then all VMs will be migrated off the server.  
Live migration will be used to move VMs off the host. This allows the guests to 
be migrated to other hosts with no disruption to the guests. After this 
migration is completed, the host will enter the Ready for Maintenance 
mode.</para></listitem>
-        <listitem><para>Wait for the "Ready for Maintenance" indicator to 
appear in the UI.</para></listitem>
-        <listitem><para>Now use vCenter to perform whatever actions are 
necessary to maintain the host. During this time, the host cannot be the target 
of new VM allocations.</para></listitem>
-        <listitem><para>When the maintenance tasks are complete, take the host 
out of maintenance mode as follows:</para>
-        <orderedlist numeration="loweralpha">
-            <listitem><para>First use vCenter to exit the vCenter maintenance 
mode.</para>
-            <para>This makes the host ready for &PRODUCT; to reactivate 
it.</para></listitem>
-            <listitem><para>Then use &PRODUCT;'s administrator UI to cancel 
the &PRODUCT; maintenance mode</para>
-           <para>When the host comes back online, the VMs that were migrated 
off of it may be migrated back to it manually and new VMs can be 
added.</para></listitem>
-          </orderedlist></listitem>        
-       </orderedlist>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/verifying-source.xml
----------------------------------------------------------------------
diff --git a/en-US/verifying-source.xml b/en-US/verifying-source.xml
deleted file mode 100644
index b20b9bb..0000000
--- a/en-US/verifying-source.xml
+++ /dev/null
@@ -1,82 +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="sect-source-verify">
-    <title>Verifying the downloaded release</title>
-    <para>
-        There are a number of mechanisms to check the authenticity and 
validity of a 
-        downloaded release. 
-    </para>
-    <section id="sect-source-verify-keys">
-       <title>Getting the KEYS</title>
-       <para>
-          To enable you to verify the GPG signature, you will need to download 
the 
-          <ulink 
url="http://www.apache.org/dist/incubator/cloudstack/KEYS";>KEYS</ulink>
-          file.
-       </para>
-       <para>
-          You next need to import those keys, which you can do by running:
-          <programlisting><prompt>#</prompt> <command>gpg</command> --import 
KEYS</programlisting>
-       </para>
-    </section>
-    <section id="sect-source-verify-gpg">
-        <title>GPG</title>
-        <para>
-           The &PRODUCT; project provides a detached GPG signature of the 
release.
-           To check the signature, run the following command:
-           <programlisting><prompt>$</prompt> <command>gpg</command> --verify 
apache-cloudstack-4.0.0-incubating-src.tar.bz2.asc</programlisting>
-        </para>
-        <para>
-           If the signature is valid you will see a line of output that 
contains 'Good signature'.
-        </para>  
-    </section>
-    <section id="sect-source-verify-md5">
-        <title>MD5</title>
-        <para>
-            In addition to the cryptographic signature, &PRODUCT; has an MD5 
checksum
-            that you can use to verify the download matches the release. 
-           You can verify this hash by executing the following command:
-           <programlisting><prompt>$</prompt> <command>gpg</command> 
--print-md MD5 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | 
<command>diff</command> - 
apache-cloudstack-4.0.0-incubating-src.tar.bz2.md5</programlisting>
-         </para>
-         <para>
-             If this successfully completes you should see no output. If there 
is any output from them,
-             then there is a difference between the hash you generated locally 
and the hash that has been
-             pulled from the server.
-         </para>
-     </section>
-     <section id="sect-source-verify-sha512">
-        <title>SHA512</title>
-        <para>
-           In addition to the MD5 hash, the &PRODUCT; project provides a SHA512
-           cryptographic hash to aid in assurance of the validity of the 
downloaded
-           release. You can verify this hash by executing the following 
command:
-           <programlisting><prompt>$</prompt> <command>gpg</command> 
--print-md SHA512 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | 
<command>diff</command> - 
apache-cloudstack-4.0.0-incubating-src.tar.bz2.sha</programlisting>
-        </para>
-        <para>
-           If this command successfully completes you should see no output. If 
there is any output from them,
-           then there is a difference between the hash you generated locally 
and the hash that has been
-           pulled from the server.
-        </para>
-     </section>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/virtual-machine-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/en-US/virtual-machine-usage-record-format.xml 
b/en-US/virtual-machine-usage-record-format.xml
deleted file mode 100644
index ac8fec9..0000000
--- a/en-US/virtual-machine-usage-record-format.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="virtual-machine-usage-record-format">
-    <title>Virtual Machine Usage Record Format</title>
-    <para>For running and allocated virtual machine usage, the following 
fields exist in a usage record:</para>
-    <itemizedlist>
-        <listitem><para>account – name of the account</para></listitem>
-        <listitem><para>accountid – ID of the account</para></listitem>
-        <listitem><para>domainid – ID of the domain in which this account 
resides</para></listitem>
-        <listitem><para>zoneid – Zone where the usage 
occurred</para></listitem>
-        <listitem><para>description – A string describing what the usage 
record is tracking</para></listitem>
-        <listitem><para>usage – String representation of the usage, 
including the units of usage (e.g. 'Hrs' for VM running time)</para></listitem>
-        <listitem><para>usagetype – A number representing the usage type 
(see Usage Types)</para></listitem>
-        <listitem><para>rawusage – A number representing the actual usage in 
hours</para></listitem>
-        <listitem><para>virtualMachineId – The ID of the virtual 
machine</para></listitem>
-        <listitem><para>name – The name of the virtual 
machine</para></listitem>
-        <listitem><para>offeringid – The ID of the service 
offering</para></listitem>
-        <listitem><para>templateid – The ID of the template or the ID of the 
parent template. The parent template value is present when the current template 
was created from a volume.</para></listitem>
-        <listitem><para>usageid – Virtual machine</para></listitem>
-        <listitem><para>type – Hypervisor</para></listitem>
-        <listitem><para>startdate, enddate – The range of time for which the 
usage is aggregated; see Dates in the Usage Record</para></listitem>
-    </itemizedlist>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/virtual-machines.xml
----------------------------------------------------------------------
diff --git a/en-US/virtual-machines.xml b/en-US/virtual-machines.xml
deleted file mode 100644
index 8d88478..0000000
--- a/en-US/virtual-machines.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.
--->
-<chapter id="virtual-machines">
-  <title>Working With Virtual Machines</title>
-  <xi:include href="about-working-with-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="best-practices-for-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="vm-lifecycle.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="creating-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="accessing-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="stopping-and-starting-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="host-allocation.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-  <xi:include href="vm-snapshots.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="changing-vm-name-os-group.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="append-displayname-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="changing-service-offering-for-vm.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <section id="reset-volume-on-reboot-vm">
-    <title>Resetting the Virtual Machine Root Volume on Reboot</title>
-    <para>For secure environments, and to ensure that VM state is not 
persisted across reboots,
-      you can reset the root disk. For more information, see <xref 
linkend="reset-vm-reboot"/>.</para>
-  </section>
-  <xi:include href="manual-live-migration.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="deleting-vms.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="working-with-iso.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/virtual-router.xml
----------------------------------------------------------------------
diff --git a/en-US/virtual-router.xml b/en-US/virtual-router.xml
deleted file mode 100644
index e015bfa..0000000
--- a/en-US/virtual-router.xml
+++ /dev/null
@@ -1,41 +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="virtual-router">
-  <title>Virtual Router</title>
-  <para>The virtual router is a type of System Virtual Machine. The virtual 
router is one of the
-    most frequently used service providers in &PRODUCT;. The end user has no 
direct access to the
-    virtual router. Users can ping the virtual router and take actions that 
affect it (such as
-    setting up port forwarding), but users do not have SSH access into the 
virtual router.</para>
-  <para>There is no mechanism for the administrator to log in to the virtual 
router. Virtual routers
-    can be restarted by administrators, but this will interrupt public network 
access and other
-    services for end users. A basic test in debugging networking issues is to 
attempt to ping the
-    virtual router from a guest VM. Some of the characteristics of the virtual 
router are determined
-    by its associated system service offering.</para>
-  <xi:include href="configure-virtual-router.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="upgrade-virtual-router-with-service-offering.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="best-practices-virtual-router.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="vr-monitor.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="vr-upgrade.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/vlan-allocation-eg.xml
----------------------------------------------------------------------
diff --git a/en-US/vlan-allocation-eg.xml b/en-US/vlan-allocation-eg.xml
deleted file mode 100644
index 3ffd166..0000000
--- a/en-US/vlan-allocation-eg.xml
+++ /dev/null
@@ -1,71 +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="vlan-allocation-eg">
-  <title>VLAN Allocation Example</title>
-  <para>VLANs are required for public and guest traffic. The following is an 
example of a VLAN
-    allocation scheme:</para>
-  <informaltable>
-    <tgroup cols="3" align="left" colsep="1" rowsep="1">
-      <thead>
-        <row>
-          <entry><para>VLAN IDs</para></entry>
-          <entry><para>Traffic type</para></entry>
-          <entry><para>Scope</para></entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><para>less than 500</para></entry>
-          <entry><para>Management traffic. Reserved for administrative 
purposes.</para></entry>
-          <entry><para>&PRODUCT; software can access this, hypervisors, system 
VMs.</para></entry>
-        </row>
-        <row>
-          <entry><para>500-599</para></entry>
-          <entry><para>VLAN carrying public traffic.</para></entry>
-          <entry><para>&PRODUCT; accounts.</para></entry>
-        </row>
-        <row>
-          <entry><para>600-799</para></entry>
-          <entry><para>VLANs carrying guest traffic.</para></entry>
-          <entry><para>&PRODUCT; accounts. Account-specific VLAN is chosen 
from this
-            pool.</para></entry>
-        </row>
-        <row>
-          <entry><para>800-899</para></entry>
-          <entry><para>VLANs carrying guest traffic.</para></entry>
-          <entry><para>&PRODUCT; accounts. Account-specific VLAN chosen by 
&PRODUCT; admin to assign
-              to that account.</para></entry>
-        </row>
-        <row>
-          <entry><para>900-999</para></entry>
-          <entry><para>VLAN carrying guest traffic</para></entry>
-          <entry><para>&PRODUCT; accounts. Can be scoped by project, domain, 
or all
-            accounts.</para></entry>
-        </row>
-        <row>
-          <entry><para>greater than 1000</para></entry>
-          <entry><para>Reserved for future use</para></entry>
-          <entry></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/vlan-assign-isolated-nw.xml
----------------------------------------------------------------------
diff --git a/en-US/vlan-assign-isolated-nw.xml 
b/en-US/vlan-assign-isolated-nw.xml
deleted file mode 100644
index 424ecd2..0000000
--- a/en-US/vlan-assign-isolated-nw.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="vlan-assign-isolated-nw">
-  <title>Assigning VLANs to Isolated Networks</title>
-  <para>&PRODUCT; provides you the ability to control VLAN assignment to 
Isolated networks. As a
-    Root admin, you can assign a VLAN ID when a network is created, just the 
way it's done for
-    Shared networks.</para>
-  <para>The former behaviour also is supported &mdash; VLAN is randomly 
allocated to a network from
-    the VNET range of the physical network when the network turns to 
Implemented state. The VLAN is
-    released back to the VNET pool when the network shuts down as a part of 
the Network Garbage
-    Collection. The VLAN can be re-used either by the same network when it is 
implemented again, or
-    by any other network. On each subsequent implementation of a network, a 
new VLAN can be
-    assigned.</para>
-  <para>Only the Root admin can assign VLANs because the regular users or 
domain admin are not aware
-    of the physical network topology. They cannot even view what VLAN is 
assigned to a
-    network.</para>
-  <para>To enable you to assign VLANs to Isolated networks,</para>
-  <orderedlist>
-    <listitem>
-      <para>Create a network offering by specifying the following:</para>
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Guest Type</emphasis>: Select 
Isolated.</para>
-        </listitem>
-        <listitem>
-          <para><emphasis role="bold">Specify VLAN</emphasis>: Select the 
option.</para>
-        </listitem>
-      </itemizedlist>
-      <para condition="install">For more information, see <xref 
linkend="creating-network-offerings"
-        />.</para>
-      <para condition="admin">For more information, see the &PRODUCT; 
Installation Guide.</para>
-    </listitem>
-    <listitem>
-      <para>Using this network offering, create a network.</para>
-      <para>You can create a VPC tier or an Isolated network.</para>
-    </listitem>
-    <listitem>
-      <para>Specify the VLAN when you create the network.</para>
-      <para>When VLAN is specified, a CIDR and gateway are assigned to this 
network and the state is
-        changed to Setup. In this state, the network will not be garbage 
collected.</para>
-    </listitem>
-  </orderedlist>
-  <note>
-    <para>You cannot change a VLAN once it's assigned to the network. The VLAN 
remains with the
-      network for its entire life cycle.</para>
-  </note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/vlan-provisioning.xml
----------------------------------------------------------------------
diff --git a/en-US/vlan-provisioning.xml b/en-US/vlan-provisioning.xml
deleted file mode 100644
index 2d1a49e..0000000
--- a/en-US/vlan-provisioning.xml
+++ /dev/null
@@ -1,46 +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="vlan-provisioning">
-  <title>VLAN Provisioning</title>
-  <para>&PRODUCT; automatically creates and destroys interfaces bridged to 
VLANs on the hosts. In
-    general the administrator does not need to manage this process.</para>
-  <para>&PRODUCT; manages VLANs differently based on hypervisor type. For 
XenServer or KVM, the
-    VLANs are created on only the hosts where they will be used and then they 
are destroyed when all
-    guests that require them have been terminated or moved to another 
host.</para>
-  <para>For vSphere the VLANs are provisioned on all hosts in the cluster even 
if there is no guest
-    running on a particular Host that requires the VLAN. This allows the 
administrator to perform
-    live migration and other functions in vCenter without having to create the 
VLAN on the
-    destination Host. Additionally, the VLANs are not removed from the Hosts 
when they are no longer
-    needed.</para>
-  <para>You can use the same VLANs on different physical networks provided 
that each physical
-    network has its own underlying layer-2 infrastructure, such as switches. 
For example, you can
-    specify VLAN range 500 to 1000 while deploying physical networks A and B 
in an Advanced zone
-    setup. This capability allows you to set up an additional layer-2 physical 
infrastructure on a
-    different physical NIC and use the same set of VLANs if you run out of 
VLANs. Another advantage
-    is that you can use the same set of IPs for different customers, each one 
with their own routers
-    and the guest networks on different physical NICs.</para>
-  <xi:include href="vlan-allocation-eg.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <xi:include href="non-contiguous-vlan.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-  <xi:include href="vlan-assign-isolated-nw.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f42520a5/en-US/vm-lifecycle.xml
----------------------------------------------------------------------
diff --git a/en-US/vm-lifecycle.xml b/en-US/vm-lifecycle.xml
deleted file mode 100644
index 15d9f7d..0000000
--- a/en-US/vm-lifecycle.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-       
-       http://www.apache.org/licenses/LICENSE-2.0
-       
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-
-<section id="vm-lifecycle">
-       <title>VM Lifecycle</title>
-       <para>Virtual machines can be in the following states:</para>
-       <mediaobject>
-               <imageobject>
-                       <imagedata fileref="./images/vm-lifecycle.png" />
-               </imageobject>
-        <textobject><phrase>basic-deployment.png: Basic two-machine &PRODUCT; 
deployment</phrase></textobject>
-       </mediaobject>
-       <para>Once a virtual machine is destroyed, it cannot be recovered. All 
the resources used by the virtual machine will be reclaimed by the system. This 
includes the virtual machine’s IP address.</para>
-       <para>A stop will attempt to gracefully shut down the operating system, 
which typically involves terminating all the running applications. If the 
operation system cannot be stopped, it will be forcefully terminated. This has 
the same effect as pulling the power cord to a physical machine.</para>
-       <para>A reboot is a stop followed by a start.</para>
-       <para>&PRODUCT; preserves the state of the virtual machine hard disk 
until the machine is destroyed.</para>
-       <para>A running virtual machine may fail because of hardware or network 
issues. A failed virtual machine is in the down state.</para>
-       <para>The system places the virtual machine into the down state if it 
does not receive the heartbeat from the hypervisor for three minutes.</para>
-       <para>The user can manually restart the virtual machine from the down 
state.</para>
-       <para>The system will start the virtual machine from the down state 
automatically if the virtual machine is marked as HA-enabled.</para>
-</section>
-

Reply via email to