incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [45/51] [abbrv] Revert "Feature Documentation for s2svpn interVlan and Autoscale"
Date Fri, 14 Sep 2012 21:16:46 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/import-ami.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/import-ami.xml b/docs/en-US/import-ami.xml
index 16fe78a..2f093b1 100644
--- a/docs/en-US/import-ami.xml
+++ b/docs/en-US/import-ami.xml
@@ -5,51 +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="import-ami">
-	<title>Importing Amazon Machine Images</title>
-	<para>The following procedures describe how to import an Amazon Machine Image (AMI) into &PRODUCT; when using the XenServer hypervisor.</para>
-	<para>Assume you have an AMI file and this file is called CentOS_6.2_x64. Assume further that you are working on a CentOS host. If the AMI is a Fedora image, you need to be working on a Fedora host initially.</para>
-	<para>You need to have a XenServer host with a file-based storage repository (either a local ext3 SR or an NFS SR) to convert to a VHD once the image file has been customized on the Centos/Fedora host.</para>
-	<note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para>
-                </note>
-        <para></para>
-        <para>To import an AMI:</para>
-	<orderedlist>
-		<listitem><para>Set up loopback on image file:</para><programlisting># mkdir -p /mnt/loop/centos62
+    <title>Importing Amazon Machine Images</title>
+    <para>The following procedures describe how to import an Amazon Machine Image (AMI) into &PRODUCT; when using the XenServer hypervisor.</para>
+    <para>Assume you have an AMI file and this file is called CentOS_6.2_x64. Assume further that you are working on a CentOS host. If the AMI is a Fedora image, you need to be working on a Fedora host initially.</para>
+    <para>You need to have a XenServer host with a file-based storage repository (either a local ext3 SR or an NFS SR) to convert to a VHD once the image file has been customized on the Centos/Fedora host.</para>
+    <note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
+    <orderedlist>
+        <listitem><para>Set up loopback on image file:</para><programlisting># mkdir -p /mnt/loop/centos62
 # mount -o loop  CentOS_6.2_x64 /mnt/loop/centos54
 </programlisting></listitem>
-		<listitem><para>Install the kernel-xen package into the image. This downloads the PV kernel and ramdisk to the image.</para><programlisting># yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen</programlisting></listitem>
-		<listitem><para>Create a grub entry in /boot/grub/grub.conf.</para><programlisting># mkdir -p /mnt/loop/centos62/boot/grub
+        <listitem><para>Install the kernel-xen package into the image. This downloads the PV kernel and ramdisk to the image.</para><programlisting># yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen</programlisting></listitem>
+        <listitem><para>Create a grub entry in /boot/grub/grub.conf.</para><programlisting># mkdir -p /mnt/loop/centos62/boot/grub
 # touch /mnt/loop/centos62/boot/grub/grub.conf
-# echo "" > /mnt/loop/centos62/boot/grub/grub.conf
+# echo "" &gt; /mnt/loop/centos62/boot/grub/grub.conf
 </programlisting></listitem>
-		<listitem><para>Determine the name of the PV kernel that has been installed into the image.</para>
-			<programlisting># cd /mnt/loop/centos62
+        <listitem><para>Determine the name of the PV kernel that has been installed into the image.</para>
+            <programlisting># cd /mnt/loop/centos62
 # ls lib/modules/
 2.6.16.33-xenU  2.6.16-xenU  2.6.18-164.15.1.el5xen  2.6.18-164.6.1.el5.centos.plus  2.6.18-xenU-ec2-v1.0  2.6.21.7-2.fc8xen  2.6.31-302-ec2
 # ls boot/initrd*
 boot/initrd-2.6.18-164.6.1.el5.centos.plus.img boot/initrd-2.6.18-164.15.1.el5xen.img
 # ls boot/vmlinuz*
 boot/vmlinuz-2.6.18-164.15.1.el5xen  boot/vmlinuz-2.6.18-164.6.1.el5.centos.plus  boot/vmlinuz-2.6.18-xenU-ec2-v1.0  boot/vmlinuz-2.6.21-2952.fc8xen
-			</programlisting>
-			<para>Xen kernels/ramdisk always end with "xen". For the kernel version you choose, there has to be an entry for that version under lib/modules, there has to be an initrd and vmlinuz corresponding to that. Above, the only kernel that satisfies this condition is 2.6.18-164.15.1.el5xen.</para></listitem>
-		<listitem><para>Based on your findings, create an entry in the grub.conf file. Below is an example entry.</para><programlisting>default=0
+            </programlisting>
+            <para>Xen kernels/ramdisk always end with "xen". For the kernel version you choose, there has to be an entry for that version under lib/modules, there has to be an initrd and vmlinuz corresponding to that. Above, the only kernel that satisfies this condition is 2.6.18-164.15.1.el5xen.</para></listitem>
+        <listitem><para>Based on your findings, create an entry in the grub.conf file. Below is an example entry.</para><programlisting>default=0
 timeout=5
 hiddenmenu
 title CentOS (2.6.18-164.15.1.el5xen)
@@ -57,58 +55,58 @@ title CentOS (2.6.18-164.15.1.el5xen)
         kernel /boot/vmlinuz-2.6.18-164.15.1.el5xen ro root=/dev/xvda 
         initrd /boot/initrd-2.6.18-164.15.1.el5xen.img
 </programlisting></listitem>
-		<listitem><para>Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to “xvdb”.</para>
-		<programlisting># cat etc/fstab
+        <listitem><para>Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to “xvdb”.</para>
+        <programlisting># cat etc/fstab
 /dev/xvda  /         ext3    defaults        1 1
 /dev/xvdb  /mnt      ext3    defaults        0 0
 none       /dev/pts  devpts  gid=5,mode=620  0 0
 none       /proc     proc    defaults        0 0
 none       /sys      sysfs   defaults        0 0
 </programlisting></listitem>
