cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [11/30] git commit: Patch from Joe Brockmeier - Adding Apache license headers, fixed DTD, added &PRODUCT; entity in place of CloudPlatform/CloudStack.
Date Fri, 03 Aug 2012 01:54:13 GMT
Patch from Joe Brockmeier - Adding Apache license headers, fixed DTD,
added &PRODUCT; entity in place of CloudPlatform/CloudStack.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d4be261f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d4be261f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d4be261f

Branch: refs/heads/vpc
Commit: d4be261f63202da0b06f56d383ddc1f44b28c48b
Parents: 81be063
Author: Chip Childers <chip.childers@gmail.com>
Authored: Thu Aug 2 16:10:51 2012 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Thu Aug 2 16:10:51 2012 -0400

----------------------------------------------------------------------
 ...change-console-proxy-ssl-certificate-domain.xml |   27 +++++++-
 docs/en-US/change-host-password.xml                |   23 ++++++-
 .../change-network-offering-on-guest-network.xml   |   26 ++++++-
 docs/en-US/change-to-behavior-of-list-commands.xml |   23 ++++++-
 docs/en-US/changing-root-password.xml              |   21 ++++++-
 docs/en-US/changing-secondary-storage-ip.xml       |   22 ++++++-
 docs/en-US/changing-secondary-storage-servers.xml  |   21 ++++++-
 docs/en-US/changing-secondary-storage-serversp.xml |   23 ++++++-
 docs/en-US/changing-service-offering-for-vm.xml    |   23 ++++++-
 docs/en-US/changing-vm-name-os-group.xml           |   26 ++++++-
 docs/en-US/cloud-infrastructure-concepts.xml       |   23 ++++++-
 docs/en-US/cloud-infrastructure-overview.xml       |   22 ++++++-
 docs/en-US/cloud_infrastructure_overview.xml       |   19 +++++-
 docs/en-US/cloudplatform-api.xml                   |   27 +++++++-
 docs/en-US/cloudstack-admin.xml                    |   22 ++++++-
 docs/en-US/cloudstack.ent                          |    2 +-
 docs/en-US/cloudstack.xml                          |   23 ++++++-
 docs/en-US/cloudstack_admin.xml                    |   21 ++++++-
 docs/en-US/cloudstack_developers.xml               |   21 ++++++-
 docs/en-US/cloudstack_features.xml                 |   38 ++++++++---
 docs/en-US/cloudstack_installation.xml             |   22 ++++++-
 docs/en-US/cloudstack_system_requirements.xml      |   25 ++++++-
 docs/en-US/cloudstack_trial_installation.xml       |   22 ++++++-
 docs/en-US/cloudstack_whatis.xml                   |   41 +++++++-----
 docs/en-US/cluster-add.xml                         |   21 ++++++-
 docs/en-US/compatibility-matrix.xml                |   21 ++++++-
 docs/en-US/compute-disk-service-offerings.xml      |   25 ++++++-
 docs/en-US/concepts.xml                            |   21 ++++++-
 .../configure-guest-traffic-in-advanced-zone.xml   |   25 ++++++-
 ...onfigure-public-traffic-in-an-advanced-zone.xml |    5 +-
 docs/en-US/configure-usage-server.xml              |   31 +++++++--
 docs/en-US/configure-virtual-router.xml            |   23 ++++++-
 docs/en-US/configure-vpn.xml                       |   25 ++++++-
 docs/en-US/configure-xenserver-dom-memory.xml      |   21 ++++++-
 docs/en-US/configure-xenserver-dom0-memory.xml     |   21 ++++++-
 docs/en-US/configuring-projects.xml                |   23 ++++++-
 docs/en-US/console-proxy.xml                       |   23 ++++++-
 docs/en-US/contacting-support.xml                  |   19 +++++-
 docs/en-US/convert-hyperv-vm-to-template.xml       |   26 ++++++-
 docs/en-US/create-bare-metal-template.xml          |   35 +++++++---
 docs/en-US/create-new-projects.xml                 |   26 ++++++-
 docs/en-US/create-template-from-existing-vm.xml    |   37 +++++++----
 docs/en-US/create-template-from-snapshot.xml       |   24 ++++++-
 docs/en-US/create-templates-overview.xml           |   26 ++++++-
 docs/en-US/create-windows-template.xml             |   21 ++++++-
 docs/en-US/creating-compute-offerings.xml          |   31 +++++++--
 docs/en-US/creating-disk-offerings.xml             |   29 +++++++--
 docs/en-US/creating-network-offerings.xml          |   51 ++++++++-------
 docs/en-US/creating-new-volumes.xml                |   28 +++++++--
 docs/en-US/creating-system-service-offerings.xml   |   29 +++++++--
 docs/en-US/creating-vms.xml                        |   28 +++++++--
 docs/en-US/customizing-dns.xml                     |   32 +++++++--
 52 files changed, 1087 insertions(+), 203 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
