incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [3/9] Feature Documentation for s2svpn interVlan and Autoscale
Date Tue, 11 Sep 2012 08:55:33 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/change-network-offering-on-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-network-offering-on-guest-network.xml b/docs/en-US/change-network-offering-on-guest-network.xml
index 98f1b63..c440c20 100644
--- a/docs/en-US/change-network-offering-on-guest-network.xml
+++ b/docs/en-US/change-network-offering-on-guest-network.xml
@@ -5,40 +5,47 @@
 ]>
 
 <!-- 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.
--->
-
+	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="change-network-offering-on-guest-network">
-    <title>Changing the Network Offering on a Guest Network</title>
-    <para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
-    <itemizedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
-        <listitem><para>In the left navigation, choose Network</para></listitem>
-        <listitem><para>Click the name of the network you want to modify <inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="./images/edit-icon.png" />
-            </imageobject>
-            <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
-        </inlinemediaobject>.</para></listitem>
-        <listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
-        <listitem><para>A prompt appears asking whether you want to keep the existing CIDR. This is to let you know that if you change the network offering, the CIDR will be affected. Choose No to proceed with the change.</para></listitem>
-        <listitem><para>Wait for the update to complete. Don’t try to restart VMs until after the network change is complete.</para></listitem>
-        <listitem><para>If you stopped any VMs in step 2, restart them.</para></listitem>
-    </itemizedlist>
+	<title>Changing the Network Offering on a Guest Network</title>
+	<para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
+	<itemizedlist>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+		<listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one
+				that uses external devices as network service providers, you must first stop all the
+				VMs on the network. See <xref linkend="stopping-and-starting-vms"/>.</para></listitem>
+		<listitem><para>In the left navigation, choose Network.</para></listitem>
+		<listitem><para>Click the name of the network you want to modify.</para></listitem>
+		<listitem><para>In the Details tab, click Edit.<inlinemediaobject>
+			<imageobject>
+				<imagedata fileref="./images/edit-icon.png"/>
+			</imageobject>
+			<textobject>
+				<phrase>EditButton.png: button to edit a network</phrase>
+			</textobject>
+		</inlinemediaobject></para></listitem>
+		<listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
+		<listitem><para>A prompt is displayed asking whether you want to keep the existing CIDR. This is to let you
+				know that if you change the network offering, the CIDR will be affected. Choose No
+				to proceed with the change.</para></listitem>
+		<listitem><para>Wait for the update to complete. Don’t try to restart VMs until the network change is
+				complete.</para></listitem>
+		<listitem><para>If you stopped any VMs, restart them.</para></listitem>
+	</itemizedlist>
+	</section>
 
-    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/changing-root-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-root-password.xml b/docs/en-US/changing-root-password.xml
index 0d2333a..880f50f 100644
--- a/docs/en-US/changing-root-password.xml
+++ b/docs/en-US/changing-root-password.xml
@@ -1,29 +1,28 @@
 <?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" [
+<!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.
--->
-
+    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="changing-root-password">
-    <title>Changing the Root Password</title>
+	<title>Changing the Root Password</title>
     <para>During installation and ongoing cloud administration, you will need to log in to the UI as the root administrator.
         The root administrator account manages the &PRODUCT; deployment, including physical infrastructure.
         The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/changing-secondary-storage-ip.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-ip.xml b/docs/en-US/changing-secondary-storage-ip.xml
index 7e146de..34f93e3 100644
--- a/docs/en-US/changing-secondary-storage-ip.xml
+++ b/docs/en-US/changing-secondary-storage-ip.xml
@@ -2,43 +2,43 @@
 <!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.
--->
-
+	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="changing-secondary-storage-ip">
-        <title>Making API Requests</title>
-        <para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
-        <programlisting>
-        # mysql -p
-        mysql> use cloud;
-        mysql> select id from host where type = 'SecondaryStorage';
-        mysql> update host_details set value = 'nfs://192.168.160.20/export/mike-ss1'
-          where host_id = HOSTID and name = 'orig.url';
-        mysql> update host set name = 'nfs://192.168.160.20/export/mike-ss1' where type
-          = 'SecondaryStorage' and id = #;
-        mysql> update host set url = 'nfs://192.168.160.20/export/mike-ss1' where type
-          = 'SecondaryStorage' and id = #;
-        mysql> update host set guid = 'nfs://192.168.160.20/export/mike-ss1' where type
-          = 'SecondaryStorage' and id = #;
-        </programlisting>
-        <note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
-        <para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
-            
-    </section>
+		<title>Changing the Secondary Storage IP Address</title>
+		<para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
+		<programlisting>
+		# mysql -p
+		mysql> use cloud;
+		mysql> select id from host where type = 'SecondaryStorage';
+		mysql> update host_details set value = 'nfs://192.168.160.20/export/mike-ss1'
+  		where host_id = HOSTID and name = 'orig.url';
+		mysql> update host set name = 'nfs://192.168.160.20/export/mike-ss1' where type
+  		= 'SecondaryStorage' and id = #;
+		mysql> update host set url = 'nfs://192.168.160.20/export/mike-ss1' where type
+ 		 = 'SecondaryStorage' and id = #;
+		mysql> update host set guid = 'nfs://192.168.160.20/export/mike-ss1' where type
+  		= 'SecondaryStorage' and id = #;
+		</programlisting>
+		<note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
+	    <para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
+			
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/changing-service-offering-for-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-service-offering-for-vm.xml b/docs/en-US/changing-service-offering-for-vm.xml
index 5a42912..4fc9ef4 100644
--- a/docs/en-US/changing-service-offering-for-vm.xml
+++ b/docs/en-US/changing-service-offering-for-vm.xml
@@ -5,45 +5,50 @@
 ]>
 
 <!-- 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.
