incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [2/7] Patch from Joe Brockmeier - Adding Apache license headers, fixed DTD, added &PRODUCT; entity in place of CloudPlatform/CloudStack.
Date Thu, 02 Aug 2012 20:11:46 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-xenserver-dom-memory.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-xenserver-dom-memory.xml b/docs/en-US/configure-xenserver-dom-memory.xml
index c647cd8..0a02d3e 100644
--- a/docs/en-US/configure-xenserver-dom-memory.xml
+++ b/docs/en-US/configure-xenserver-dom-memory.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="configure-xenserver-dom0-memory">
     <title>Configure XenServer dom0 Memory</title>
     <para>Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0.  For instructions on how to do this, see  <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-xenserver-dom0-memory.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-xenserver-dom0-memory.xml b/docs/en-US/configure-xenserver-dom0-memory.xml
index c647cd8..0a02d3e 100644
--- a/docs/en-US/configure-xenserver-dom0-memory.xml
+++ b/docs/en-US/configure-xenserver-dom0-memory.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="configure-xenserver-dom0-memory">
     <title>Configure XenServer dom0 Memory</title>
     <para>Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0.  For instructions on how to do this, see  <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configuring-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configuring-projects.xml b/docs/en-US/configuring-projects.xml
index 925f360..e18843d 100644
--- a/docs/en-US/configuring-projects.xml
+++ b/docs/en-US/configuring-projects.xml
@@ -1,10 +1,29 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="configuring-projects">
     <title>Configuring Projects</title>
-    <para>Before CloudPlatform users start using projects, the CloudPlatform administrator must set up various systems to support them, including membership invitations, limits on project resources, and controls on who can create projects</para>
+    <para>Before &PRODUCT; users start using projects, the &PRODUCT; administrator must set up various systems to support them, including membership invitations, limits on project resources, and controls on who can create projects</para>
 </section>
       

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/console-proxy.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/console-proxy.xml b/docs/en-US/console-proxy.xml
index bc14445..df29c42 100644
--- a/docs/en-US/console-proxy.xml
+++ b/docs/en-US/console-proxy.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="console-proxy">
     <title>Console Proxy</title>
     <para>The Console Proxy is a type of System Virtual Machine that has a role in presenting a console view via the web UI. It connects the user’s browser to the VNC port made available via the hypervisor for the console of the guest. Both the administrator and end user web UIs offer a console connection.</para>
@@ -12,5 +31,5 @@
     <para>The console proxy VM will periodically report its active session count to the Management Server. The default reporting interval is five seconds. This can be changed through standard Management Server configuration with the parameter consoleproxy.loadscan.interval.</para>
     <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.  CloudPlatform includes the realhostip.com SSL certificate in the console proxy VM.  Of course, CloudPlatform cannot know about DNS A records for our customers' public IPs prior to shipping the software.  CloudPlatform 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.c
 om, and SSL is set up without browser warnings.</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>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/contacting-support.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/contacting-support.xml b/docs/en-US/contacting-support.xml
index ef165b3..7fe86b1 100644
--- a/docs/en-US/contacting-support.xml
+++ b/docs/en-US/contacting-support.xml
@@ -1,5 +1,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.
+-->
+
 	<section id="contacting-support">
 		<title>Contacting Support</title>
 	    <para>The support team is available to help customers plan and execute their installations.  To contact the support team, log in to the support portal at <ulink url="support.citrix.com/cloudsupport">support.citrix.com/cloudsupport</ulink> by using the account credentials you received when you purchased your support contract.</para>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/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 813112c..1ceaa75 100644
--- a/docs/en-US/convert-hyperv-vm-to-template.xml
+++ b/docs/en-US/convert-hyperv-vm-to-template.xml
@@ -1,11 +1,30 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <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 CloudPlatform template, you will need a standalone XenServer host with an attached NFS VHD SR.  Use whatever XenServer version you are using with CloudPlatform, 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>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>
@@ -37,14 +56,13 @@
 	<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 CloudPlatform, create a new template using the following values:</para>
+		<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/d4be261f/docs/en-US/create-bare-metal-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-bare-metal-template.xml b/docs/en-US/create-bare-metal-template.xml
index 9effd86..635e13f 100644
--- a/docs/en-US/create-bare-metal-template.xml
+++ b/docs/en-US/create-bare-metal-template.xml
@@ -1,31 +1,46 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="create-bare-metal-template">
 	<title>Creating a Bare Metal Template</title>