-		<listitem><para>Enable login via the console. The default console device in a XenServer system is xvc0.  Ensure that etc/inittab and etc/securetty have the following lines respectively:</para>
-		<programlisting># grep xvc0 etc/inittab 
+        <listitem><para>Enable login via the console. The default console device in a XenServer system is xvc0.  Ensure that etc/inittab and etc/securetty have the following lines respectively:</para>
+        <programlisting># grep xvc0 etc/inittab 
 co:2345:respawn:/sbin/agetty xvc0 9600 vt100-nav
 # grep xvc0 etc/securetty 
 xvc0
 </programlisting></listitem>
-		<listitem><para>Ensure the ramdisk supports PV disk and PV network. Customize this for the kernel version you have determined above.</para>
-		<programlisting># chroot /mnt/loop/centos54
+        <listitem><para>Ensure the ramdisk supports PV disk and PV network. Customize this for the kernel version you have determined above.</para>
+        <programlisting># chroot /mnt/loop/centos54
 # cd /boot/
 # mv initrd-2.6.18-164.15.1.el5xen.img initrd-2.6.18-164.15.1.el5xen.img.bak
 # mkinitrd -f /boot/initrd-2.6.18-164.15.1.el5xen.img --with=xennet --preload=xenblk --omit-scsi-modules 2.6.18-164.15.1.el5xen
 </programlisting></listitem>
-		<listitem><para>Change the password.</para>
-			<programlisting># passwd
+        <listitem><para>Change the password.</para>
+            <programlisting># passwd
 Changing password for user root.
 New UNIX password: 
 Retype new UNIX password: 
 passwd: all authentication tokens updated successfully.
 </programlisting></listitem>
-		<listitem><para>Exit out of chroot.</para><programlisting># exit</programlisting></listitem>
-		<listitem><para>Check etc/ssh/sshd_config for lines allowing ssh login using a password.</para>
-		<programlisting># egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
+        <listitem><para>Exit out of chroot.</para><programlisting># exit</programlisting></listitem>
+        <listitem><para>Check etc/ssh/sshd_config for lines allowing ssh login using a password.</para>
+        <programlisting># egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
 PermitRootLogin yes
 PasswordAuthentication yes
 </programlisting></listitem>
-		<listitem><para>If you need the template to be enabled to reset passwords from the &PRODUCT; UI or API,
+        <listitem><para>If you need the template to be enabled to reset passwords from the &PRODUCT; UI or API,
                                 install the password change script into the image at this point. See
-		        <xref linkend="add-password-management-to-templates"/>.</para></listitem>
-		<listitem><para>Unmount and delete loopback mount.</para><programlisting># umount /mnt/loop/centos54
+                <xref linkend="add-password-management-to-templates"/>.</para></listitem>
+        <listitem><para>Unmount and delete loopback mount.</para><programlisting># umount /mnt/loop/centos54
 # losetup -d /dev/loop0
 </programlisting></listitem>