+	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="changing-service-offering-for-vm">
-    <title>Changing the Service Offering for a VM</title>
-        <para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</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 work with.</para></listitem>
-            <listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/stop-instance-icon.png" />
-                </imageobject>
-                <textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
-            </inlinemediaobject>
-                </para></listitem>
-            <listitem><para>Click the Change Service button <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/change-service-icon.png" />
-                </imageobject>
-                <textobject><phrase>ChangeServiceButton.png: button to change the service of a VM</phrase></textobject>
-            </inlinemediaobject>. The Change service dialog box is displayed.</para></listitem>
-            <listitem><para>Select the offering you want.</para></listitem>
-            <listitem><para>Click OK.</para></listitem>
-        </orderedlist>
-    </section>
+	<title>Changing the Service Offering for a VM</title>
+		<para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</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 work with.</para></listitem>
+			<listitem><para>Click the Stop button to stop the VM.<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/stop-instance-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>StopButton.png: button to stop a VM</phrase>
+					</textobject>
+				</inlinemediaobject>
+				</para></listitem>
+			<listitem><para>Click the Change Service button.<inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/change-service-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>ChangeServiceButton.png: button to change the service of a
+							VM</phrase>
+					</textobject>
+				</inlinemediaobject></para>
+				<para>The Change service dialog box is displayed.</para></listitem>
+			<listitem><para>Select the offering you want to apply to the selected VM.</para></listitem>
+			<listitem><para>Click OK.</para></listitem>
+		</orderedlist>
+	</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/changing-vm-name-os-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-vm-name-os-group.xml b/docs/en-US/changing-vm-name-os-group.xml
index f16ffda..daf78bc 100644
--- a/docs/en-US/changing-vm-name-os-group.xml
+++ b/docs/en-US/changing-vm-name-os-group.xml
@@ -5,50 +5,55 @@
 ]>
 
 <!-- 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.
+	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="changing-vm-name-os-group">
-    <title>Changing the VM Name, OS, or Group</title>
-    <para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
-    <para>To access a VM through the &PRODUCT; UI:</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>Select the VM that you want to modify.</para></listitem>
-            <listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/stop-instance-icon.png" />
-                </imageobject>
-                <textobject><phrase>StopButton.png: button to stop a VM</phrase></textobject>
-            </inlinemediaobject>
-                </para></listitem>
-            <listitem><para>Click Edit <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/edit-icon.png" />
-                </imageobject>
-                <textobject><phrase>StopButton.png: button to edit the properties of a VM</phrase></textobject>
-            </inlinemediaobject>.</para></listitem>
-            <listitem><para>Make the desired changes to the following:</para></listitem>
-            
-                <listitem><para>Display name: Enter a new display name if you want to change the name of the VM.</para></listitem>
-                <listitem><para>OS Type: Select the desired operating system.</para></listitem>
-                <listitem><para>Group: Enter the group name for the VM.</para></listitem>    
-            
-            <listitem><para>Click Apply.</para></listitem>
-        </orderedlist>
-    </section>
+	<title>Changing the VM Name, OS, or Group</title>
+	<para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
+	<para>To access a VM through the &PRODUCT; UI:</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>Select the VM that you want to modify.</para></listitem>
+			<listitem><para>Click the Stop button to stop the VM. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/stop-instance-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>StopButton.png: button to stop a VM</phrase>
+					</textobject>
+				</inlinemediaobject>
+			</para></listitem>
+			<listitem><para>Click Edit. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/edit-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>EditButton.png: button to edit the properties of a VM</phrase>
+					</textobject>
+				</inlinemediaobject></para></listitem>
+			<listitem><para>Make the desired changes to the following:</para></listitem>
+			
+				<listitem><para><emphasis role="bold">Display name</emphasis>: Enter a new display name if you want to change
+				the name of the VM.</para></listitem>
+				<listitem><para><emphasis role="bold">OS Type</emphasis>: Select the desired operating system.</para></listitem>
+				<listitem><para><emphasis role="bold">Group</emphasis>: Enter the group name for the VM.</para></listitem>	
+			
+			<listitem><para>Click Apply.</para></listitem>
+		</orderedlist>
+	</section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/cloud-infrastructure-concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml
index 58f8844..8860d3a 100644
--- a/docs/en-US/cloud-infrastructure-concepts.xml
+++ b/docs/en-US/cloud-infrastructure-concepts.xml
@@ -1,34 +1,34 @@
 <?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" [