-	<note><para><emphasis role="bold">Beta feature. Untested in	CloudPlatform 3.0.3. Provided without guarantee of performance</emphasis>.</para></note>
+	<note><para><emphasis role="bold">Beta feature. Untested in &PRODUCT; 3.0.3. Provided without guarantee of performance</emphasis>.</para></note>
 	<para>Before you can create a bare metal template, you must have performed several other installation and setup steps to create a bare metal cluster and environment. See Bare Metal Installation in the Installation Guide. It is assumed you already have a directory named "win7_64bit" on your CIFS server, containing the image for the bare metal instance. This directory and image are set up as part of the Bare Metal Installation procedure.</para>
 	<orderedlist>
-		<listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user.</para></listitem>
 		<listitem><para>In the left navigation bar, click Templates.</para></listitem>
 		<listitem><para>Click Create Template.</para></listitem>
 		<listitem><para>In the dialog box, enter the following values.</para>
 		<itemizedlist>
 			<listitem><para><emphasis role="bold">Name</emphasis>. Short name for the template.</para></listitem>
 			<listitem><para><emphasis role="bold">Display Text</emphasis>. Description of the template.</para></listitem>
-			<listitem><para><emphasis role="bold">URL</emphasis>. The directory name which contains image file on your
-						CIFS server. For example, win7_64bit.</para></listitem>
+			<listitem><para><emphasis role="bold">URL</emphasis>. The directory name which contains image file on your CIFS server. For example, win7_64bit.</para></listitem>
 			<listitem><para><emphasis role="bold">Zone</emphasis>. All Zones.</para></listitem>			
-			<listitem><para><emphasis role="bold">OS Type</emphasis>. Select the OS type of the ISO image. Choose other if
-						the OS Type of the ISO is not listed or if the ISO is not bootable.</para></listitem>
+			<listitem><para><emphasis role="bold">OS Type</emphasis>. Select the OS type of the ISO image. Choose other if the OS Type of the ISO is not listed or if the ISO is not bootable.</para></listitem>
 			<listitem><para><emphasis role="bold">Hypervisor</emphasis>. BareMetal.</para></listitem>
 			<listitem><para><emphasis role="bold">Format</emphasis>. BareMetal.</para></listitem>
 			<listitem><para><emphasis role="bold">Password Enabled</emphasis>. No.</para></listitem>
 			<listitem><para><emphasis role="bold">Public</emphasis>. No.</para></listitem>
-			<listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be
-						more prominent for users to select. Only administrators may make templates
-						featured.</para></listitem>
+			<listitem><para><emphasis role="bold">Featured</emphasis>. Choose Yes if you would like this template to be more prominent for users to select. Only administrators may make templates featured.</para></listitem>
 		</itemizedlist></listitem></orderedlist>
 	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/create-new-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-new-projects.xml b/docs/en-US/create-new-projects.xml
index 69e8360..7696c9e 100644
--- a/docs/en-US/create-new-projects.xml
+++ b/docs/en-US/create-new-projects.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="create-new-projects">
     <title>Creating a New Project</title>
-    <para>CloudPlatform administrators and domain administrators can create projects. If the global configuration parameter allow.user.create.projects is set to true, end users can also create projects.</para>
+    <para>&PRODUCT; administrators and domain administrators can create projects. If the global configuration parameter allow.user.create.projects is set to true, end users can also create projects.</para>
     <orderedlist>
-        <listitem><para>Log in as administrator to the CloudPlatform UI.</para></listitem>
+        <listitem><para>Log in as administrator to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation, click Projects.</para></listitem>
         <listitem><para>In Select view, click Projects.</para></listitem>
         <listitem><para>Click New Project.</para></listitem>
@@ -16,4 +35,3 @@
         <listitem><para>Click Save.</para></listitem>
     </orderedlist>
    </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/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 b3b951f..d6b6f0d 100644
--- a/docs/en-US/create-template-from-existing-vm.xml
+++ b/docs/en-US/create-template-from-existing-vm.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <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>
@@ -12,11 +31,8 @@
 		<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 CloudPlatform and the hypervisor perform
-						certain operations and make assumptions that improve the performance of the
-						guest. Select one of the following.</para>
+			<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>
@@ -24,13 +40,8 @@
 					<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 CloudPlatform 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