-		<listitem><para>Copy the image file to your XenServer host's file-based storage repository. In the example below, the Xenserver is "xenhost". This XenServer has an NFS repository whose uuid is a9c5b8c8-536b-a193-a6dc-51af3e5ff799.</para>
-		<programlisting># scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/</programlisting></listitem>
-		<listitem><para>Log in to the Xenserver and create a VDI the same size as the image.</para>
-		<programlisting>[root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
+        <listitem><para>Copy the image file to your XenServer host's file-based storage repository. In the example below, the Xenserver is "xenhost". This XenServer has an NFS repository whose uuid is a9c5b8c8-536b-a193-a6dc-51af3e5ff799.</para>
+        <programlisting># scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/</programlisting></listitem>
+        <listitem><para>Log in to the Xenserver and create a VDI the same size as the image.</para>
+        <programlisting>[root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]#  ls -lh CentOS_6.2_x64
 -rw-r--r-- 1 root root 10G Mar 16 16:49 CentOS_6.2_x64
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-create virtual-size=10GiB sr-uuid=a9c5b8c8-536b-a193-a6dc-51af3e5ff799 type=user name-label="Centos 6.2 x86_64"
 cad7317c-258b-4ef7-b207-cdf0283a7923
 </programlisting></listitem>
-		<listitem><para>Import the image file into the VDI. This may take 10–20 minutes.</para><programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923</programlisting></listitem>
-		<listitem><para>Locate a the VHD file.  This is the file with the VDI’s UUID as its name. Compress it and upload it to your web server.</para>
-		<programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
+        <listitem><para>Import the image file into the VDI. This may take 10–20 minutes.</para><programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923</programlisting></listitem>
+        <listitem><para>Locate a the VHD file.  This is the file with the VDI’s UUID as its name. Compress it and upload it to your web server.</para>
+        <programlisting>[root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
 [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# scp CentOS_6.2_x64.vhd.bz2 webserver:/var/www/html/templates/
 </programlisting></listitem>
-	</orderedlist>
+    </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/initialize-and-test.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/initialize-and-test.xml b/docs/en-US/initialize-and-test.xml
index 2dd6e25..cf0c04e 100644
--- a/docs/en-US/initialize-and-test.xml
+++ b/docs/en-US/initialize-and-test.xml
@@ -1,77 +1,53 @@
 <?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" [
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+ 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="initialize-and-test">
-	<title>Initialize and Test</title>
+    <title>Initialize and Test</title>
     <para>After everything is configured, &PRODUCT; will perform its initialization. This can take 30 minutes or more, depending on the speed of your network. When the initialization has completed successfully, the administrator's Dashboard should be displayed in the &PRODUCT; UI.</para>
-   
     <orderedlist>
-   	
-        <listitem><para>Verify that the system is ready. In the left navigation bar, select Templates. Click on the CentOS 5.5 (64bit) no Gui (KVM) template. Check to be sure that the status is "Download Complete." Do not proceed to the next step until this status is displayed.</para></listitem>
-        	
-        <listitem><para>Go to the Instances tab, and filter by My Instances.</para></listitem>
-        	
-        <listitem><para>Click Add Instance and follow the steps in the wizard.</para>
-        	
-            <orderedlist numeration="loweralpha">
-        	
-               <listitem><para>Choose the zone you just added.</para></listitem>
-        	
-                <listitem><para>In the template selection, choose the template to use in the VM. If this is a fresh installation, likely only the provided CentOS template is available.</para></listitem>
-        	
-                <listitem><para>Select a service offering.  Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
-        
-                <listitem><para>In data disk offering, if desired, add another data disk. This is a second volume that will be available to but not mounted in the guest.  For example, in Linux on XenServer you will see /dev/xvdb in the guest after rebooting the VM. A reboot is not required if you have a PV-enabled OS kernel in use.</para></listitem>
-        	
-                <listitem><para>In default network, choose the primary network for the guest.  In a trial installation, you would have only one option here.</para></listitem>
-                        <listitem><para>Optionally give your VM a name and a group.  Use any descriptive text you would like.</para></listitem>
-        	
-               <listitem><para>Click Launch VM. Your VM will be created and started. It might take some time to download the template and complete the VM startup. You can watch the VM’s progress in the Instances screen.</para></listitem>
-        
-            </orderedlist>
-        
-        </listitem>
-        	
-        <listitem>
-        	
-            <para>To use the VM, click the View Console button.
-        	
-                <inlinemediaobject>
-        
-                    <imageobject><imagedata fileref="./images/console-icon.png" /></imageobject>
-        
-                    <textobject><phrase>ConsoleButton.png: button to launch a console</phrase></textobject>
-        	
-                </inlinemediaobject>
-        	
-            </para>
-        
-            <para>For more information about using VMs, including instructions for how to allow incoming network traffic to the VM, start, stop, and delete VMs, and move a VM from one host to another, see Working With Virtual Machines in the Administrator’s Guide.</para>
-                </listitem>
-        	
+	<listitem><para>Verify that the system is ready. In the left navigation bar, select Templates. Click on the CentOS 5.5 (64bit) no Gui (KVM) template. Check to be sure that the status is "Download Complete." Do not proceed to the next step until this status is displayed.</para></listitem>
+	<listitem><para>Go to the Instances tab, and filter by My Instances.</para></listitem>
+	<listitem><para>Click Add Instance and follow the steps in the wizard.</para>
+	    <orderedlist numeration="loweralpha">
+		<listitem><para>Choose the zone you just added.</para></listitem>
+		<listitem><para>In the template selection, choose the template to use in the VM. If this is a fresh installation, likely only the provided CentOS template is available.</para></listitem>
+		<listitem><para>Select a service offering.  Be sure that the hardware you have allows starting the selected service offering.</para></listitem>
+		<listitem><para>In data disk offering, if desired, add another data disk. This is a second volume that will be available to but not mounted in the guest.  For example, in Linux on XenServer you will see /dev/xvdb in the guest after rebooting the VM. A reboot is not required if you have a PV-enabled OS kernel in use.</para></listitem>
+		<listitem><para>In default network, choose the primary network for the guest.  In a trial installation, you would have only one option here.</para></listitem>
+		<listitem><para>Optionally give your VM a name and a group.  Use any descriptive text you would like.</para></listitem>
+		<listitem><para>Click Launch VM. Your VM will be created and started. It might take some time to download the template and complete the VM startup. You can watch the VM’s progress in the Instances screen.</para></listitem>
+	    </orderedlist>
+	</listitem>
+	<listitem>
+	    <para>To use the VM, click the View Console button.
+		<inlinemediaobject>
+		    <imageobject><imagedata fileref="./images/console-icon.png" /></imageobject>
+		    <textobject><phrase>ConsoleButton.png: button to launch a console</phrase></textobject>
+		</inlinemediaobject>
+	    </para>
+	</listitem>
     </orderedlist>
-   
     <para>Congratulations! You have successfully completed a &PRODUCT; Installation.</para>
-   	
     <para>If you decide to grow your deployment, you can add more hosts, primary storage, zones, pods, and clusters.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/ip-forwarding-firewalling.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ip-forwarding-firewalling.xml b/docs/en-US/ip-forwarding-firewalling.xml
index c154b07..61aa6ad 100644
--- a/docs/en-US/ip-forwarding-firewalling.xml
+++ b/docs/en-US/ip-forwarding-firewalling.xml
@@ -5,26 +5,26 @@
 ]>
 
 <!-- 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="ip-forwarding-firewalling">
     <title>IP Forwarding and Firewalling</title>
     <para>By default, all incoming traffic to the public IP address is rejected. All outgoing traffic from the guests is translated via NAT to the public IP address and is allowed.</para>
     <para>To allow incoming traffic, users may set up firewall rules and/or port forwarding rules. For example, you can use a firewall rule to open a range of ports on the public IP address, such as 33 through 44. Then use port forwarding rules to direct traffic from individual ports within that range to specific ports on user VMs. For example, one port forwarding rule could route incoming traffic on the public IP's port 33 to port 100 on one user VM's private IP.</para>
-    <xi:include href="firewall-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="port-forwarding.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <para>For the steps to implement these rules, see Firewall Rules and Port Forwarding.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/isolated-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/isolated-networks.xml b/docs/en-US/isolated-networks.xml
index 671591d..13f8aa1 100644
--- a/docs/en-US/isolated-networks.xml
+++ b/docs/en-US/isolated-networks.xml
@@ -5,22 +5,23 @@
 ]>
 
 <!-- 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="isolated-networks">
     <title>Isolated Networks</title>
     <para>An isolated network can be accessed only by virtual machines of a single account. Isolated networks have the following properties.</para>
@@ -29,6 +30,4 @@
         <listitem><para>There is one network offering for the entire network</para></listitem>
         <listitem><para>The network offering can be upgraded or downgraded but it is for the entire network</para></listitem>
         </itemizedlist>
-    
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/linux-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/linux-installation.xml b/docs/en-US/linux-installation.xml
index b560ee0..60d389c 100644
--- a/docs/en-US/linux-installation.xml
+++ b/docs/en-US/linux-installation.xml
@@ -5,49 +5,43 @@
 ]>
 
 <!-- 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="linux-installation">