+<!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.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 
-<section id="cloud-infrastructure-concepts">
+<chapter id="cloud-infrastructure-concepts">
     <title>Cloud Infrastructure Concepts</title>
-  <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
-  <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
+    <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />    
+    <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/cloud-infrastructure-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-overview.xml b/docs/en-US/cloud-infrastructure-overview.xml
index 5b467a3..a761c47 100644
--- a/docs/en-US/cloud-infrastructure-overview.xml
+++ b/docs/en-US/cloud-infrastructure-overview.xml
@@ -1,46 +1,47 @@
 <?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" [
+<!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.
--->
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->	
 
 <section id="cloud-infrastructure-overview">
-    <title>Cloud Infrastructure Overview</title>
-    <para>
-        The Management Server manages one or more zones (typically, datacenters) containing host computers where guest virtual machines will run. The cloud infrastructure is organized as follows:
-    </para>
-    <itemizedlist>
-        <listitem><para>Zone: Typically, a zone is equivalent to a single datacenter. A zone consists of one or more pods and secondary storage.</para></listitem>
-        <listitem><para>Pod: A pod is usually one rack of hardware that includes a layer-2 switch and one or more clusters.</para></listitem>
-        <listitem><para>Cluster: A cluster consists of one or more hosts and primary storage.</para></listitem>
-        <listitem><para>Host: A single compute node within a cluster. The hosts are where the actual cloud services run in the form of guest virtual machines.</para></listitem>
-        <listitem><para>Primary storage is associated with a cluster, and it stores the disk volumes for all the VMs running on hosts in that cluster.</para></listitem>
-        <listitem><para>Secondary storage is associated with a zone, and it stores templates, ISO images, and disk volume snapshots.</para></listitem>
-    </itemizedlist>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/infrastructure-overview.png" />
-        </imageobject>
-        <textobject><phrase>infrastructure_overview.png: Nested organization of a zone</phrase></textobject>
-    </mediaobject>
-    <para><emphasis role="bold">More Information</emphasis></para>
-    <para>For more information, see <xref linkend="cloud-infrastructure-concepts" />.</para>
+	<title>Cloud Infrastructure Overview</title>
+	<para>
+		The Management Server manages one or more zones (typically, datacenters) containing host computers where guest virtual machines will run. The cloud infrastructure is organized as follows:
+	</para>
+	<itemizedlist>
+		<listitem><para>Zone: Typically, a zone is equivalent to a single datacenter. A zone consists of one or more pods and secondary storage.</para></listitem>
+		<listitem><para>Pod: A pod is usually one rack of hardware that includes a layer-2 switch and one or more clusters.</para></listitem>
+		<listitem><para>Cluster: A cluster consists of one or more hosts and primary storage.</para></listitem>
+		<listitem><para>Host: A single compute node within a cluster. The hosts are where the actual cloud services run in the form of guest virtual machines.</para></listitem>
+		<listitem><para>Primary storage is associated with a cluster, and it stores the disk volumes for all the VMs running on hosts in that cluster.</para></listitem>
+		<listitem><para>Secondary storage is associated with a zone, and it stores templates, ISO images, and disk volume snapshots.</para></listitem>
+	</itemizedlist>
+	<mediaobject>
+		<imageobject>
+			<imagedata fileref="./images/infrastructure-overview.png" />
+		</imageobject>
+		<textobject><phrase>infrastructure-overview.png: Nested organization of a zone</phrase></textobject>
+	</mediaobject>
+	<para><emphasis role="bold">More Information</emphasis></para>
+	<para>For more information, see <xref linkend="cloud-infrastructure-concepts" />.</para>
 </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/cloudstack_admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_admin.xml b/docs/en-US/cloudstack_admin.xml
index c80c94f..30ccebd 100644
--- a/docs/en-US/cloudstack_admin.xml
+++ b/docs/en-US/cloudstack_admin.xml
@@ -1,31 +1,52 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!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.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 
 <book>
-    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<xi:include href="Book_Info_Admin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="accounts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="provisioning-steps.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="set-up-network-for-users.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="virtual-machines.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="work-with-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="working-with-system-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="sys-reliability-and-ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="manage-cloud.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="api-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="tuning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="event-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml
index 5210bd8..89f9bd2 100644
--- a/docs/en-US/cluster-add.xml
+++ b/docs/en-US/cluster-add.xml
@@ -1,28 +1,31 @@
 <?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" [
+<!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.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 
 <section id="cluster-add">
-    <title>Adding a Cluster</title>
-    <para>TODO</para>
+	<title>Adding a Cluster</title>
+    <para>You need to tell &PRODUCT; about the hosts that it will manage. Hosts exist inside clusters, so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
+    <xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/compute-disk-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compute-disk-service-offerings.xml b/docs/en-US/compute-disk-service-offerings.xml
index 2469dfe..1fd2a91 100644
--- a/docs/en-US/compute-disk-service-offerings.xml
+++ b/docs/en-US/compute-disk-service-offerings.xml
@@ -5,33 +5,32 @@
 ]>
 
 <!-- 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.
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
 -->