-						CloudPlatform password change script installed. See Adding Password
-						Management to Your Templates .</para></listitem>
+			<listitem><para><emphasis role="bold">Public</emphasis>. Choose Yes to make this template accessible to all users of this &PRODUCT; installation. The template will appear in the Community Templates list. See <xref linkend="private-public-template"/>.</para></listitem>
+			<listitem><para><emphasis role="bold">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>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/create-template-from-snapshot.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-template-from-snapshot.xml b/docs/en-US/create-template-from-snapshot.xml
index 23599da..3075032 100644
--- a/docs/en-US/create-template-from-snapshot.xml
+++ b/docs/en-US/create-template-from-snapshot.xml
@@ -1,11 +1,29 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="create-template-from-snapshot">
     <title>Creating a Template from a Snapshot</title>
     <note><para>Not supported by Oracle VM</para></note>
-    <para>If you do not want to stop the VM in order to use the Create Template menu item (as described in <xref linkend="create-template-from-existing-vm"/>), you can create a template directly from any snapshot through the CloudPlatform UI.</para>
-		
+    <para>If you do not want to stop the VM in order to use the Create Template menu item (as described in <xref linkend="create-template-from-existing-vm"/>), you can create a template directly from any snapshot through the &PRODUCT; UI.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/create-templates-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-templates-overview.xml b/docs/en-US/create-templates-overview.xml
index 9c8bf37..7e41035 100644
--- a/docs/en-US/create-templates-overview.xml
+++ b/docs/en-US/create-templates-overview.xml
@@ -1,17 +1,35 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="create-templates-overview">
 	<title>Creating Templates: Overview</title>
-	<para>CloudPlatform ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
+	<para>&PRODUCT; ships with a default template for the CentOS operating system. There are a variety of ways to add more templates. Administrators and end users can add templates. The typical sequence of events is:</para>
 	<orderedlist>
 		<listitem><para>Launch a VM instance that has the operating system you want. Make any other desired configuration changes to the VM.</para></listitem>
 		<listitem><para>Stop the VM.</para></listitem>
 		<listitem><para>Convert the volume into a template.</para></listitem>
 	</orderedlist>
-	<para>There are other ways to add templates to CloudPlatform. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into CloudPlatform</para>
+	<para>There are other ways to add templates to &PRODUCT;. For example, you can take a snapshot of the VM's volume and create a template from the snapshot, or import a VHD from another system into &PRODUCT;</para>
 	<para>The various techniques for creating templates are described in the next few sections.</para>
-	
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/create-windows-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-windows-template.xml b/docs/en-US/create-windows-template.xml
index 70a71af..ef36020 100644
--- a/docs/en-US/create-windows-template.xml
+++ b/docs/en-US/create-windows-template.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="create-windows-template">
 	<title>Creating a Windows Template</title>
 	<para>Windows templates must be prepared with Sysprep before they can be provisioned on multiple machines. Sysprep allows you to create a generic Windows template and avoid any possible SID conflicts.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-compute-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-compute-offerings.xml b/docs/en-US/creating-compute-offerings.xml
index fc0b6a9..56679a4 100644
--- a/docs/en-US/creating-compute-offerings.xml
+++ b/docs/en-US/creating-compute-offerings.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-compute-offerings">
     <title>Creating a New Compute Offering</title>
     <para>To create a new compute offering:</para>
     <orderedlist>
-        <listitem><para>Log in with admin privileges to the CloudPlatform UI.</para></listitem>
+        <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation bar, click Service Offerings.</para></listitem>
         <listitem><para>In Select Offering, choose Compute Offering.</para></listitem>
         <listitem><para>Click Add Compute Offering.</para></listitem>
@@ -17,17 +36,15 @@
             <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
             <listitem><para>Storage type. The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
             <listitem><para># of CPU cores. The number of cores which should be allocated to a system VM with this offering</para></listitem>
-            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, “2000” would provide for a 2 GHz clock.</para></listitem>
-            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, “2048” would provide for a 2 GB RAM allocation.</para></listitem>
+            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, "2000" would provide for a 2 GHz clock.</para></listitem>
+            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, "2048" would provide for a 2 GB RAM allocation.</para></listitem>
             <listitem><para>Network Rate. Allowed data transfer rate in MB per second.</para></listitem>
             <listitem><para>Offer HA. If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.</para></listitem>
             <listitem><para>Storage Tags.  The tags that should be associated with the primary storage used by the system VM.</para></listitem>
             <listitem><para>Host Tags.  (Optional) Any tags that you use to organize your hosts</para></listitem>
             <listitem><para>CPU cap. Whether to limit the level of CPU usage even if spare capacity is available.</para></listitem>