-	<title>Linux OS Installation</title>
-	<para>Use the following steps to begin the Linux OS installation:</para>
-	<orderedlist>
-		<listitem><para>Download the script file cloud-set-guest-password:</para>
-		<itemizedlist>
-			<listitem><para>Linux: <ulink url="
-				http://cloudstack.org/dl/cloud-set-guest-password
-				"></ulink>				
-			</para></listitem>
-			<listitem><para>Windows: <ulink url="
-				http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download
-				"></ulink>		
-			</para></listitem>
-		</itemizedlist>
-		</listitem>
-		<listitem><para>Copy this file to /etc/init.d.</para><para>On some Linux distributions, copy the file to /etc/rc.d/init.d.</para>
-			</listitem>
-		<listitem><para>Run the following command to make the script executable:</para><programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting>
-			</listitem>
-		<listitem><para>Depending on the Linux distribution, continue with the appropriate step.</para><para>On Fedora, CentOS/RHEL, and Debian, run:</para><programlisting>chkconfig --add cloud-set-guest-password</programlisting>
-			<para condition="community">On Ubuntu with VMware tools, link the script file to the /etc/network/if-up and
-				/etc/network/if-down folders, and run the script:</para>
-			<programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
-#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-down/cloud-set-guest-password</programlisting>
-			<para condition="community">If you are using Ubuntu 11.04, start by creating a directory called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults 98”. To test, run "mkpasswd" and check that it is generating a new password. If the “mkpasswd” command does not exist, run "sudo apt-get install whois"  (or sudo apt-get install mkpasswd, depending on your Ubuntu version) and repeat.</para>
-			</listitem>
-	</orderedlist>
-	
-	</section>
+    <title>Linux OS Installation</title>
+    <para>Use the following steps to begin the Linux OS installation:</para>
+    <orderedlist>
+        <listitem><para>Download the script file cloud-set-guest-password:</para>
+        <itemizedlist>
+            <listitem><para>Linux: <ulink url="http://cloudstack.org/dl/cloud-set-guest-password"></ulink></para></listitem>
+            <listitem><para>Windows: <ulink url="http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download"></ulink></para></listitem>
+        </itemizedlist>
+        </listitem>
+        <listitem><para>Copy this file to /etc/init.d.</para>
+        <para>On some Linux distributions, copy the file to /etc/rc.d/init.d.</para>
+            </listitem>
+        <listitem><para>Run the following command to make the script executable:</para><programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting>
+            </listitem>
+        <listitem><para>Depending on the Linux distribution, continue with the appropriate step.</para><para>On Fedora, CentOS/RHEL, and Debian, run:</para><programlisting>chkconfig --add cloud-set-guest-password</programlisting>
+            <para condition="community">On Ubuntu with VMware tools, link the script file to the /etc/network/if-up and /etc/network/if-down folders, and run the script:</para>
+            <programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
+            #ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-down/cloud-set-guest-password</programlisting>
+            <para condition="community">If you are using Ubuntu 11.04, start by creating a directory called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults 98”. To test, run "mkpasswd" and check that it is generating a new password. If the “mkpasswd” command does not exist, run "sudo apt-get install whois"  (or sudo apt-get install mkpasswd, depending on your Ubuntu version) and repeat.</para>
+            </listitem>
+    </orderedlist>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/load-balancer-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/load-balancer-rules.xml b/docs/en-US/load-balancer-rules.xml
index 1ce5cd0..8dd7d3b 100644
--- a/docs/en-US/load-balancer-rules.xml
+++ b/docs/en-US/load-balancer-rules.xml
@@ -5,28 +5,25 @@
 ]>
 
 <!-- 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="load-balancer-rules">
     <title>Load Balancer Rules</title>
     <para>A &PRODUCT; user or administrator may create load balancing rules that balance traffic received at a public IP to one or more VMs. A user creates a rule, specifies an algorithm, and assigns the rule to a set of VMs.</para>
-    <note><para>If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.</para>
-    </note>
-    <para></para>
-    <xi:include href="add-load-balancer-rule.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="sticky-session-policies-for-lb-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <note><para>If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.</para></note>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/log-in-root-admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/log-in-root-admin.xml b/docs/en-US/log-in-root-admin.xml
index b8f8204..c0a340a 100644
--- a/docs/en-US/log-in-root-admin.xml
+++ b/docs/en-US/log-in-root-admin.xml
@@ -5,22 +5,23 @@
 ]>
 
 <!-- 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="log-in-root-admin">
     <title>Logging In as the Root Administrator</title>
     <para>After the Management Server software is installed and running, you can run the &PRODUCT; user interface. This UI is there to help you provision, view, and manage your cloud infrastructure.</para>