-
 <section id="compute-disk-service-offerings">
     <title>Compute and Disk Service Offerings</title>
-    <para>A service offering is a set of virtual hardware features such as CPU core count and speed, memory, and disk size. The CloudPlatform administrator can set up various offerings, and then end users choose from the available offerings when they create a new VM. A service offering includes the following elements:</para>
+    <para>A service offering is a set of virtual hardware features such as CPU core count and speed, memory, and disk size. The &PRODUCT; administrator can set up various offerings, and then end users choose from the available offerings when they create a new VM. A service offering includes the following elements:</para>
      <itemizedlist>
          <listitem><para>CPU, memory, and network resource guarantees</para></listitem>
          <listitem><para>How resources are metered</para></listitem>
          <listitem><para>How the resource usage is charged</para></listitem>
          <listitem><para>How often the charges are generated</para></listitem>
         </itemizedlist>
-    <para>For example,  one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel Core 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, CloudPlatform emits usage records that can be integrated with billing systems. CloudPlatform separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
+    <para>For example,  one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel® Core™ 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, &PRODUCT; emits usage records that can be integrated with billing systems. &PRODUCT; separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
     <itemizedlist>
         <listitem><para>Guest CPU</para></listitem>
         <listitem><para>Guest RAM</para></listitem>
@@ -43,4 +42,9 @@
         <listitem><para>Disk size (optional).  An offering without a disk size will allow users to pick their own</para></listitem>
         <listitem><para>Tags on the data disk</para></listitem>
     </itemizedlist>
+    <xi:include href="creating-compute-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="creating-disk-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modify-delete-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>
+
+    

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/concepts.xml b/docs/en-US/concepts.xml
index 1912c23..e20f442 100644
--- a/docs/en-US/concepts.xml
+++ b/docs/en-US/concepts.xml
@@ -1,30 +1,29 @@
 <?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" [
+<!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.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <chapter id="concepts">
-    <title>Concepts</title>
-        <xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="feature-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="deployment-architecture-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<title>Concepts</title>
+    <xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<xi:include href="feature-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<xi:include href="deployment-architecture-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
index 95df473..a626c13 100644
--- a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
+++ b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
@@ -5,46 +5,52 @@
 ]>
 
 <!-- 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.
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
 -->
-
 <section id="configure-guest-traffic-in-advanced-zone">
-    <title>Configure Guest Traffic in an Advanced Zone</title>
-    <para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
-    <orderedlist>
-        <listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
-        <listitem><para>Click the Network tab.</para></listitem>
-        <listitem><para>Click Add network.</para></listitem>
-        <listitem><para>Provide the following information:</para>
-        <itemizedlist>
-            <listitem><para>Name. The name of the network.  This will be user-visible</para></listitem>
-            <listitem><para>Description: The description of the network.  This will be user-visible</para></listitem>
-            <listitem><para>VLAN ID: Enter an administrator-configured VLAN ID so you can create different networks for use by different VM users in the zone</para></listitem>
-            <listitem><para>Scope: Choose account-specific or domain-specific if you would like to make the network accessible to only a single account or domain.  Choose zone-wide if all accounts with access to the zone should be able to access the network.</para></listitem>
-            <listitem><para>Domain/Account: If Scope is account-specific, enter the domain and account name for the account</para></listitem>
-            <listitem><para>Network offering: If the administrator has configured multiple network offerings, select the one you want to use for this network</para></listitem>
-            <listitem><para>Gateway: The gateway that the guests should use</para></listitem>
-            <listitem><para>Netmask: The netmask in use on the subnet the guests will use</para></listitem>
-            <listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.  If multiple NICs are used, they may be in a different subnet.</para></listitem>
-            <listitem><para>Network Domain: (Optional) If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
-        </itemizedlist>
-        </listitem>
-        <listitem><para>Click OK.</para></listitem>
-    </orderedlist>
-    
-    
-    </section>
+	<title>Configure Guest Traffic in an Advanced Zone</title>
+	<para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
+	<orderedlist>
+		<listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
+		<listitem><para>Click the Network tab.</para></listitem>
+		<listitem><para>Click Add guest network.</para>
+			<para>The Add guest network window is displayed:</para><mediaobject>
+				<imageobject>
+					<imagedata fileref="./images/add-guest-network.png" />
+				</imageobject>
+				<textobject>
+					<phrase>networksetupzone.png: Depicts network setup in a single zone</phrase>
+				</textobject>
+			</mediaobject></listitem>
+		<listitem><para>Provide the following information:</para>
+		<itemizedlist>
+			<listitem><para><emphasis role="bold">Name</emphasis>. The name of the network. This will be
+						user-visible</para></listitem>
+			<listitem><para><emphasis role="bold">Display Text</emphasis>: The description of the network. This will be
+			user-visible</para></listitem>
+			<listitem><para><emphasis role="bold">Zone</emphasis>: The zone in which you are configuring the guest network.</para></listitem>
+			<listitem><para><emphasis role="bold">Network offering</emphasis>: If the administrator has configured
+						multiple network offerings, select the one you want to use for this
+						network</para></listitem>
+			<listitem><para><emphasis role="bold">Guest Gateway</emphasis>: The gateway that the guests should use</para></listitem>
+			<listitem><para><emphasis role="bold">Guest Netmask</emphasis>: The netmask in use on the subnet the guests
+						will use</para></listitem>
+			</itemizedlist>
+		</listitem>
+		<listitem><para>Click OK.</para></listitem>
+	</orderedlist>	
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/configure-usage-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-usage-server.xml b/docs/en-US/configure-usage-server.xml
index d167a49..173f4a5 100644
--- a/docs/en-US/configure-usage-server.xml
+++ b/docs/en-US/configure-usage-server.xml
@@ -5,23 +5,22 @@
 ]>
 
 <!-- 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.
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
-
 <section id="configure-usage-server">
     <title>Configuring the Usage Server</title>
     <para>To configure the usage server:</para>