-            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; CloudPlatform will then prompt for the subdomain's name.</para></listitem>
+            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                
-    
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-disk-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-disk-offerings.xml b/docs/en-US/creating-disk-offerings.xml
index d455ecc..12bb2ac 100644
--- a/docs/en-US/creating-disk-offerings.xml
+++ b/docs/en-US/creating-disk-offerings.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-disk-offerings">
     <title>Creating a New Disk Offering</title>
     <para>To create a system service offering:</para>
     <orderedlist>
-        <listitem><para>Log in with admin privileges to the CloudPlatform UI.</para></listitem>
+        <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation bar, click Service Offerings.</para></listitem>
         <listitem><para>In Select Offering, choose Disk Offering.</para></listitem>
         <listitem><para>Click Add Disk Offering.</para></listitem>
@@ -17,11 +36,9 @@
             <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
             <listitem><para>Custom Disk Size. If checked, the user can set their own disk size. If not checked, the root administrator must define a value in Disk Size.</para></listitem>
             <listitem><para>Disk Size. Appears only if Custom Disk Size is not selected. Define the volume size in GB.</para></listitem>
-            <listitem><para>(Optional)Storage Tags.  The tags that should be associated with the primary storage for this disk. Tags are a comma separated list of attributes of the storage.  For example "ssd,blue".  Tags are also added on Primary Storage.  CloudPlatform matches tags on a disk offering to tags on the storage.  If a tag is present on a disk offering that tag (or tags) must also be present on Primary Storage for the volume to be provisioned.  If no such primary storage exists, allocation from the disk offering will fail..</para></listitem>
-            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains. Choose Yes to make it available to all domains. Choose No to limit the scope to a subdomain; CloudPlatform will then prompt for the subdomain's name.</para></listitem>
+            <listitem><para>(Optional)Storage Tags.  The tags that should be associated with the primary storage for this disk. Tags are a comma separated list of attributes of the storage.  For example "ssd,blue".  Tags are also added on Primary Storage.  &PRODUCT; matches tags on a disk offering to tags on the storage.  If a tag is present on a disk offering that tag (or tags) must also be present on Primary Storage for the volume to be provisioned.  If no such primary storage exists, allocation from the disk offering will fail..</para></listitem>
+            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains. Choose Yes to make it available to all domains. Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                
-    
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
index 5bf32be..ab56920 100644
--- a/docs/en-US/creating-network-offerings.xml
+++ b/docs/en-US/creating-network-offerings.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-network-offerings">
     <title>Creating a New Network Offering</title>
     <para>To create a network offering:</para>
     <orderedlist>
-        <listitem><para>Log in with admin privileges to the CloudPlatform UI.</para></listitem>
+        <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation bar, click Service Offerings.</para></listitem>
         <listitem><para>In Select Offering, choose Network Offering.</para></listitem>
         <listitem><para>Click Add Network Offering.</para></listitem>
@@ -19,12 +38,7 @@
             <listitem><para>Traffic Type. The type of network traffic that will be carried on the network</para></listitem>
             <listitem><para>Guest Type. Choose whether the guest network is isolated or shared. For a description of these terms, see <xref linkend="about-virtual-networks"/> </para></listitem>
             <listitem><para>Specify VLAN. (Isolated guest networks only) Indicate whether a VLAN should be specified when this offering is used</para></listitem>
-            <listitem><para>Supported Services. Select one or more of the possible network services. For some services,
-                        you must also choose the service provider; for example, if you select Load
-                        Balancer, you can choose the CloudPlatform virtual router or any other load
-                        balancers that have been configured in the cloud. Depending on which
-                        services you choose, additional fields may appear in the rest of the dialog
-                        box.</para><para>Based on the guest network type selected, you can see the following supported services:</para><informaltable>
+            <listitem><para>Supported Services. Select one or more of the possible network services. For some services, you must also choose the service provider; for example, if you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load balancers that have been configured in the cloud. Depending on which services you choose, additional fields may appear in the rest of the dialog box.</para><para>Based on the guest network type selected, you can see the following supported services:</para><informaltable>
                             <tgroup cols="4" align="left" colsep="1" rowsep="1">
                                 <thead>
                                     <row>