index 04c341b..46ceaae 100644
--- a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
+++ b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
@@ -1,23 +1,42 @@
 <?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="change-console-proxy-ssl-certificate-domain">
     <title>Changing the Console Proxy SSL Certificate and Domain</title>
     <para>If the administrator prefers, it is possible for the URL of the customer's console session to show a domain other than realhostip.com. The administrator can customize the displayed domain by selecting a different domain and uploading a new SSL certificate and private key. The domain must run a DNS service that is capable of resolving queries for addresses of the form aaa-bbb-ccc-ddd.your.domain to an IPv4 IP address in the form aaa.bbb.ccc.ddd, for example, 202.8.44.1. To change the console proxy domain, SSL certificate, and private key:</para>
     <orderedlist>
         <listitem><para>Set up dynamic name resolution or populate all possible DNS names in your public IP range into your existing DNS server with the format aaa-bbb-ccc-ddd.company.com -> aaa.bbb.ccc.ddd.</para></listitem>
-        <listitem><para>Generate the private key and certificate signing request (CSR). When you are using openssl to generate private/public key pairs and CSRs, for the private key that you are going to paste into the CloudPlatform UI, be sure to convert it into PKCS#8 format.</para>
+        <listitem><para>Generate the private key and certificate signing request (CSR). When you are using openssl to generate private/public key pairs and CSRs, for the private key that you are going to paste into the &PRODUCT; UI, be sure to convert it into PKCS#8 format.</para>
         <orderedlist numeration="loweralpha">
             <listitem><para>Generate a new 2048-bit private key</para><programlisting>openssl genrsa -des3 -out yourprivate.key 2048</programlisting></listitem>
             <listitem><para>Generate a new certificate CSR</para><programlisting>openssl req -new -key yourprivate.key -out yourcertificate.csr</programlisting></listitem>
             <listitem><para>Head to the website of your favorite trusted Certificate Authority, purchase an SSL certificate, and submit the CSR. You should receive a valid certificate in return</para></listitem>
             <listitem><para>Convert your private key format into PKCS#8 encrypted format.</para><programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key</programlisting></listitem>
-            <listitem><para>Convert your PKCS#8 encrypted private key into the PKCS#8 format that is compliant with CloudPlatform</para><programlisting>openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key</programlisting></listitem>
+            <listitem><para>Convert your PKCS#8 encrypted private key into the PKCS#8 format that is compliant with &PRODUCT;</para><programlisting>openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key</programlisting></listitem>
         </orderedlist>          
         </listitem>
-        <listitem><para>In the Update SSL Certificate screen of the CloudPlatform UI, paste the following</para>
+        <listitem><para>In the Update SSL Certificate screen of the &PRODUCT; UI, paste the following</para>
         <itemizedlist>
             <listitem><para>Certificate from step 1(c).</para></listitem>
             <listitem><para>Private key from step 1(e).</para></listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/change-host-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-host-password.xml b/docs/en-US/change-host-password.xml
index 42a852c..7221fe6 100644
--- a/docs/en-US/change-host-password.xml
+++ b/docs/en-US/change-host-password.xml
@@ -1,15 +1,34 @@
 <?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="change-host-password">
     <title>Changing Host Password</title>
     <para>The password for a XenServer Node, KVM Node, or vSphere Node may be changed in the database.  Note that all Nodes in a Cluster must have the same password.</para>
     <para> To change a Node's password:</para>
     <orderedlist>
         <listitem><para>Identify all hosts in the cluster.</para></listitem>
-        <listitem><para>Change the password on all hosts in the cluster.  Now the password for the host and the password known to CloudPlatform will not match.  Operations on the cluster will fail until the two passwords match.</para>
+        <listitem><para>Change the password on all hosts in the cluster.  Now the password for the host and the password known to &PRODUCT; will not match.  Operations on the cluster will fail until the two passwords match.</para>
         </listitem>
         <listitem><para>Get the list of host IDs for the host in the cluster where you are changing the password.  You will need to access the database to determine these host IDs.  For each hostname "h" (or vSphere cluster) that you are changing the password for, execute:</para>
         <programlisting>mysql> select id from cloud.host where name like '%h%';</programlisting>   </listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/change-network-offering-on-guest-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-network-offering-on-guest-network.xml b/docs/en-US/change-network-offering-on-guest-network.xml