@@ -54,17 +53,17 @@
                 <row>
                     <entry><para>usage.aggregation.timezone</para></entry>
                     <entry><para>Time zone of usage records. Set this if the usage records and daily job execution are in different time zones. For example, with the following settings, the usage job will run at PST 00:15 and generate usage records for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:</para>
-                    <programlisting>usage.stats.job.exec.time = 00:15    
+                    <programlisting>usage.stats.job.exec.time = 00:15	
 usage.execution.timezone = PST
 usage.aggregation.timezone = GMT
                         </programlisting>
-                        <para>Valid values for the time zone are specified in <xref linkend="appendix-a-time-zones"/></para>
+                        <para>Valid values for the time zone are specified in <xref linkend="time-zones"/></para>
                         <para>Default: GMT</para>
                     </entry>                    
                 </row>
                 <row>
                     <entry><para>usage.execution.timezone</para></entry>
-                    <entry><para>The time zone of usage.stats.job.exec.time.  Valid values for the time zone are specified in <xref linkend="appendix-a-time-zones"/></para>
+                    <entry><para>The time zone of usage.stats.job.exec.time.  Valid values for the time zone are specified in <xref linkend="time-zones"/></para>
                         <para>Default: The time zone of the management server.</para>
                     </entry>                    
                 </row>
@@ -75,13 +74,13 @@ usage.aggregation.timezone = GMT
                 <row>
                     <entry><para>usage.stats.job.aggregation.range</para></entry>
                     <entry><para>The time period in minutes between Usage Server processing jobs. For example, if you set it to 1440, the Usage Server will run once per day. If you set it to 600, it will run every ten hours. In general, when a Usage Server job runs, it processes all events generated since usage was last run.</para>
-                        <para>There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. &PRODUCT; assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. &PRODUCT; assumes this "midnight to midnight" is relative to the usage.execution.timezone.</para>
+                        <para>There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. &PRODUCT; assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. &PRODUCT; assumes this “midnight to midnight” is relative to the usage.execution.timezone.</para>
                         <para>Default: 1440</para>
                     </entry>                    
                 </row>
                 <row>
                     <entry><para>usage.stats.job.exec.time</para></entry>
-                    <entry><para>The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter "10:30".</para>
+                    <entry><para>The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter “10:30”.</para>
                     <para>If usage.stats.job.aggregation.range is also set, and its value is not 1440, then its value will be added to usage.stats.job.exec.time to get the time to run the Usage Server job again. This is repeated until 24 hours have elapsed, and the next day's processing begins again at usage.stats.job.exec.time.</para>
                         <para>Default: 00:15.</para>
                     </entry>                    
@@ -97,5 +96,9 @@ usage.aggregation.timezone = GMT
         <listitem><para>usage.stats.job.aggregation.range = 1440</para></listitem>
     </itemizedlist>
     <para>With this configuration, the Usage job will run every night at 2 AM EST and will process records for the previous day’s midnight-midnight as defined by the EST (America/New_York) time zone.</para>
-    <note><para>Because the special value 1440 has been used for usage.stats.job.aggregation.range, the Usage Server will ignore the data between midnight and 2 AM. That data will be included in the next day's run</para></note>    
+    <note><para>Because the special value 1440 has been used for usage.stats.job.aggregation.range, the Usage
+            Server will ignore the data between midnight and 2 AM. That data will be included in the
+            next day's run.</para>
+        </note>
+    <para></para>    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml
index 9e059f7..87b4e65 100644
--- a/docs/en-US/configure-vpn.xml
+++ b/docs/en-US/configure-vpn.xml
@@ -5,48 +5,49 @@
 ]>
 
 <!-- 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.
--->
-
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->	
 <section id="configure-vpn">