@@ -49,32 +63,25 @@
                                     </row>
                                     <row>
                                         <entry><para>Load Balancer</para></entry>
-                                        <entry><para>If you select Load Balancer, you can choose the CloudPlatform virtual router or any other load
-                                            balancers that have been configured in the cloud.</para></entry>
+                                        <entry><para>If you select Load Balancer, you can choose the &PRODUCT; virtual router or any other load balancers that have been configured in the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>Source NAT</para></entry>
-                                        <entry><para>If you select Source NAT, you can choose the CloudPlatform virtual router or any other Source
-                                            NAT providers that have been configured in the
-                                            cloud.</para></entry>
+                                        <entry><para>If you select Source NAT, you can choose the &PRODUCT; virtual router or any other Source NAT providers that have been configured in the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                        <entry><para>Static NAT</para></entry>
-                                        <entry><para>If you select Static NAT, you can choose the CloudPlatform virtual router or any other Static
-                                            NAT providers that have been configured in the
-                                            cloud.</para></entry>
+                                        <entry><para>If you select Static NAT, you can choose the &PRODUCT; virtual router or any other Static NAT providers that have been configured in the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Supported</para></entry>
                                     </row>
                                     <row>
                                         <entry><para>Port Forwarding</para></entry>
-                                        <entry><para>If you select Port Forwarding, you can choose the CloudPlatform virtual router or any other
-                                            Port Forwarding providers that have been configured in
-                                            the cloud.</para></entry>
+                                        <entry><para>If you select Port Forwarding, you can choose the &PRODUCT; virtual router or any other Port Forwarding providers that have been configured in the cloud.</para></entry>
                                         <entry><para>Supported</para></entry>
                                         <entry><para>Not Supported</para></entry>
                                     </row>
@@ -100,13 +107,11 @@
                                  </tgroup>
                         </informaltable>
             </listitem>
-            <listitem><para>System Offering. If the service provider for any of the services selected in Supported Services is a virtual router, the System Offering field appears. Choose the system service offering that you want virtual routers to use in this network. For example, if you selected Load Balancer in Supported Services and selected a virtual router to provide load balancing, the System Offering field appears so you can choose between the CloudPlatform default system service offering and any custom system service offerings that have been defined by the CloudPlatform root administrator. For more information, see System Service Offerings.</para></listitem>
-            <listitem><para>Redundant router capability. (v3.0.3 and greater) Available only when Virtual Router is selected as the Source NAT provider.  Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the master virtual router and the other as the backup. The master virtual router receives requests from and sends responses to the user’s VM. The backup virtual router is activated only when the master is down. After the failover, the backup becomes the master virtual router. CloudPlatform deploys the routers on different hosts to ensure reliability if one host is down.</para></listitem>
+            <listitem><para>System Offering. If the service provider for any of the services selected in Supported Services is a virtual router, the System Offering field appears. Choose the system service offering that you want virtual routers to use in this network. For example, if you selected Load Balancer in Supported Services and selected a virtual router to provide load balancing, the System Offering field appears so you can choose between the &PRODUCT; default system service offering and any custom system service offerings that have been defined by the &PRODUCT; root administrator. For more information, see System Service Offerings.</para></listitem>
+            <listitem><para>Redundant router capability. (v3.0.3 and greater) Available only when Virtual Router is selected as the Source NAT provider.  Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the master virtual router and the other as the backup. The master virtual router receives requests from and sends responses to the user’s VM. The backup virtual router is activated only when the master is down. After the failover, the backup becomes the master virtual router. &PRODUCT; deploys the routers on different hosts to ensure reliability if one host is down.</para></listitem>
             <listitem><para>Conserve mode.  Indicate whether to use conserve mode. In this mode, network resources are allocated only when the first virtual machine starts in the network</para></listitem>
             <listitem><para>Tags.  Network tag to specify which physical network to use</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                
-    
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-new-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-new-volumes.xml b/docs/en-US/creating-new-volumes.xml
index 71b4f9b..995da86 100644
--- a/docs/en-US/creating-new-volumes.xml
+++ b/docs/en-US/creating-new-volumes.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-new-volumes">
 	<title>Creating a New Volume</title>