@@ -34,7 +35,7 @@
                 <listitem><para><emphasis role="bold">Continue with basic setup.</emphasis> Choose this if you're just trying &PRODUCT;, and you want a guided walkthrough of the simplest possible configuration so that you can get started right away. We'll help you set up a cloud with the following features: a single machine that runs &PRODUCT; software and uses NFS to provide storage; a single machine running VMs under the XenServer or KVM hypervisor; and a shared public network.</para>
                     <para>The prompts in this guided tour should give you all the information you need, but if you want just a bit more detail, you can follow along in the Trial Installation Guide.</para>
                 </listitem>
-                <listitem><para><emphasis role="bold">I have used &PRODUCT; before.</emphasis> Choose this if you have already gone through a design phase and planned a more sophisticated deployment, or you are ready to start scaling up a trial cloud that you set up earlier with the basic setup screens. In the Administrator UI, you can start using the more powerful features of &PRODUCT;, such as advanced VLAN networking, high availability, additional network elements such as load balancers and firewalls, and support for multiple hypervisors including Citrix XenServer, KVM, and VMware vSphere.</para> 
+                <listitem><para><emphasis role="bold">I have used &PRODUCT; before.</emphasis> Choose this if you have already gone through a design phase and planned a more sophisticated deployment, or you are ready to start scaling up a trial cloud that you set up earlier with the basic setup screens. In the Administrator UI, you can start using the more powerful features of CloudPlatform, such as advanced VLAN networking, high availability, additional network elements such as load balancers and firewalls, and support for multiple hypervisors including Citrix XenServer, KVM, and VMware vSphere.</para> 
                     <para>The root administrator Dashboard appears.</para>
                 </listitem>
             </itemizedlist>
@@ -42,5 +43,4 @@
         <listitem><para>You should set a new root administrator password. If you chose basic setup, you’ll be prompted to create a new password right away. If you chose experienced user, use the steps in <xref linkend="changing-root-password" />.</para></listitem>
     </orderedlist>
     <warning><para>You are logging in as the root administrator. This 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. Please change the default password to a new, unique password.</para></warning>
-    <para></para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/log-in.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/log-in.xml b/docs/en-US/log-in.xml
index 84328ce..e72d27b 100644
--- a/docs/en-US/log-in.xml
+++ b/docs/en-US/log-in.xml
@@ -5,26 +5,27 @@
 ]>
 
 <!-- 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="log-in">
-	<title>Log In to the UI</title>
-	<para>&PRODUCT; provides a web-based UI that can be used by both administrators and end users. The appropriate version of the UI is displayed depending on the credentials used to log in. The UI is available in popular browsers including IE7, IE8, IE9, Firefox 3.5+, Firefox 4, Safari 4, and Safari 5. The URL is: (substitute your own management server IP address)</para>
-	<programlisting>http://&lt;management-server-ip-address&gt;:8080/client</programlisting>
+    <title>Log In to the UI</title>
+    <para>&PRODUCT; provides a web-based UI that can be used by both administrators and end users. The appropriate version of the UI is displayed depending on the credentials used to log in. The UI is available in popular browsers including IE7, IE8, IE9, Firefox 3.5+, Firefox 4, Safari 4, and Safari 5. The URL is: (substitute your own management server IP address)</para>
+    <programlisting>http://&lt;management-server-ip-address&gt;:8080/client</programlisting>
     <para>On a fresh Management Server installation, a guided tour splash screen appears. On later visits, you’ll see a login screen where you specify the following to proceed to your Dashboard:</para>
     <formalpara>
         <title>Username</title>
@@ -41,8 +42,7 @@
     <para>If you are a user in the sub-domains, enter the full path to the domain, excluding the root domain.</para>
     <para>For example, suppose multiple levels are created under the root domain, such as Comp1/hr. The users in the Comp1 domain should enter Comp1 in the Domain field, whereas the users in the Comp1/sales domain should enter Comp1/sales.</para>    
     <para>For more guidance about the choices that appear when you log in to this UI, see Logging In as the Root Administrator.</para>
-	<xi:include href="end-user-ui-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="root-admin-ui-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="log-in-root-admin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="changing-root-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="end-user-ui-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="root-admin-ui-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="log-in-root-admin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/maintain-hypervisors-on-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/maintain-hypervisors-on-hosts.xml b/docs/en-US/maintain-hypervisors-on-hosts.xml
index 43f3f79..213f078 100644
--- a/docs/en-US/maintain-hypervisors-on-hosts.xml
+++ b/docs/en-US/maintain-hypervisors-on-hosts.xml
@@ -5,25 +5,26 @@
 ]>
 
 <!-- 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="maintain-hypervisors-on-hosts">
     <title>Maintaining Hypervisors on Hosts</title>
     <para>When running hypervisor software on hosts, be sure all the hotfixes provided by the hypervisor vendor are applied. Track the release of hypervisor patches through your hypervisor vendor’s support channel, and apply patches as soon as possible after they are released. &PRODUCT; will not track or notify you of required hypervisor patches. It is essential that your hosts are completely up to date with the provided hypervisor patches. The hypervisor vendor is likely to refuse to support any system that is not up to date with patches.</para>
     <note><para>The lack of up-do-date hotfixes can lead to data corruption and lost VMs.</para></note>
-    <para>(XenServer) For more information, see <ulink url="http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2">Highly Recommended Hotfixes for XenServer in the &PRODUCT; Knowledge Base</ulink>.</para>    
+    <para>(XenServer) For more information, see <ulink url="http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2">Highly Recommended Hotfixes for XenServer in the &PRODUCT; Knowledge Base</ulink></para>    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/manage-cloud.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manage-cloud.xml b/docs/en-US/manage-cloud.xml
index 06d4e3f..c4c4d6b 100644
--- a/docs/en-US/manage-cloud.xml
+++ b/docs/en-US/manage-cloud.xml
@@ -5,28 +5,27 @@
 ]>
 
 <!-- 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="manage-cloud">
+
+<section id="manage-cloud">
     <title>Managing the Cloud</title>