-    <title>Configuring VPN</title>
-    <para>To set up VPN for the cloud:</para>
-    <orderedlist>
-        <listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
-        <listitem><para>In the left navigation, click Global Settings.</para></listitem>
-        <listitem><para>Set the following global configuration parameters.</para>
-        <itemizedlist>
-            <listitem><para>remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.</para></listitem>
-            <listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
-            <listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users per account.</para></listitem>
-        </itemizedlist></listitem></orderedlist>
-        <para>To enable VPN for a particular network:</para>    
-        <orderedlist>
-            <listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>            
-            <listitem><para>In the left navigation, click Network.</para></listitem>
-            <listitem><para>Click the name of the network you want to work with.</para></listitem>
-            <listitem><para>Click View IP Addresses.</para></listitem>
-            <listitem><para>Click one of the displayed IP address names.</para></listitem>
-            <listitem><para>Click the Enable VPN button <inlinemediaobject>
-                <imageobject>
-                    <imagedata fileref="./images/vpn-icon.png" />
-                </imageobject>
-                <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
-            </inlinemediaobject>.</para>
-                <para>The IPsec key is displayed in a popup window.</para></listitem>
-        </orderedlist>    
+	<title>Configuring VPN</title>
+	<para>To set up VPN for the cloud:</para>
+	<orderedlist>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+		<listitem><para>In the left navigation, click Global Settings.</para></listitem>
+		<listitem><para>Set the following global configuration parameters.</para>
+		<itemizedlist>
+			<listitem><para>remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server.</para></listitem>
+			<listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
+			<listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users per account.</para></listitem>
+		</itemizedlist></listitem></orderedlist>
+		<para>To enable VPN for a particular network:</para>	
+		<orderedlist>
+			<listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>			
+			<listitem><para>In the left navigation, click Network.</para></listitem>
+			<listitem><para>Click the name of the network you want to work with.</para></listitem>
+			<listitem><para>Click View IP Addresses.</para></listitem>
+			<listitem><para>Click one of the displayed IP address names.</para></listitem>
+			<listitem><para>Click the Enable VPN button. <inlinemediaobject>
+					<imageobject>
+						<imagedata fileref="./images/vpn-icon.png"/>
+					</imageobject>
+					<textobject>
+						<phrase>AttachDiskButton.png: button to attach a volume</phrase>
+					</textobject>
+				</inlinemediaobject></para>
+				<para>The IPsec key is displayed in a popup window.</para></listitem>
+		</orderedlist>	
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/console-proxy.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/console-proxy.xml b/docs/en-US/console-proxy.xml
index df29c42..ade50bb 100644
--- a/docs/en-US/console-proxy.xml
+++ b/docs/en-US/console-proxy.xml
@@ -5,21 +5,21 @@
 ]>
 
 <!-- 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.
+    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="console-proxy">
@@ -32,4 +32,5 @@
     <para>Assignment of guest VM to console proxy is determined by first determining if the guest VM has a previous session associated with a console proxy. If it does, the Management Server will assign the guest VM to the target Console Proxy VM regardless of the load on the proxy VM. Failing that, the first available running Console Proxy VM that has the capacity to handle new sessions is used.</para>
     <para>Console proxies can be restarted by administrators but this will interrupt existing console sessions for users.</para>
     <para>The console viewing functionality uses a dynamic DNS service under the domain name realhostip.com to assist in providing SSL security to console sessions.  The console proxy is assigned a public IP address.  In order to avoid browser warnings for mismatched SSL certificates, the URL for the new console window is set to the form of https://aaa-bbb-ccc-ddd.realhostip.com. Customers will see this URL during console session creation.  &PRODUCT; includes the realhostip.com SSL certificate in the console proxy VM.  Of course, &PRODUCT; cannot know about DNS A records for our customers' public IPs prior to shipping the software.  &PRODUCT; therefore runs a dynamic DNS server that is authoritative for the realhostip.com domain.  It maps the aaa-bbb-ccc-ddd part of the DNS name to the IP address aaa.bbb.ccc.ddd on lookups.  This allows the browser to correctly connect to the console proxy's public IP, where it then expects and receives a SSL certificate for realhostip.com, and SSL 
 is set up without browser warnings.</para>
-   </section>
+    <xi:include href="change-console-proxy-ssl-certificate-domain.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/convert-hyperv-vm-to-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/convert-hyperv-vm-to-template.xml b/docs/en-US/convert-hyperv-vm-to-template.xml
index c6294d4..df38823 100644
--- a/docs/en-US/convert-hyperv-vm-to-template.xml
+++ b/docs/en-US/convert-hyperv-vm-to-template.xml
@@ -5,64 +5,65 @@
 ]>
 
 <!-- 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.