-	<para>You can add more data disk volumes to a guest VM at any time, up to the limits of your storage capacity. Both CloudPlatform administrators and users can add volumes to VM instances. When you create a new volume, it is stored as an entity in CloudPlatform, but the actual storage resources are not allocated on the physical storage device until you attach the volume. This optimization allows the CloudPlatform to provision the volume nearest to the guest that will use it when the first attachment is made.</para>
+	<para>You can add more data disk volumes to a guest VM at any time, up to the limits of your storage capacity. Both &PRODUCT; administrators and users can add volumes to VM instances. When you create a new volume, it is stored as an entity in &PRODUCT;, but the actual storage resources are not allocated on the physical storage device until you attach the volume. This optimization allows the &PRODUCT; to provision the volume nearest to the guest that will use it when the first attachment is made.</para>
 				<orderedlist>
-				<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 				<listitem><para>In the left navigation bar, click Storage.</para></listitem>
 				<listitem><para>In Select View, choose Volumes.</para></listitem>
 				<listitem><para>To create a new volume, click Add Volume, provide the following details, and click OK.</para>
@@ -16,8 +35,7 @@
 					<listitem><para>Availability Zone. Where do you want the storage to reside? This should be close to the VM that will use the volume.</para></listitem>
 					<listitem><para>Disk Offering. Choose the characteristics of the storage.</para></listitem>
 				</itemizedlist>
-				<para>The new volume appears in the list of volumes with the state “Allocated.” The volume data is stored in CloudPlatform, but the volume is not yet ready for use</para></listitem>
+				<para>The new volume appears in the list of volumes with the state “Allocated.” The volume data is stored in &PRODUCT;, but the volume is not yet ready for use</para></listitem>
 				<listitem><para>To start using the volume, continue to Attaching a Volume </para></listitem>
 			</orderedlist>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-system-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-system-service-offerings.xml b/docs/en-US/creating-system-service-offerings.xml
index 7f9bf52..e33d9d0 100644
--- a/docs/en-US/creating-system-service-offerings.xml
+++ b/docs/en-US/creating-system-service-offerings.xml
@@ -1,13 +1,32 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-system-service-offerings">
     <title>Creating a New System Service Offering</title>
     <para>To create a system service offering:</para>
     <orderedlist>
-        <listitem><para>Log in with admin privileges to the CloudPlatform UI.</para></listitem>
+        <listitem><para>Log in with admin privileges to the &PRODUCT; UI.</para></listitem>
         <listitem><para>In the left navigation bar, click Service Offerings.</para></listitem>
         <listitem><para>In Select Offering, choose System Offering.</para></listitem>
         <listitem><para>Click Add System Service Offering.</para></listitem>
@@ -18,14 +37,14 @@
             <listitem><para>System VM Type. Select the type of system virtual machine that this offering is intended to support.</para></listitem>
             <listitem><para>Storage type. The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
             <listitem><para># of CPU cores. The number of cores which should be allocated to a system VM with this offering</para></listitem>
-            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, “2000” would provide for a 2 GHz clock.</para></listitem>
-            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, “2048” would provide for a 2 GB RAM allocation.</para></listitem>
+            <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, "2000" would provide for a 2 GHz clock.</para></listitem>
+            <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, "2048" would provide for a 2 GB RAM allocation.</para></listitem>
             <listitem><para>Network Rate. Allowed data transfer rate in MB per second.</para></listitem>
             <listitem><para>Offer HA. If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.</para></listitem>
             <listitem><para>Storage Tags.  The tags that should be associated with the primary storage used by the system VM.</para></listitem>
             <listitem><para>Host Tags.  (Optional) Any tags that you use to organize your hosts</para></listitem>
             <listitem><para>CPU cap. Whether to limit the level of CPU usage even if spare capacity is available.</para></listitem>
-            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; CloudPlatform will then prompt for the subdomain's name.</para></listitem>
+            <listitem><para>Public.  Indicate whether the service offering should be available all domains or only some domains.  Choose Yes to make it available to all domains.  Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
         </itemizedlist></listitem> 
         <listitem><para>Click Add.</para></listitem>        
     </orderedlist>                

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/creating-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml
index ea5d0f2..dd6ec79 100644
--- a/docs/en-US/creating-vms.xml
+++ b/docs/en-US/creating-vms.xml
@@ -1,14 +1,33 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="creating-vms">
 		<title>Creating VMs</title>
 		<para>Virtual machines are usually created from a template. Users can also create blank virtual machines. A blank virtual machine is a virtual machine without an OS template. Users can attach an ISO file and install the OS from the CD/DVD-ROM.</para>
 	<para>To create a VM from a template:</para>
 		<orderedlist>