index c2448b9..7a9482c 100644
--- a/docs/en-US/change-network-offering-on-guest-network.xml
+++ b/docs/en-US/change-network-offering-on-guest-network.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="change-network-offering-on-guest-network">
 	<title>Changing the Network Offering on a Guest Network</title>
 	<para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
 	<itemizedlist>
-		<listitem><para>Log in to the CloudPlatform UI as an administrator or end user. </para></listitem>
-		<listitem><para>2.	If you are changing from a network offering that uses the CloudPlatform virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
+		<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
+		<listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one that uses external devices as network service providers, you must first stop all the VMs on the network. See Stopping and Starting VMs. Then return here and continue to the next step</para></listitem>
 		<listitem><para>In the left navigation, choose Network</para></listitem>
 		<listitem><para>Click the name of the network you want to modify <inlinemediaobject>
 			<imageobject>
@@ -23,4 +42,3 @@
 	</itemizedlist>
 
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/change-to-behavior-of-list-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-to-behavior-of-list-commands.xml b/docs/en-US/change-to-behavior-of-list-commands.xml
index 2270db2..aa5f965 100644
--- a/docs/en-US/change-to-behavior-of-list-commands.xml
+++ b/docs/en-US/change-to-behavior-of-list-commands.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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="change-to-behavior-of-list-commands">
 		<title>Change to Behavior of List Commands</title>
 		<para>There was a major change in how our List* API commands work in CloudStack 3.0 compared to 2.2.x. The rules below apply only for managed resources – those that belong to an account, domain, or project. They are irrelevant for the List* commands displaying unmanaged (system) resources, such as hosts, clusters, and external network resources.</para>
@@ -66,5 +85,5 @@
 				</tbody>
 				</tgroup>
 		</informaltable>	
-		<para>The CloudPlatform UI on a general view will display all resources that the logged-in user is authorized to see, except for project resources. To see the project resources, select the project view.</para>
+		<para>The &PRODUCT; UI on a general view will display all resources that the logged-in user is authorized to see, except for project resources. To see the project resources, select the project view.</para>
 	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-root-password.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-root-password.xml b/docs/en-US/changing-root-password.xml
index a30b461..0b8ad0f 100644
--- a/docs/en-US/changing-root-password.xml
+++ b/docs/en-US/changing-root-password.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="changing-root-password">
 	<title>Changing the Root Password</title>
     <para>During installation and ongoing cloud administration, you will need to log in to the UI as the root administrator.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-secondary-storage-ip.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-ip.xml b/docs/en-US/changing-secondary-storage-ip.xml
index 21ed977..e39a68e 100644
--- a/docs/en-US/changing-secondary-storage-ip.xml
+++ b/docs/en-US/changing-secondary-storage-ip.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="changing-secondary-storage-ip">
 		<title>Making API Requests</title>
 		<para>You can change the secondary storage IP address after it has been provisioned.  After changing the IP address on the host, log in to your management server and execute the following commands. Replace HOSTID below with your own value, and change the URL to use the appropriate IP address and path for your server:</para>
@@ -23,4 +42,3 @@
 		<para>Then log in to the cloud console UI and stop and start (not reboot) the Secondary Storage VM for that Zone.</para>
 			
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-secondary-storage-servers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml
index 92590f2..2ab8836 100644
--- a/docs/en-US/changing-secondary-storage-servers.xml
+++ b/docs/en-US/changing-secondary-storage-servers.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="changing-secondary-storage-serversp">
 	<title>Changing Secondary Storage Servers</title>
 	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-secondary-storage-serversp.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml
index 889f8b8..2ab8836 100644
--- a/docs/en-US/changing-secondary-storage-serversp.xml
+++ b/docs/en-US/changing-secondary-storage-serversp.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="changing-secondary-storage-serversp">
 	<title>Changing Secondary Storage Servers</title>
 	<para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
@@ -11,7 +30,7 @@
 			<listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
 			<listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
 			<listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
-			<listitem><para>5.	Start the Management Server.</para></listitem>
+			<listitem><para>Start the Management Server.</para></listitem>
 		</orderedlist>
 	</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-service-offering-for-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-service-offering-for-vm.xml b/docs/en-US/changing-service-offering-for-vm.xml