-    <xi:include href="tagging-resources.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="global-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="change-database-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="admin-alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="customizing-dns.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="stop-restart-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
+    <para><xref linkend="change-database-config" />vCenter Maintenance Mode</para>
+    <para><xref linkend="admin-alerts" />XenServer and Maintenance Mode</para>
+    <para><xref linkend="customizing-dns" />vCenter Maintenance Mode</para>
+    <para><xref linkend="stop-start-management-server" />XenServer and Maintenance Mode</para>
+   </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manual-live-migration.xml b/docs/en-US/manual-live-migration.xml
index 677cfc4..390b417 100644
--- a/docs/en-US/manual-live-migration.xml
+++ b/docs/en-US/manual-live-migration.xml
@@ -5,47 +5,48 @@
 ]>
 
 <!-- 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="manual-live-migration">
-	<title>Moving VMs Between Hosts (Manual Live Migration)</title>
-		<para>The &PRODUCT; administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
-		<itemizedlist>
-			<listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
-			<listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>
-			<listitem><para>The destination host must be in the same cluster as the original host.</para></listitem>
-			<listitem><para>The VM must not be using local disk storage.</para></listitem>	
-			<listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
-			<listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem>				
-		</itemizedlist>
-		<para>To manually live migrate a virtual machine</para>
-		<orderedlist>
-			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-			<listitem><para>In the left navigation, click Instances.</para></listitem>
-			<listitem><para>Choose the VM that you want to migrate.</para></listitem>
-			<listitem><para>Click the Migrate Instance button.<inlinemediaobject>
-				<imageobject>
-					<imagedata fileref="./images/migrate-instance.png" />
-				</imageobject>
-				<textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
-			</inlinemediaobject>
-				</para></listitem>
-			<listitem><para>From the list of hosts, choose the one to which you want to move the VM.</para></listitem>
-			<listitem><para>Click OK.</para></listitem>
-		</orderedlist>
-	</section>
+    <title>Moving VMs Between Hosts (Manual Live Migration)</title>
+        <para>The CloudPlatform administrator can move a running VM from one host to another without interrupting service to users or going into maintenance mode. This is called manual live migration, and can be done under the following conditions:</para>
+        <itemizedlist>
+            <listitem><para>The root administrator is logged in. Domain admins and users can not perform manual live migration of VMs.</para></listitem>
+            <listitem><para>The VM is running. Stopped VMs can not be live migrated.</para></listitem>
+            <listitem><para>The destination host must be in the same cluster as the original host.</para></listitem>
+            <listitem><para>The VM must not be using local disk storage.</para></listitem>    
+            <listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
+            <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem>                
+        </itemizedlist>
+        <para>To manually live migrate a virtual machine</para>
+        <orderedlist>
+            <listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+            <listitem><para>In the left navigation, click Instances.</para></listitem>
+            <listitem><para>Choose the VM that you want to migrate.</para></listitem>
+            <listitem><para>Click the Migrate Instance button <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/migrate-instance.png" />
+                </imageobject>
+                <textobject><phrase>Migrateinstance.png: button to migrate an instance</phrase></textobject>
+            </inlinemediaobject>
+                </para></listitem>
+            <listitem><para>From the list of hosts, choose the one to which you want to move the VM.</para></listitem>
+            <listitem><para>Click OK.</para></listitem>
+        </orderedlist>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml b/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
index d615cfe..67fe2f5 100644
--- a/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
+++ b/docs/en-US/migrate-vm-rootvolume-volume-new-storage-pool.xml
@@ -5,33 +5,33 @@
 ]>
 
 <!-- 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="migrate-vm-rootvolume-volume-new-storage-pool">
-	<title>Migrating a VM Root Volume to a New Storage Pool</title>
-	<para>When migrating the root disk volume, the VM must first be stopped, and users can not access the VM. After migration is complete, the VM can be restarted.</para>
-			<orderedlist>
-				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
-				<listitem><para>Detach the data disk from the VM. See Detaching and Moving Volumes <xref linkend="detach-move-volumes"/>  (but skip the “reattach” step at the end. You will do that after migrating to new storage).</para></listitem>
-				<listitem><para>Stop the VM.</para></listitem>
-				<listitem><para>Use the &PRODUCT; API command, migrateVirtualMachine, with the ID of the VM to migrate and
-				the IDs of a destination host and destination storage pool in the same zone.</para></listitem>
-				<listitem><para>Watch for the VM status to change to Migrating, then back to Stopped.</para></listitem>
-				<listitem><para>Restart the VM.</para></listitem>
-			</orderedlist>
-	</section>
+    <title>Migrating a VM Root Volume to a New Storage Pool</title>
+    <para>When migrating the root disk volume, the VM must first be stopped, and users can not access the VM. After migration is complete, the VM can be restarted.</para>
+            <orderedlist>
+                <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+                <listitem><para>Detach the data disk from the VM. See Detaching and Moving Volumes <xref linkend="detach-move-volumes"/>  (but skip the “reattach” step at the end. You will do that after migrating to new storage).</para></listitem>
+                <listitem><para>Stop the VM.</para></listitem>
+                <listitem><para>Call the &PRODUCT; API command migrateVirtualMachine with the ID of the VM to migrate and the IDs of a destination host and destination storage pool in the same zone.</para></listitem>
+                <listitem><para>Watch for the VM status to change to Migrating, then back to Stopped.</para></listitem>
+                <listitem><para>Restart the VM.</para></listitem>
+            </orderedlist>
+    </section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
index 1bbe1e2..0043a26 100644
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@ -1,79 +1,90 @@
 <?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" [
+<!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.
 -->