+	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="convert-hyperv-vm-to-template">
-    <title>Converting a Hyper-V VM to a Template</title>
-    <para>To convert a Hyper-V VM to a XenServer-compatible &PRODUCT; template, you will need a standalone XenServer host with an attached NFS VHD SR.  Use whatever XenServer version you are using with &PRODUCT;, but use XenCenter 5.6 FP1 or SP2 (it is backwards compatible to 5.6).  Additionally, it may help to have an attached NFS ISO SR.</para>
-    <para>For Linux VMs, you may need to do some preparation in Hyper-V before trying to get the VM to work in XenServer.  Clone the VM and work on the clone if you still want to use the VM in Hyper-V.  Uninstall Hyper-V Integration Components and check for any references to device names in /etc/fstab:</para>
-    <orderedlist>
-        <listitem><para>From the linux_ic/drivers/dist directory, run make uninstall (where "linux_ic" is the path to the copied Hyper-V Integration Components files).</para></listitem>
-        <listitem><para>Restore the original initrd from backup in /boot/ (the backup is named *.backup0).</para></listitem>
-        <listitem><para>Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.</para></listitem>
-        <listitem><para>Check /etc/fstab for any partitions mounted by device name.  Change those entries (if any) to mount by LABEL or UUID (get that information with the "blkid" command)..</para></listitem>
-    </orderedlist>
-    <para>The next step is make sure the VM is not running in Hyper-V, then get the VHD into XenServer.  There are two options for doing this.</para>
-    <para>Option one:</para>
-    <orderedlist>
-    <listitem><para>Import the VHD using XenCenter.  In XenCenter, go to Tools&gt;Virtual Appliance Tools&gt;Disk Image Import.</para></listitem>        
-        <listitem><para>Choose the VHD, then click Next.</para></listitem>
-        <listitem><para>Name the VM, choose the NFS VHD SR under Storage, enable "Run Operating System Fixups" and choose the NFS ISO SR.</para></listitem>
-        <listitem><para>Click Next, then Finish.  A VM should be created.</para></listitem>
-    </orderedlist>
-    <para>Option two</para>
-    <orderedlist>
-        <listitem><para>Run XenConvert, under From choose VHD, under To choose XenServer. Click Next.</para></listitem>
-        <listitem><para>Choose the VHD, then click Next.</para></listitem>        
-        <listitem><para>Input the XenServer host info, then click Next.</para></listitem>
-        <listitem><para>Name the VM, then click Next, then Convert.  A VM should be created</para></listitem>
-    </orderedlist>
-    <para>Once you have a VM created from the Hyper-V VHD, prepare it using the following steps:</para>
-    <orderedlist>
-        <listitem><para>Boot the VM, uninstall Hyper-V Integration Services, and reboot.</para></listitem>
-        <listitem><para>Install XenServer Tools, then reboot.</para></listitem>        
-        <listitem><para>Prepare the VM as desired. For example, run sysprep on Windows VMs. See <xref linkend="create-windows-template"/></para></listitem>
-    </orderedlist>
-    <para>Either option above will create a VM in HVM mode.  This is fine for Windows VMs, but Linux VMs may not perform optimally.  Converting a Linux VM to PV mode will require additional steps and will vary by distribution.</para>
-    <orderedlist>
-        <listitem><para>Shut down the VM and copy the VHD from the NFS storage to a web server; for example, mount the NFS share on the web server and copy it, or from the XenServer host use sftp or scp to upload it to the web server.</para></listitem>
-        <listitem><para>In &PRODUCT;, create a new template using the following values:</para>
-        <itemizedlist>
-            <listitem><para>URL. Give the URL for the VHD</para></listitem>
-            <listitem><para>OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServer.</para></listitem>
-            <listitem><para>Hypervisor. XenServer</para></listitem>
-            <listitem><para>Format. VHD</para></listitem>
-        </itemizedlist></listitem>
-    </orderedlist>
-    <para>The template will be created, and you can create instances from it.</para>
+	<title>Converting a Hyper-V VM to a Template</title>
+	<para>To convert a Hyper-V VM to a XenServer-compatible &PRODUCT; template, you will need a standalone XenServer host with an attached NFS VHD SR.  Use whatever XenServer version you are using with &PRODUCT;, but use XenCenter 5.6 FP1 or SP2 (it is backwards compatible to 5.6).  Additionally, it may help to have an attached NFS ISO SR.</para>
+	<para>For Linux VMs, you may need to do some preparation in Hyper-V before trying to get the VM to work in XenServer.  Clone the VM and work on the clone if you still want to use the VM in Hyper-V.  Uninstall Hyper-V Integration Components and check for any references to device names in /etc/fstab:</para>
+	<orderedlist>
+		<listitem><para>From the linux_ic/drivers/dist directory, run make uninstall (where "linux_ic" is the path to the copied Hyper-V Integration Components files).</para></listitem>
+		<listitem><para>Restore the original initrd from backup in /boot/ (the backup is named *.backup0).</para></listitem>
+		<listitem><para>Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.</para></listitem>
+		<listitem><para>Check /etc/fstab for any partitions mounted by device name. Change those entries (if any) to
+				mount by LABEL or UUID. You can get that information with the blkid command.</para></listitem>
+	</orderedlist>
+	<para>The next step is make sure the VM is not running in Hyper-V, then get the VHD into XenServer.  There are two options for doing this.</para>
+	<para>Option one:</para>
+	<orderedlist>
+	<listitem><para>Import the VHD using XenCenter.  In XenCenter, go to Tools&gt;Virtual Appliance Tools&gt;Disk Image Import.</para></listitem>		
+		<listitem><para>Choose the VHD, then click Next.</para></listitem>
+		<listitem><para>Name the VM, choose the NFS VHD SR under Storage, enable "Run Operating System Fixups" and choose the NFS ISO SR.</para></listitem>
+		<listitem><para>Click Next, then Finish.  A VM should be created.</para></listitem>
+	</orderedlist>
+	<para>Option two:</para>
+	<orderedlist>
+		<listitem><para>Run XenConvert, under From choose VHD, under To choose XenServer. Click Next.</para></listitem>
+		<listitem><para>Choose the VHD, then click Next.</para></listitem>		
+		<listitem><para>Input the XenServer host info, then click Next.</para></listitem>
+		<listitem><para>Name the VM, then click Next, then Convert. A VM should be created.</para></listitem>
+	</orderedlist>
+	<para>Once you have a VM created from the Hyper-V VHD, prepare it using the following steps:</para>
+	<orderedlist>
+		<listitem><para>Boot the VM, uninstall Hyper-V Integration Services, and reboot.</para></listitem>
+		<listitem><para>Install XenServer Tools, then reboot.</para></listitem>		
+		<listitem><para>Prepare the VM as desired. For example, run sysprep on Windows VMs. See <xref linkend="create-windows-template"/>.</para></listitem>
+	</orderedlist>
+	<para>Either option above will create a VM in HVM mode.  This is fine for Windows VMs, but Linux VMs may not perform optimally.  Converting a Linux VM to PV mode will require additional steps and will vary by distribution.</para>
+	<orderedlist>
+		<listitem><para>Shut down the VM and copy the VHD from the NFS storage to a web server; for example, mount the NFS share on the web server and copy it, or from the XenServer host use sftp or scp to upload it to the web server.</para></listitem>
+		<listitem><para>In &PRODUCT;, create a new template using the following values:</para>
+		<itemizedlist>
+			<listitem><para>URL. Give the URL for the VHD</para></listitem>
+			<listitem><para>OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServer.</para></listitem>
+			<listitem><para>Hypervisor. XenServer</para></listitem>
+			<listitem><para>Format. VHD</para></listitem>
+		</itemizedlist></listitem>
+		
+	</orderedlist>
+	<para>The template will be created, and you can create instances from it.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a8bb9df/docs/en-US/create-template-from-existing-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-template-from-existing-vm.xml b/docs/en-US/create-template-from-existing-vm.xml
index c22b7ec..35788fd 100644
--- a/docs/en-US/create-template-from-existing-vm.xml
+++ b/docs/en-US/create-template-from-existing-vm.xml
@@ -5,45 +5,52 @@
 ]>
 
 <!-- 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.