index c4748f0..7448b4d 100644
--- a/docs/en-US/changing-service-offering-for-vm.xml
+++ b/docs/en-US/changing-service-offering-for-vm.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="changing-service-offering-for-vm">
 	<title>Changing the Service Offering for a VM</title>
 		<para>To upgrade or downgrade the level of compute resources available to a virtual machine, you can change the VM's compute offering.</para>
 		<orderedlist>
-			<listitem><para>Log in to the 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, click Instances.</para></listitem>
 			<listitem><para>Choose the VM that you want to work with.</para></listitem>
 			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/changing-vm-name-os-group.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/changing-vm-name-os-group.xml b/docs/en-US/changing-vm-name-os-group.xml
index 810d0e7..3515082 100644
--- a/docs/en-US/changing-vm-name-os-group.xml
+++ b/docs/en-US/changing-vm-name-os-group.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="changing-vm-name-os-group">
 	<title>Changing the VM Name, OS, or Group</title>
 	<para>After a VM is created, you can modify the display name, operating system, and the group it belongs to.</para>
-	<para>To access a VM through the CloudPlatform UI:</para>
+	<para>To access a VM through the &PRODUCT; UI:</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, click Instances.</para></listitem>
 			<listitem><para>Select the VM that you want to modify.</para></listitem>
 			<listitem><para>Click the Stop button to stop the VM <inlinemediaobject>
@@ -33,4 +52,3 @@
 			<listitem><para>Click Apply.</para></listitem>
 		</orderedlist>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloud-infrastructure-concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml
index cdf8ed0..e423d24 100644
--- a/docs/en-US/cloud-infrastructure-concepts.xml
+++ b/docs/en-US/cloud-infrastructure-concepts.xml
@@ -1,9 +1,28 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="cloud-infrastructure-concepts">
 	<title>Cloud Infrastructure Concepts</title>
     <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloud-infrastructure-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud-infrastructure-overview.xml b/docs/en-US/cloud-infrastructure-overview.xml
index 9c10acf..2919715 100644
--- a/docs/en-US/cloud-infrastructure-overview.xml
+++ b/docs/en-US/cloud-infrastructure-overview.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="cloud-infrastructure-overview">
 	<title>Cloud Infrastructure Overview</title>
 	<para>
@@ -25,4 +44,3 @@
 	<para><emphasis role="bold">More Information</emphasis></para>
 	<para>For more information, see <xref linkend="cloud-infrastructure-concepts" />.</para>
 </section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloud_infrastructure_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloud_infrastructure_overview.xml b/docs/en-US/cloud_infrastructure_overview.xml
index 89b8f63..6184240 100644
--- a/docs/en-US/cloud_infrastructure_overview.xml
+++ b/docs/en-US/cloud_infrastructure_overview.xml
@@ -1,3 +1,21 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 	<section id="cloud_infrastructure_overview">
 		<title>Cloud Infrastructure Overview</title>
 		<para>
@@ -18,4 +36,3 @@
 			<textobject><phrase>infrastructure_overview.png: Nested organization of a zone</phrase></textobject>
 		</mediaobject>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudplatform-api.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudplatform-api.xml b/docs/en-US/cloudplatform-api.xml
index ac96b0c..3c4a914 100644
--- a/docs/en-US/cloudplatform-api.xml
+++ b/docs/en-US/cloudplatform-api.xml
@@ -1,12 +1,31 @@
 <?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="cloudplatform-api">
-    <title>CloudPlatform API</title>
-    <para>The CloudPlatform API is a low level API that has been used to implement the CloudPlatform web UIs. It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF standards.</para>
-    <para>Many CloudPlatform API calls are asynchronous. These will return a Job ID immediately when called. This Job ID can be used to query the status of the job later. Also, status calls on impacted resources will provide some indication of their state.</para>
+    <title>&PRODUCT; API</title>
+    <para>The &PRODUCT; API is a low level API that has been used to implement the &PRODUCT; web UIs. It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF standards.</para>
+    <para>Many &PRODUCT; API calls are asynchronous. These will return a Job ID immediately when called. This Job ID can be used to query the status of the job later. Also, status calls on impacted resources will provide some indication of their state.</para>
     <para>The API has a REST-like query basis and returns results in XML or JSON.</para>
     <para>See <ulink url="http://support.citrix.com/product/cs">the Developer’s Guide</ulink> and <ulink url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack">the API Reference</ulink>.</para>
    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack-admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack-admin.xml b/docs/en-US/cloudstack-admin.xml