-			<listitem><para>Log in to the CloudPlatform UI as an administrator or user.</para></listitem>
+			<listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
 			<listitem><para>In the left navigation bar, click Instances.</para></listitem>
 			<listitem><para>Click Add Instance.</para></listitem>
 			<listitem><para>Select a template, then follow the steps in the wizard. (For more information about how the templates came to be in this list, see Working with Templates.</para></listitem>
@@ -20,12 +39,11 @@
 		<para>To create a VM from an ISO:</para>
 		<note><para>(XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.</para></note>
 	<orderedlist>
-		<listitem><para>Log in to the CloudPlatform UI as an administrator or user.</para></listitem>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or user.</para></listitem>
 		<listitem><para>In the left navigation bar, click Instances.</para></listitem>
 		<listitem><para>Click Add Instance.</para></listitem>
 		<listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
 		<listitem><para>Click Submit and your VM will be created and started.</para></listitem>
-		<listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the CloudPlatform UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
+		<listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
 	</orderedlist>
 </section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/customizing-dns.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/customizing-dns.xml b/docs/en-US/customizing-dns.xml
index bf9dc41..c24bad8 100644
--- a/docs/en-US/customizing-dns.xml
+++ b/docs/en-US/customizing-dns.xml
@@ -1,19 +1,38 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="customizing-dns">
     <title>Customizing the Network Domain Name</title>
-    <para>The root administrator can optionally assign a custom DNS suffix at the level of a network, account, domain, zone, or entire CloudPlatform installation, and a domain administrator can do so within their own domain. To specify a custom domain name and put it into effect, follow these steps.</para>
+    <para>The root administrator can optionally assign a custom DNS suffix at the level of a network, account, domain, zone, or entire &PRODUCT; installation, and a domain administrator can do so within their own domain. To specify a custom domain name and put it into effect, follow these steps.</para>
     <orderedlist>
         <listitem><para>Set the DNS suffix at the desired scope</para>
         <itemizedlist>
-            <listitem><para>At the network level, the DNS suffix can be assigned through the UI when creating a new network, as described in <xref linkend="add-additional-guest-network"/> or with the updateNetwork command in the CloudPlatform API.</para></listitem>
-            <listitem><para>At the account, domain, or zone level, the DNS suffix can be assigned with the appropriate CloudPlatform API commands: createAccount, editAccount, createDomain, editDomain, createZone, or editZone.</para></listitem>
-            <listitem><para>At the global level, use the configuration parameter guest.domain.suffix. You can also use the CloudPlatform API command updateConfiguration. After modifying this global configuration, restart the Management Server to put the new setting into effect.</para></listitem>
+            <listitem><para>At the network level, the DNS suffix can be assigned through the UI when creating a new network, as described in <xref linkend="add-additional-guest-network"/> or with the updateNetwork command in the &PRODUCT; API.</para></listitem>
+            <listitem><para>At the account, domain, or zone level, the DNS suffix can be assigned with the appropriate &PRODUCT; API commands: createAccount, editAccount, createDomain, editDomain, createZone, or editZone.</para></listitem>
+            <listitem><para>At the global level, use the configuration parameter guest.domain.suffix. You can also use the &PRODUCT; API command updateConfiguration. After modifying this global configuration, restart the Management Server to put the new setting into effect.</para></listitem>
         </itemizedlist></listitem>
-        <listitem><para>To make the new DNS suffix take effect for an existing network, call the CloudPlatform API command updateNetwork. This step is not necessary when the DNS suffix was specified while creating a new network.</para></listitem>
+        <listitem><para>To make the new DNS suffix take effect for an existing network, call the &PRODUCT; API command updateNetwork. This step is not necessary when the DNS suffix was specified while creating a new network.</para></listitem>
         </orderedlist>
     <para>The source of the network domain that is used depends on the following rules.</para>
     <itemizedlist>
@@ -22,5 +41,4 @@
         <listitem><para>For a domain-specific network, the network domain specified for the domain is used. If none is specified, the system looks for a value in the zone and global configuration, in that order.</para></listitem>
         <listitem><para>For a zone-specific network, the network domain specified for the zone is used. If none is specified, the system looks for a value in the global configuration.</para></listitem>
     </itemizedlist>
-    
 </section>


Mime
View raw message