--->
-
+	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="create-template-from-existing-vm">
-    <title>Creating a Template from an Existing Virtual Machine</title>
-    <para>Once you have at least one VM set up in the way you want, you can use it as the prototype for other VMs.</para>
-    <orderedlist>
-        <listitem><para>Create and start a virtual machine using any of the techniques given in <xref linkend="creating-vms"/>.</para></listitem>
-        <listitem><para>Make any desired configuration changes on the running VM, then click Stop.</para></listitem>
-        <listitem><para>Wait for the VM to stop. When the status shows Stopped, go to the next step.</para></listitem>
-        <listitem><para>Click Create Template and provide the following:</para>
-        <itemizedlist>
-            <listitem><para><emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so choose something descriptive.</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></listitem>
-                    <listitem><para>If you want to boot from this template in PV mode, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere:</para>
-                    <note><para>Note: Generally 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">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">Password Enabled</emphasis>. Choose Yes if your template has the &PRODUCT; password change script installed. See Adding Password Management to Your Templates.</para></listitem>
-            </itemizedlist></listitem>
-        <listitem><para>Click Add.</para></listitem>        
-    </orderedlist>
-    <para>The new template will be visible in the Templates section when the template creation process has been completed. The template is then available when creating a new VM</para>
+	<title>Creating a Template from an Existing Virtual Machine</title>
+	<para>Once you have at least one VM set up in the way you want, you can use it as the prototype for other VMs.</para>
+	<orderedlist>
+		<listitem><para>Create and start a virtual machine using any of the techniques given in <xref linkend="creating-vms"/>.</para></listitem>
+		<listitem><para>Make any desired configuration changes on the running VM, then click Stop.</para></listitem>
+		<listitem><para>Wait for the VM to stop. When the status shows Stopped, go to the next step.</para></listitem>
+		<listitem><para>Click Create Template and provide the following:</para>
+		<itemizedlist>
+			<listitem><para><emphasis role="bold">Name and Display Text</emphasis>. These will be shown in the UI, so
+						choose something descriptive.</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></listitem>
+					<listitem><para>If you want to boot from this template in PV mode, choose Other PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere:</para>
+					<note><para>Note: Generally 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">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">Password Enabled</emphasis>. Choose Yes if your template has the
+				&PRODUCT; password change script installed. See <xref linkend="add-password-management-to-templates"/>.</para></listitem>
+			</itemizedlist></listitem>
+		<listitem><para>Click Add.</para></listitem>		
+	</orderedlist>
+	<para>The new template will be visible in the Templates section when the template creation process
+		has been completed. The template is then available when creating a new VM.</para>
 </section>


Mime
View raw message