index 8b1d0b2..cfdfcf0 100644
--- a/docs/en-US/cloudstack-admin.xml
+++ b/docs/en-US/cloudstack-admin.xml
@@ -1,12 +1,30 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack.ent
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack.ent b/docs/en-US/cloudstack.ent
index 4607134..65ecebd 100644
--- a/docs/en-US/cloudstack.ent
+++ b/docs/en-US/cloudstack.ent
@@ -1,4 +1,4 @@
 <!ENTITY PRODUCT "CloudStack">
 <!ENTITY BOOKID "Technical Documentation">
 <!ENTITY YEAR "2012">
-<!ENTITY HOLDER "CC-BY-SA">
+<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml
index 143e0a6..c64b3c9 100644
--- a/docs/en-US/cloudstack.xml
+++ b/docs/en-US/cloudstack.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -13,4 +32,4 @@
     <xi:include href="developer-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="release-notes-3.0.4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
\ No newline at end of file
+</book>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_admin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_admin.xml b/docs/en-US/cloudstack_admin.xml
index 8b1d0b2..e6c3923 100644
--- a/docs/en-US/cloudstack_admin.xml
+++ b/docs/en-US/cloudstack_admin.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_developers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_developers.xml b/docs/en-US/cloudstack_developers.xml
index 8fc5e2a..39817ab 100644
--- a/docs/en-US/cloudstack_developers.xml
+++ b/docs/en-US/cloudstack_developers.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_features.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_features.xml b/docs/en-US/cloudstack_features.xml
index 5cf619e..ae83792 100644
--- a/docs/en-US/cloudstack_features.xml
+++ b/docs/en-US/cloudstack_features.xml
@@ -1,42 +1,60 @@
+<!-- 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="cloudstack_features">
-		<title>What Can CloudStack Do?</title>
+		<title>What Can &PRODUCT; Do?</title>
 		
 		<para>
 			<emphasis role="bold">Multiple Hypervisor Support</emphasis>
 		</para>
 		<para>
-			CloudStack works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload. CloudStack is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in CloudStack 3.0.x0.)
+			&PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload. &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in &PRODUCT; 3.0.x0.)
 		</para>
 		<para>
 			<emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
 		</para>
 		<para>
-			CloudStack can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
+			&PRODUCT; can manage tens of thousands of servers installed in multiple geographically distributed datacenters. The centralized management server scales linearly, eliminating the need for intermediate cluster-level management servers. No single component failure can cause cloud-wide outage. Periodic maintenance of the management server can be performed without affecting the functioning of virtual machines running in the cloud.
 		</para>
 		<para>
 			<emphasis role="bold">Automatic Configuration Management</emphasis>
 		</para>
-		<para>CloudStack automatically configures each guest virtual machine’s networking and storage settings.
+		<para>&PRODUCT; automatically configures each guest virtual machine’s networking and storage settings.
 		</para>
-		<para>CloudStack internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
+		<para>&PRODUCT; internally manages a pool of virtual appliances to support the cloud itself. These appliances offer services such as firewalling, routing, DHCP, VPN access, console proxy, storage access, and storage replication. The extensive use of virtual appliances simplifies the installation, configuration, and ongoing management of a cloud deployment.
 		</para>
 		<para>
 			<emphasis role="bold">Graphical User Interface</emphasis>
 		</para>
-		<para>CloudStack offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
+		<para>&PRODUCT; offers an administrator's Web interface, used for provisioning and managing the cloud, as well as an end-user's Web interface, used for running VMs and managing VM templates. The UI can be customized to reflect the desired service provider or enterprise look and feel.
 		</para>
 		<para>
 			<emphasis role="bold">API and Extensibility</emphasis>
 		</para>
 		<para>
-			CloudStack provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at http://docs.cloud.com/CloudStack_Documentation.
+			&PRODUCT; provides an API that gives programmatic access to all the management features available in the UI. The API is maintained and documented. This API enables the creation of command line tools and new user interfaces to suit particular needs. See the Developer’s Guide and API Reference, both available at http://docs.cloud.com/CloudStack_Documentation.
 		</para>
 		<para>