-<section id="minimum-system-requirements">
-		<title>Minimum System Requirements</title>
-		<section id="management-server-system-requirements">
-			<title>Management Server, Database, and Storage System Requirements</title>
-		<para>
-			The machines that will run the Management Server and MySQL database must meet the following requirements. 
-			The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. 
-			The Management Server may be placed on a virtual machine.
-		</para>
-		<itemizedlist>
-			<listitem><para>Operating system:</para>
-				<itemizedlist>
-					<listitem><para>Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/).</para></listitem>
-					<listitem><para>Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
-					<listitem><para>It is highly recommended that you purchase a RHEL support license.
-						Citrix support can not be responsible for helping fix issues with the underlying OS.</para></listitem>
-				</itemizedlist>
-			</listitem>
-			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
-			<listitem><para>4 GB of memory</para></listitem>
-			<listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
-			<listitem><para>At least 1 NIC</para></listitem>
-			<listitem><para>Statically allocated IP address</para></listitem>
-			<listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
-		</itemizedlist>
-		</section>
-		<section id="hypervisor-system-requirements">
-		<title>Host/Hypervisor System Requirements</title>
-		<para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
-		<itemizedlist>
-			<listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
-			<listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
-			<listitem><para>Hardware virtualization support required</para></listitem>
-			<listitem><para>4 GB of memory</para></listitem>
-			<listitem><para>36 GB of local disk</para></listitem>
-			<listitem><para>At least 1 NIC</para></listitem>
-			<listitem><para>Statically allocated IP Address</para></listitem>
-			<listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
-			<listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
-		</itemizedlist>
-		<para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
-		<itemizedlist>
-			<listitem><para>Citrix XenServer Installation</para></listitem>
-			<listitem><para>VMware vSphere Installation and Configuration</para></listitem>
-			<listitem><para>KVM Installation and Configuration</para></listitem>
-			<listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
-		</itemizedlist>
-		<warning>
-			<para>
-				Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.
-			</para>
-		</warning>
-		</section>
-	<xi:include href="compatibility-matrix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	</section>
 
+<section id="minimum-system-requirements">
+    <title>Minimum System Requirements</title>
+    <section id="management-server-system-requirements">
+        <title>Management Server, Database, and Storage System Requirements</title>
+        <para>The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.</para>
+        <itemizedlist>
+            <listitem><para>Operating system:</para>
+                <itemizedlist>
+                    <listitem><para>Preferred: CentOS/RHEL 6.2+ or Ubuntu 12.04(.1)</para></listitem>
+                    <listitem><para>Also supported: CentOS/RHEL 5.5 or Ubuntu 10.04</para></listitem>
+                </itemizedlist>
+            </listitem>
+            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+            <listitem><para>4 GB of memory</para></listitem>
+            <listitem><para>50 GB of local disk (When running secondary storage on the management server 500GB is recommended)</para></listitem>
+            <listitem><para>At least 1 NIC</para></listitem>
+            <listitem><para>Statically allocated IP address</para></listitem>
+            <listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
+        </itemizedlist>
+    </section>
+    <section id="hypervisor-system-requirements">
+        <title>Host/Hypervisor System Requirements</title>
+        <para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
+        <itemizedlist>
+            <listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem> 
+            <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+            <listitem><para>Hardware virtualization support required</para></listitem>
+            <listitem><para>4 GB of memory</para></listitem>
+            <listitem><para>36 GB of local disk</para></listitem>
+            <listitem><para>At least 1 NIC</para></listitem>
+            <listitem><para>Statically allocated IP Address</para></listitem>
+            <listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
+            <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
+        </itemizedlist>
+        <para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
+        <warning>
+            <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.</para>
+        </warning>
+        <section id="hypervisor-requirements-xenserver">
+            <title>Citrix XenServer requirements</title>
+            <para>To be determined</para>
+        </section>
+        <section id="hypervisor-requirements-vmware">
+            <title>VMware vSphere requirements</title>
+            <para>To be determined</para>
+        </section>
+        <section id="hypervisor-requirements-kvm">
+            <title>KVM requirements</title>
+            <para>For running a KVM hypervisor the main requirement is the Linux distribution it is running. Although you are not required to run these distributions, it is recommended.</para>
+            <para>Recommended distributions:</para>
+            <itemizedlist>
+            <listitem><para>CentOS / RHEL: 6.2 and 6.3</para></listitem>
+                <listitem><para>Ubuntu: 12.04(.1)</para></listitem>
+            </itemizedlist>
+            <para>The main requirement for KVM hypervisors is the libvirt and Qemu version. If you whish to run on a different distribution, make sure you meet the following requirements:</para>
+            <itemizedlist>
+                <listitem><para>libvirt: 0.9.4 or higher</para></listitem>
+                <listitem><para>Qemu/KVM: 1.0 or higher</para></listitem>
+            </itemizedlist>
+        </section>
+        <section id="hypervisor-requirements-ovm">
+            <title>Oracle VM (OVM) requirements</title>
+            <para>To be determined</para>
+        </section>
+    </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/network-offerings.xml b/docs/en-US/network-offerings.xml
index 0713be8..ccfb93c 100644
--- a/docs/en-US/network-offerings.xml
+++ b/docs/en-US/network-offerings.xml
@@ -5,26 +5,26 @@
 ]>
 
 <!-- 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="network-offerings">
     <title>Network Offerings</title>
-    <note><para>For the most up-to-date list of supported network services, see the &PRODUCT; UI or call listNetworkServices.</para></note>
-    <para></para>
+    <note><para>For the most up-to-date list of supported network services, see the CloudPlatform UI or call listNetworkServices.</para></note>
     <para>A network offering is a named set of network services, such as:</para>
     <itemizedlist>
         <listitem><para>DHCP</para></listitem>