-			The CloudStack platform pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (http://docs.cloud.com/CloudStack_Documentation/Allocator_Implementation_Guide).
+			The &PRODUCT; platform pluggable allocation architecture allows the creation of new types of allocators for the selection of storage and Hosts. See the Allocator Implementation Guide (http://docs.cloud.com/CloudStack_Documentation/Allocator_Implementation_Guide).
 		</para>
 		<para>
 			<emphasis role="bold">High Availability</emphasis>
 		</para>
-		<para>The CloudStack platform has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the Hosts, the CloudStack platform supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
+		<para>The &PRODUCT; platform has a number of features to increase the availability of the system. The Management Server itself may be deployed in a multi-node installation where the servers are load balanced. MySQL may be configured to use replication to provide for a manual failover in the event of database loss. For the Hosts, the &PRODUCT; platform supports NIC bonding and the use of separate networks for storage as well as iSCSI Multipath.
 		</para>
-	</section>
\ No newline at end of file
+	</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_installation.xml b/docs/en-US/cloudstack_installation.xml
index c57fc47..7e06dfd 100644
--- a/docs/en-US/cloudstack_installation.xml
+++ b/docs/en-US/cloudstack_installation.xml
@@ -1,12 +1,30 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_system_requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_system_requirements.xml b/docs/en-US/cloudstack_system_requirements.xml
index b8ce043..cff8a67 100644
--- a/docs/en-US/cloudstack_system_requirements.xml
+++ b/docs/en-US/cloudstack_system_requirements.xml
@@ -1,3 +1,21 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 	<section id="cloudstack_system_requirements">
 		<title>Minimum System Requirements</title>
 		<para>
@@ -27,19 +45,18 @@
 			<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 CloudStack, the hypervisor host must not have any VMs already running</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 for CloudStack</para></listitem>
+			<listitem><para>Citrix XenServer Installation for &PRODUCT;</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 for CloudStack.
+				Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with &PRODUCT;. For example, the requirements for XenServer are listed under Citrix XenServer Installation for &PRODUCT;.
 			</para>
 		</warning>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_trial_installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_trial_installation.xml b/docs/en-US/cloudstack_trial_installation.xml
index 084c867..e3cb0c6 100644
--- a/docs/en-US/cloudstack_trial_installation.xml
+++ b/docs/en-US/cloudstack_trial_installation.xml
@@ -1,12 +1,30 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE book 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.
+-->
+
 <book>
 	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="trial-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cloudstack_whatis.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cloudstack_whatis.xml b/docs/en-US/cloudstack_whatis.xml
index 00f010a..a158f8c 100644
--- a/docs/en-US/cloudstack_whatis.xml
+++ b/docs/en-US/cloudstack_whatis.xml
@@ -1,25 +1,32 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 	<section id="cloudstack_whatis">
-		<title>What Is CloudStack?</title>
-		<para>
-			Who Should Read This
-		</para>
-		<para>
-			If you are new to CloudStack or you want to learn more about concepts before installing and running CloudStack, read this overview. 
-			If you just want to get started, you can skip to Overview of Installation Steps.
-			
-		</para>
-		<para>
-			CloudStack is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack to deploy, manage, and configure cloud computing environments.
-			Typical users are service providers and enterprises. With CloudStack, you can:
+		<title>What Is &PRODUCT;?</title>
+		<para>Who Should Read This</para>
+		<para>If you are new to &PRODUCT; or you want to learn more about concepts before installing and running &PRODUCT;, read this overview. If you just want to get started, you can skip to Overview of Installation Steps.</para>
+		<para>&PRODUCT; is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. &PRODUCT; manages the network, storage, and compute nodes that make up a cloud infrastructure. Use &PRODUCT; to deploy, manage, and configure cloud computing environments. Typical users are service providers and enterprises. With &PRODUCT;, you can:
 			<itemizedlist>
 				<listitem>
-			<para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.
-			</para></listitem>
+			<para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.</para></listitem>
 				<listitem>
-				<para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with CloudStack an enterprise can offer self-service virtual machines to users without involving IT departments.
+				<para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with &PRODUCT; an enterprise can offer self-service virtual machines to users without involving IT departments.
 				</para></listitem>
 			</itemizedlist>
-			
 		</para>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml
index e269ab1..d1ba308 100644
--- a/docs/en-US/cluster-add.xml
+++ b/docs/en-US/cluster-add.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <section id="cluster-add">
 	<title>Adding a Cluster</title>
 	<para>TODO</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/compatibility-matrix.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compatibility-matrix.xml b/docs/en-US/compatibility-matrix.xml
index e96be71..ac8e838 100644
--- a/docs/en-US/compatibility-matrix.xml
+++ b/docs/en-US/compatibility-matrix.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="compatibility-matrix">
 	<title>Compatibility Matrix</title>
 			<informaltable>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/compute-disk-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/compute-disk-service-offerings.xml b/docs/en-US/compute-disk-service-offerings.xml
index a5680e4..2469dfe 100644
--- a/docs/en-US/compute-disk-service-offerings.xml
+++ b/docs/en-US/compute-disk-service-offerings.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="compute-disk-service-offerings">
     <title>Compute and Disk Service Offerings</title>
     <para>A service offering is a set of virtual hardware features such as CPU core count and speed, memory, and disk size. The CloudPlatform administrator can set up various offerings, and then end users choose from the available offerings when they create a new VM. A service offering includes the following elements:</para>
@@ -12,7 +31,7 @@
          <listitem><para>How the resource usage is charged</para></listitem>
          <listitem><para>How often the charges are generated</para></listitem>
         </itemizedlist>
-    <para>For example,  one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel® Core™ 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, CloudPlatform emits usage records that can be integrated with billing systems. CloudPlatform separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
+    <para>For example,  one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel Core 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, CloudPlatform emits usage records that can be integrated with billing systems. CloudPlatform separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
     <itemizedlist>
         <listitem><para>Guest CPU</para></listitem>
         <listitem><para>Guest RAM</para></listitem>
@@ -25,5 +44,3 @@
         <listitem><para>Tags on the data disk</para></listitem>
     </itemizedlist>
 </section>
-
-    

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/concepts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/concepts.xml b/docs/en-US/concepts.xml
index 3cd3b72..f49fc3e 100644
--- a/docs/en-US/concepts.xml
+++ b/docs/en-US/concepts.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
+-->
+
 <chapter id="concepts">
 	<title>Concepts</title>
 		<xi:include href="whatis.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml b/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
index 82204df..af7c21b 100644
--- a/docs/en-US/configure-guest-traffic-in-advanced-zone.xml
+++ b/docs/en-US/configure-guest-traffic-in-advanced-zone.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="configure-guest-traffic-in-advanced-zone">
 	<title>Configure Guest Traffic in an Advanced Zone</title>
-	<para>These steps assume you have already logged in to the CloudPlatform UI. To configure the base guest network:</para>
+	<para>These steps assume you have already logged in to the &PRODUCT; UI. To configure the base guest network:</para>
 	<orderedlist>
 		<listitem><para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to which you want to add a network.</para></listitem>
 		<listitem><para>Click the Network tab.</para></listitem>
@@ -20,7 +39,7 @@
 			<listitem><para>Network offering: If the administrator has configured multiple network offerings, select the one you want to use for this network</para></listitem>
 			<listitem><para>Gateway: The gateway that the guests should use</para></listitem>
 			<listitem><para>Netmask: The netmask in use on the subnet the guests will use</para></listitem>
-			<listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that CloudPlatform can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.  If multiple NICs are used, they may be in a different subnet.</para></listitem>
+			<listitem><para>Start IP/End IP: Enter the first and last IP addresses that define a range that &PRODUCT; can assign to guests. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.  If multiple NICs are used, they may be in a different subnet.</para></listitem>
 			<listitem><para>Network Domain: (Optional) If you want to assign a special domain name to this network, specify the DNS suffix.</para></listitem>
 		</itemizedlist>
 		</listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml b/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
index 2420410..8a9fb4a 100644
--- a/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
+++ b/docs/en-US/configure-public-traffic-in-an-advanced-zone.xml
@@ -1,10 +1,9 @@
 <?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;
 ]>
 <section id="configure-public-traffic-in-an-advanced-zone">
     <title>Configure Public Traffic in an Advanced Zone</title>
     <para>In a zone that uses advanced networking, you need to configure at least one range of IP addresses for Internet traffic.</para>
-					
-	</section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-usage-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-usage-server.xml b/docs/en-US/configure-usage-server.xml
index 6097361..55d3908 100644
--- a/docs/en-US/configure-usage-server.xml
+++ b/docs/en-US/configure-usage-server.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="configure-usage-server">
     <title>Configuring the Usage Server</title>
     <para>To configure the usage server:</para>
     <orderedlist>
-        <listitem><para>Be sure the Usage Server has been installed. This requires extra steps beyond just installing the CloudPlatform software. See Installing the Usage Server (Optional) in the Advanced Installation Guide.</para></listitem>
-        <listitem><para>Log in to the CloudPlatform UI as administrator.</para></listitem>
+        <listitem><para>Be sure the Usage Server has been installed. This requires extra steps beyond just installing the &PRODUCT; software. See Installing the Usage Server (Optional) in the Advanced Installation Guide.</para></listitem>
+        <listitem><para>Log in to the &PRODUCT; UI as administrator.</para></listitem>
         <listitem><para>Click Global Settings.</para></listitem>
         <listitem><para>In Search, type usage. Find the configuration parameter that controls the behavior you want to set. See the table below for a description of the available parameters.</para></listitem>
         <listitem><para>In Actions, click the Edit icon.</para></listitem>
@@ -56,13 +75,13 @@ usage.aggregation.timezone = GMT
                 <row>
                     <entry><para>usage.stats.job.aggregation.range</para></entry>
                     <entry><para>The time period in minutes between Usage Server processing jobs. For example, if you set it to 1440, the Usage Server will run once per day. If you set it to 600, it will run every ten hours. In general, when a Usage Server job runs, it processes all events generated since usage was last run.</para>
-                        <para>There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. CloudPlatform assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. CloudPlatform assumes this “midnight to midnight” is relative to the usage.execution.timezone.</para>
+                        <para>There is special handling for the case of 1440 (once per day). In this case the Usage Server does not necessarily process all records since Usage was last run. &PRODUCT; assumes that you require processing once per day for the previous, complete day’s records. For example, if the current day is October 7, then it is assumed you would like to process records for October 6, from midnight to midnight. &PRODUCT; assumes this "midnight to midnight" is relative to the usage.execution.timezone.</para>
                         <para>Default: 1440</para>
                     </entry>                    
                 </row>
                 <row>
                     <entry><para>usage.stats.job.exec.time</para></entry>
-                    <entry><para>The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter “10:30”.</para>
+                    <entry><para>The time when the Usage Server processing will start. It is specified in 24-hour format (HH:MM) in the time zone of the server, which should be GMT. For example, to start the Usage job at 10:30 GMT, enter "10:30".</para>
                     <para>If usage.stats.job.aggregation.range is also set, and its value is not 1440, then its value will be added to usage.stats.job.exec.time to get the time to run the Usage Server job again. This is repeated until 24 hours have elapsed, and the next day's processing begins again at usage.stats.job.exec.time.</para>
                         <para>Default: 00:15.</para>
                     </entry>                    
@@ -79,4 +98,4 @@ usage.aggregation.timezone = GMT
     </itemizedlist>
     <para>With this configuration, the Usage job will run every night at 2 AM EST and will process records for the previous day’s midnight-midnight as defined by the EST (America/New_York) time zone.</para>
     <note><para>Because the special value 1440 has been used for usage.stats.job.aggregation.range, the Usage Server will ignore the data between midnight and 2 AM. That data will be included in the next day's run</para></note>    
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-virtual-router.xml b/docs/en-US/configure-virtual-router.xml
index 7aab6b3..8740c0c 100644
--- a/docs/en-US/configure-virtual-router.xml
+++ b/docs/en-US/configure-virtual-router.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-virtual-router">
     <title>Configuring the Virtual Router</title>
     <para>You can set the following:</para>
@@ -11,7 +30,7 @@
         <listitem><para>Supported network services</para></listitem>
         <listitem><para>Default domain name for the network serviced by the virtual router</para></listitem>
         <listitem><para>Gateway IP address</para></listitem>
-        <listitem><para>How often CloudPlatform fetches network usage statistics from CloudPlatform virtual routers. If you want to collect traffic metering data from the virtual router, set the global configuration parameter router.stats.interval. If you are not using the virtual router to gather network usage statistics, set it to 0.</para></listitem>
+        <listitem><para>How often &PRODUCT; fetches network usage statistics from &PRODUCT; virtual routers. If you want to collect traffic metering data from the virtual router, set the global configuration parameter router.stats.interval. If you are not using the virtual router to gather network usage statistics, set it to 0.</para></listitem>
     </itemizedlist>
     
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4be261f/docs/en-US/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml
index cab25fd..0ab3ef5 100644
--- a/docs/en-US/configure-vpn.xml
+++ b/docs/en-US/configure-vpn.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="configure-vpn">
 	<title>Configuring VPN</title>
 	<para>To set up VPN for the cloud:</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, click Global Settings.</para></listitem>
 		<listitem><para>Set the following global configuration parameters.</para>
 		<itemizedlist>
@@ -17,7 +36,7 @@
 		</itemizedlist></listitem></orderedlist>
 		<para>To enable VPN for a particular network:</para>	
 		<orderedlist>
-			<listitem><para>Log in as a user or administrator to the CloudPlatform UI.</para></listitem>			
+			<listitem><para>Log in as a user or administrator to the &PRODUCT; UI.</para></listitem>			
 			<listitem><para>In the left navigation, click Network.</para></listitem>
 			<listitem><para>Click the name of the network you want to work with.</para></listitem>
 			<listitem><para>Click View IP Addresses.</para></listitem>


Mime
View raw message