@@ -39,11 +39,9 @@
         <listitem><para>(Optional) Network tag to specify which physical network to use</para></listitem>
     </itemizedlist>
     <para>When creating a new VM, the user chooses one of the available network offerings, and that determines which network services the VM can use.</para>
-    <para>The &PRODUCT; administrator can create any number of custom network offerings, in addition to the default network offerings provided by &PRODUCT;. By creating multiple custom network offerings, you can set up your cloud to offer different classes of service on a single multi-tenant physical network.  For example, while the underlying physical wiring may be the same for two tenants, tenant A may only need simple firewall protection for their website, while tenant B may be running a web server farm and require a scalable firewall solution, load balancing solution, and alternate networks for accessing the database backend.</para>
-    <note><para>If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.</para></note>
-    <para></para>
-    <para>When creating a new virtual network, the &PRODUCT; administrator chooses which network offering to enable for that network. Each virtual network is associated with one network offering. A virtual network can be upgraded or downgraded by changing its associated network offering.  If you do this, be sure to reprogram the physical network to match.</para>
-    <para>&PRODUCT; also has internal network offerings for use by &PRODUCT; system VMs. These network offerings are not visible to users but can be modified by administrators.</para>
-    <xi:include href="creating-network-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="create-vr-network-offering.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <para>The CloudPlatform administrator can create any number of custom network offerings, in addition to the default network offerings provided by CloudPlatform. By creating multiple custom network offerings, you can set up your cloud to offer different classes of service on a single multi-tenant physical network.  For example, while the underlying physical wiring may be the same for two tenants, tenant A may only need simple firewall protection for their website, while tenant B may be running a web server farm and require a scalable firewall solution, load balancing solution, and alternate networks for accessing the database backend.</para>
+    <note><para>If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the CloudPlatform virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.</para></note>
+    <para>When creating a new virtual network, the CloudPlatform administrator chooses which network offering to enable for that network. Each virtual network is associated with one network offering. A virtual network can be upgraded or downgraded by changing its associated network offering.  If you do this, be sure to reprogram the physical network to match.</para>
+    <para>CloudPlatform also has internal network offerings for use by CloudPlatform system VMs. These network offerings are not visible to users but can be modified by administrators.</para>
+    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6089c33f/docs/en-US/network-service-providers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/network-service-providers.xml b/docs/en-US/network-service-providers.xml
index cf86b24..af57097 100644
--- a/docs/en-US/network-service-providers.xml
+++ b/docs/en-US/network-service-providers.xml
@@ -5,128 +5,31 @@
 ]>
 
 <!-- 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="network-service-providers">
     <title>Network Service Providers</title>
-    <note><para>For the most up-to-date list of supported network service providers, see the &PRODUCT; UI or call listNetworkServiceProviders.</para></note>
+    <note><para>For the most up-to-date list of supported network service providers, see the CloudPlatform UI or call listNetworkServiceProviders.</para></note>
     <para>A service provider (also called a network element) is hardware or virtual appliance that makes a network service possible; for example, a firewall appliance can be installed in the cloud to provide firewall service. On a single network, multiple providers can provide the same network service. For example, a firewall service may be provided by Cisco or Juniper devices in the same physical network.</para>
     <para>You can have multiple instances of the same service provider in a network (say, more than one Juniper SRX device).</para>
-    <para>If different providers are set up to provide the same service on the network, the administrator can create network offerings so users can specify which network service provider they prefer (along with the other choices offered in network offerings). Otherwise, &PRODUCT; will choose which provider to use whenever the service is called for. </para>
+    <para>If different providers are set up to provide the same service on the network, the administrator can create network offerings so users can specify which network service provider they prefer (along with the other choices offered in network offerings). Otherwise, CloudPlatform will choose which provider to use whenever the service is called for. </para>
     <formalpara>
         <title>Supported Network Service Providers</title>
-        <para>&PRODUCT; ships with an internal list of the supported service providers, and you can choose from this list when creating a network offering.</para>
+        <para>CloudPlatform ships with an internal list of the supported service providers, and you can choose from this list when creating a network offering.</para>
     </formalpara>
-    <informaltable>
-        <tgroup cols="6" align="left" colsep="1" rowsep="1">
-            <colspec colnum="1" colname="c1" colwidth="2.4*"/>
-            <colspec colnum="2" colname="c2" colwidth="1.14*"/>
-            <colspec colnum="3" colname="c3" colwidth="1.23*"/>
-            <colspec colnum="4" colname="c4" colwidth="1.0*"/>
-            <colspec colnum="5" colname="c5" colwidth="1.3*"/>
-            <colspec colnum="6" colname="c6" colwidth="1.3*"/>
-            <thead>
-                <row>
-                    <entry></entry>
-                    <entry><para>Virtual Router</para></entry>
-                    <entry><para>Citrix NetScaler</para></entry>
-                    <entry><para>Juniper SRX</para></entry>
-                    <entry><para>F5 BigIP</para></entry>
-                    <entry><para>Host based (KVM/Xen)</para></entry>
-                    
-                </row>
-            </thead>
-            <tbody>
-                <row>
-                    <entry><para>Remote Access VPN</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    
-                </row>
-                <row>
-                    <entry><para>DNS/DHCP/User Data</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    							
-                </row>
-                <row>
-                    <entry><para>Firewall</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    </row>
-                <row>
-                    <entry><para>Load Balancing</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                 </row>
-                <row>
-                    <entry><para>Elastic IP</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Elastic LB</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Source NAT</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                    </row>
-                <row>
-                    <entry><para>Static NAT</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-                <row>
-                    <entry><para>Port Forwarding</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>Yes</para></entry>
-                    <entry><para>No</para></entry>
-                    <entry><para>No</para></entry>
-                   </row>
-            </tbody>
-        </tgroup>
-    </informaltable>
 </section>


Mime
View raw message