incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/3] git commit: fixing licenses for s files
Date Sat, 11 Aug 2012 19:04:33 GMT
fixing licenses for s files


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

Branch: refs/heads/master
Commit: 121bf3a13e8d4db91c61b1f736e1ee97664fa9e9
Parents: 37c1388
Author: Joe Brockmeier <jzb@zonker.net>
Authored: Sat Aug 11 12:01:02 2012 -0700
Committer: John Kinsella <jlk@stratosec.co>
Committed: Sat Aug 11 12:01:02 2012 -0700

----------------------------------------------------------------------
 ...cheduled-maintenance-maintenance-mode-hosts.xml |   23 +++-
 docs/en-US/search-base.xml                         |   71 +++++++----
 docs/en-US/search-user-bind-dn.xml                 |   63 ++++++----
 docs/en-US/secondary-storage-add.xml               |   23 +++-
 .../secondary-storage-outage-and-data-loss.xml     |   25 ++++-
 docs/en-US/secondary-storage-vm.xml                |   34 ++++--
 docs/en-US/secondary-storage.xml                   |   27 ++++-
 docs/en-US/security-groups.xml                     |   21 +++-
 docs/en-US/send-projects-membership-invitation.xml |   30 ++++-
 docs/en-US/service-offerings.xml                   |   23 +++-
 docs/en-US/set-database-buffer-pool-size.xml       |   23 +++-
 .../en-US/set-monitor-total-vm-limits-per-host.xml |   23 +++-
 docs/en-US/set-projects-creator-permissions.xml    |   31 ++++-
 docs/en-US/set-resource-limits-for-projects.xml    |   24 +++-
 docs/en-US/set-up-invitations.xml                  |   38 ++++---
 docs/en-US/set-up-network-for-users.xml            |   24 +++-
 docs/en-US/set-usage-limit.xml                     |   25 ++++-
 docs/en-US/shared-networks.xml                     |   25 +++-
 docs/en-US/signing-api-requests.xml                |   96 +++++++++------
 docs/en-US/site-to-site-vpn.xml                    |   24 +++-
 docs/en-US/snapshot-restore.xml                    |   27 ++++-
 docs/en-US/standard-events.xml                     |   25 +++-
 docs/en-US/static-nat.xml                          |   23 +++-
 .../en-US/sticky-session-policies-for-lb-rules.xml |   27 ++++-
 docs/en-US/stop-restart-management-server.xml      |   23 +++-
 docs/en-US/stopped-vm.xml                          |   45 +++++--
 docs/en-US/stopping-and-starting-vms.xml           |   25 ++++-
 docs/en-US/storage-tags.xml                        |   26 ++++-
 docs/en-US/storage.xml                             |   29 ++++-
 docs/en-US/suspend-project.xml                     |   28 ++++-
 docs/en-US/sys-reliability-and-ha.xml              |   23 +++-
 docs/en-US/sysprep-for-windows-server-2003R2.xml   |   86 ++++++++-----
 docs/en-US/sysprep-windows-server-2008R2.xml       |   30 ++++-
 docs/en-US/system-reserved-ip-addresses.xml        |   29 ++++-
 docs/en-US/system-service-offerings.xml            |   25 ++++-
 docs/en-US/system-vm-template.xml                  |   22 +++-
 36 files changed, 917 insertions(+), 249 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml b/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
index 28769c7..6364e8b 100644
--- a/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
+++ b/docs/en-US/scheduled-maintenance-maintenance-mode-hosts.xml
@@ -1,9 +1,28 @@
 <?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="scheduled-maintenance-maintenance-mode-hosts">
     <title>Scheduled Maintenance and Maintenance Mode for Hosts</title>
     <para>You can place a host into maintenance mode. When maintenance mode is activated, the host becomes unavailable to receive new guest VMs, and the guest VMs already running on the host are seamlessly migrated to another host not in maintenance mode. This migration uses live migration technology and does not interrupt the execution of the guest.</para>
-    </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/search-base.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/search-base.xml b/docs/en-US/search-base.xml
index 3c0d1ef..2584da9 100644
--- a/docs/en-US/search-base.xml
+++ b/docs/en-US/search-base.xml
@@ -1,32 +1,51 @@
 <?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="search-base">
-	<title>Search Base</title>
-	<para>An LDAP query is relative to a given node of the LDAP directory tree, called the search base. The search base is the distinguished name (DN) of a level of the directory tree below which all users can be found. The users can be in the immediate base directory or in some subdirectory. The search base may be equivalent to the organization, group, or domain name. The syntax for writing a DN varies depending on which LDAP server you are using. A full discussion of distinguished names is outside the scope of our documentation. The following table shows some examples of search bases to find users in the testing department..</para>
-		
-						<informaltable>
-							<tgroup cols="2" align="left" colsep="1" rowsep="1">
-							<thead>
-									<row>
-										<entry><para>LDAP Server</para></entry>
-										<entry><para>Example Search Base DN</para></entry>																	
-									</row>
-								</thead>
-								<tbody>
-									<row>
-									<entry><para>ApacheDS</para></entry>
-										<entry><para>ou=testing,o=project</para></entry>									
-									</row>
-									<row>
-										<entry><para>Active Directory</para></entry>
-										<entry><para>OU=testing, DC=company</para></entry>
-									</row>
-								</tbody>
-							</tgroup>
-						</informaltable>
-	
-	
+    <title>Search Base</title>
+<para>An LDAP query is relative to a given node of the LDAP directory tree, called the search base. The search base is the distinguished name (DN) of a level of the directory tree below which all users can be found. The users can be in the immediate base directory or in some subdirectory. The search base may be equivalent to the organization, group, or domain name. The syntax for writing a DN varies depending on which LDAP server you are using. A full discussion of distinguished names is outside the scope of our documentation. The following table shows some examples of search bases to find users in the testing department..</para>
+     
+	<informaltable>
+		<tgroup cols="2" align="left" colsep="1" rowsep="1">
+		<thead>
+			<row>
+				<entry><para>LDAP Server</para></entry>
+				<entry><para>Example Search Base DN</para></entry>																	
+			</row>
+		</thead>
+		<tbody>
+			<row>
+			<entry><para>ApacheDS</para></entry>
+				<entry><para>ou=testing,o=project</para></entry>									
+			</row>
+			<row>
+				<entry><para>Active Directory</para></entry>
+				<entry><para>OU=testing, DC=company</para></entry>
+			</row>
+		</tbody>
+		</tgroup>
+	</informaltable>
+
+
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/search-user-bind-dn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/search-user-bind-dn.xml b/docs/en-US/search-user-bind-dn.xml
index a4c9d4b..4c427cf 100644
--- a/docs/en-US/search-user-bind-dn.xml
+++ b/docs/en-US/search-user-bind-dn.xml
@@ -1,28 +1,47 @@
 <?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="search-user-bind-dn">
 	<title>Search User Bind DN</title>
-	<para>The bind DN is the user on the external LDAP server permitted to search the LDAP directory within the defined search base. When the DN is returned, the DN and passed password are used to authenticate the CloudPlatform user with an LDAP bind. A full discussion of bind DNs is outside the scope of our documentation. The following table shows some examples of bind DNs.</para>
-							<informaltable>
-							<tgroup cols="2" align="left" colsep="1" rowsep="1">
-							<thead>
-									<row>
-										<entry><para>LDAP Server</para></entry>
-										<entry><para>Example Bind DN</para></entry>																	
-									</row>
-								</thead>
-								<tbody>
-									<row>
-										<entry><para>ApacheDS</para></entry>
-										<entry><para>cn=Administrator,dc=testing,ou=project,ou=org</para></entry>									
-									</row>
-									<row>
-										<entry><para>Active Directory</para></entry>
-										<entry><para>CN=Administrator, OU=testing, DC=company, DC=com</para></entry></row>
-								</tbody>
-							</tgroup>
-						</informaltable>
-	</section>
+	<para>The bind DN is the user on the external LDAP server permitted to search the LDAP directory within the defined search base. When the DN is returned, the DN and passed password are used to authenticate the &PRODUCT; user with an LDAP bind. A full discussion of bind DNs is outside the scope of our documentation. The following table shows some examples of bind DNs.</para>
+	<informaltable>
+	<tgroup cols="2" align="left" colsep="1" rowsep="1">
+	<thead>
+		<row>
+			<entry><para>LDAP Server</para></entry>
+			<entry><para>Example Bind DN</para></entry>
+		</row>
+	</thead>
+	<tbody>
+		<row>
+			<entry><para>ApacheDS</para></entry>
+			<entry><para>cn=Administrator,dc=testing,ou=project,ou=org</para></entry>
+		</row>
+		<row>
+			<entry><para>Active Directory</para></entry>
+			<entry><para>CN=Administrator, OU=testing, DC=company, DC=com</para></entry></row>
+	</tbody>
+	</tgroup>
+	</informaltable>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/secondary-storage-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage-add.xml b/docs/en-US/secondary-storage-add.xml
index b17b998..060c899 100644
--- a/docs/en-US/secondary-storage-add.xml
+++ b/docs/en-US/secondary-storage-add.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 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="secondary-storage-add">
 	<title>Adding Secondary Storage</title>
 	<para>TODO</para>
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/secondary-storage-outage-and-data-loss.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage-outage-and-data-loss.xml b/docs/en-US/secondary-storage-outage-and-data-loss.xml
index f651310..42ab7d4 100644
--- a/docs/en-US/secondary-storage-outage-and-data-loss.xml
+++ b/docs/en-US/secondary-storage-outage-and-data-loss.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="secondary-storage-outage-and-data-loss">
     <title>Secondary Storage Outage and Data Loss</title>
     <para>For a Zone that has only one secondary storage server, a secondary storage outage will have feature level impact to the system but will not impact running guest VMs. It may become impossible to create a VM with the selected template for a user. A user may also not be able to save snapshots or examine/restore saved snapshots. These features will automatically be available when the secondary storage comes back online.</para>
-    <para>Secondary storage data loss will impact recently added user data including templates, snapshots, and ISO images. Secondary storage should be backed up periodically.Multiple secondary storage servers can be provisioned within each zone to increase the scalability of the system.</para>
-   </section>
+    <para>Secondary storage data loss will impact recently added user data including templates, snapshots, and ISO images. Secondary storage should be backed up periodically. Multiple secondary storage servers can be provisioned within each zone to increase the scalability of the system.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/secondary-storage-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage-vm.xml b/docs/en-US/secondary-storage-vm.xml
index 40c8a27..7926444 100644
--- a/docs/en-US/secondary-storage-vm.xml
+++ b/docs/en-US/secondary-storage-vm.xml
@@ -1,14 +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="secondary-storage-vm">
-     <title>Secondary Storage VM</title>
-        <para>In addition to the hosts, CloudPlatform’s Secondary Storage VM mounts and writes to secondary storage.</para>
-        <para>Submissions to secondary storage go through the Secondary Storage VM.  The Secondary Storage VM can retrieve templates and ISO images from URLs using a variety of protocols.</para>
-   <para> The secondary storage VM provides a background task that takes care of a variety of secondary storage activities: downloading a new template to a Zone, copying templates between Zones, and snapshot backups.</para>
-    <para>The administrator can log in to the secondary storage VM if needed. </para>
-    
-  	</section>
+    <title>Secondary Storage VM</title>
+        <para>In addition to the hosts, &PRODUCT;’s Secondary Storage VM mounts and writes to secondary storage.</para>
+        <para>Submissions to secondary storage go through the Secondary Storage VM. The Secondary Storage VM can retrieve templates and ISO images from URLs using a variety of protocols.</para>
+        <para>The secondary storage VM provides a background task that takes care of a variety of secondary storage activities: downloading a new template to a Zone, copying templates between Zones, and snapshot backups.</para>
+        <para>The administrator can log in to the secondary storage VM if needed.</para>
+</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/secondary-storage.xml b/docs/en-US/secondary-storage.xml
index 4d6191e..e755b56 100644
--- a/docs/en-US/secondary-storage.xml
+++ b/docs/en-US/secondary-storage.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="secondary-storage">
-		<title>Secondary Storage</title>
-    <para>This section gives concepts and technical details about CloudPlatform secondary storage. For information about how to install and configure secondary storage through the CloudPlatform UI, see the Advanced Installation Guide.</para>
-	</section>
+    <title>Secondary Storage</title>
+        <para>This section gives concepts and technical details about &PRODUCT; secondary storage. For information about how to install and configure secondary storage through the &PRODUCT; UI, see the Advanced Installation Guide.</para>
+</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/security-groups.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/security-groups.xml b/docs/en-US/security-groups.xml
index 3c1ae91..fdb4ee9 100644
--- a/docs/en-US/security-groups.xml
+++ b/docs/en-US/security-groups.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="security-groups">
     <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="enable-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/send-projects-membership-invitation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/send-projects-membership-invitation.xml b/docs/en-US/send-projects-membership-invitation.xml
index 67abf33..164235f 100644
--- a/docs/en-US/send-projects-membership-invitation.xml
+++ b/docs/en-US/send-projects-membership-invitation.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="send-projects-membership-invitation">
     <title>Sending Project Membership Invitations</title>
     <para>Use these steps to add a new member to a project if the invitations feature is enabled in the cloud as described in <xref linkend="set-up-invitations"/>. If the invitations feature is not turned on, use the procedure in Adding Project Members From the UI.</para>
   <orderedlist>
-      <listitem><para>Log in to the CloudPlatform UI.</para></listitem>
+      <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
       <listitem><para>In the left navigation, click Projects.</para></listitem>
       <listitem><para>In Select View, choose Projects.</para></listitem>
       <listitem><para>Click the name of the project you want to work with.</para></listitem>
@@ -15,10 +34,9 @@
       <listitem><para>In Add by, select one of the following:</para>
       <orderedlist>
           <listitem><para>Account – The invitation will appear in the user’s Invitations tab in the Project View. See Using the Project View.</para></listitem>
-          <listitem><para>Email – The invitation will be sent to the user’s email address. Each emailed invitation includes a unique code called a token which the recipient will provide back to CloudPlatform when accepting the invitation. Email invitations will work only if the global parameters related to the SMTP server have been set. See <xref linkend="set-up-invitations"/>.</para></listitem>
+          <listitem><para>Email – The invitation will be sent to the user’s email address. Each emailed invitation includes a unique code called a token which the recipient will provide back to &PRODUCT; when accepting the invitation. Email invitations will work only if the global parameters related to the SMTP server have been set. See <xref linkend="set-up-invitations"/>.</para></listitem>
       </orderedlist></listitem>
-      <listitem><para>Type the user name or email address of the new member you want to add, and click Invite. Type the CloudPlatform user name if you chose Account in the previous step. If you chose Email, type the email address. You can invite only people who have an account in this cloud within the same domain as the project. However, you can send the invitation to any email address.</para></listitem>
+      <listitem><para>Type the user name or email address of the new member you want to add, and click Invite. Type the &PRODUCT; user name if you chose Account in the previous step. If you chose Email, type the email address. You can invite only people who have an account in this cloud within the same domain as the project. However, you can send the invitation to any email address.</para></listitem>
       <listitem><para>To view and manage the invitations you have sent, return to this tab. When an invitation is accepted, the new member will appear in the project’s Accounts tab.</para></listitem>
    </orderedlist>
-   </section>
-      
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/service-offerings.xml b/docs/en-US/service-offerings.xml
index 8af653b..5283c05 100644
--- a/docs/en-US/service-offerings.xml
+++ b/docs/en-US/service-offerings.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="service-offerings">
     <title>Service Offerings</title>
     <para><xref linkend="set-up-network-for-users" />vCenter Maintenance Mode</para>
     <para><xref linkend="about-virtual-networks" />XenServer and Maintenance Mode</para>
     <para><xref linkend="customizing-dns" />vCenter Maintenance Mode</para>
     <para><xref linkend="stop-start-management-server" />XenServer and Maintenance Mode</para>
-   </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-database-buffer-pool-size.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-database-buffer-pool-size.xml b/docs/en-US/set-database-buffer-pool-size.xml
index 3fc439b..1c75031 100644
--- a/docs/en-US/set-database-buffer-pool-size.xml
+++ b/docs/en-US/set-database-buffer-pool-size.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="set-database-buffer-pool-size">
     <title>Set Database Buffer Pool Size</title>
     <para>It is important to provide enough memory space for the MySQL database to cache data and indexes:</para>
     <orderedlist>
         <listitem><para>Edit the Tomcat configuration file:</para><programlisting>/etc/my.cnf</programlisting></listitem>
-        <listitem><para>2.	Insert the following line in the [mysqld] section, below the datadir line. Use a value that is appropriate for your situation. We recommend setting the buffer pool at 40% of RAM if MySQL is on the same server as the management server or 70% of RAM if MySQL has a dedicated server. The following example assumes a dedicated server with 1024M of RAM.</para>
+        <listitem><para>Insert the following line in the [mysqld] section, below the datadir line. Use a value that is appropriate for your situation. We recommend setting the buffer pool at 40% of RAM if MySQL is on the same server as the management server or 70% of RAM if MySQL has a dedicated server. The following example assumes a dedicated server with 1024M of RAM.</para>
             <programlisting>innodb_buffer_pool_size=700M</programlisting></listitem>
         <listitem><para>Restart the MySQL service.</para><programlisting># service mysqld restart</programlisting></listitem>
       </orderedlist>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-monitor-total-vm-limits-per-host.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-monitor-total-vm-limits-per-host.xml b/docs/en-US/set-monitor-total-vm-limits-per-host.xml
index 806ba33..c11b956 100644
--- a/docs/en-US/set-monitor-total-vm-limits-per-host.xml
+++ b/docs/en-US/set-monitor-total-vm-limits-per-host.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="set-monitor-total-vm-limits-per-host">
     <title>Set and Monitor Total VM Limits per Host</title>
-    <para>The CloudPlatform administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use CloudPlatform global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches t
 his number of VMs, use the CloudPlatform UI to disable allocation of more VMs to the cluster.</para>
+	<para>The &PRODUCT; administrator should monitor the total number of VM instances in each cluster, and disable allocation to the cluster if the total is approaching the maximum that the hypervisor can handle. Be sure to leave a safety margin to allow for the possibility of one or more hosts failing, which would increase the VM load on the other hosts as the VMs are automatically redeployed. Consult the documentation for your chosen hypervisor to find the maximum permitted number of VMs per host, then use &PRODUCT; global configuration settings to set this as the default limit. Monitor the VM activity in each cluster at all times. Keep the total number of VMs below a safe level that allows for the occasional host failure. For example, if there are N hosts in the cluster, and you want to allow for one host in the cluster to be down at any given time, the total number of VM instances you can permit in the cluster is at most (N-1) * (per-host-limit). Once a cluster reaches this number 
 of VMs, use the &PRODUCT; UI to disable allocation of more VMs to the cluster.</para>
 </section>
       

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-projects-creator-permissions.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-projects-creator-permissions.xml b/docs/en-US/set-projects-creator-permissions.xml
index bc00802..1d9309f 100644
--- a/docs/en-US/set-projects-creator-permissions.xml
+++ b/docs/en-US/set-projects-creator-permissions.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="set-projects-creator-permissions">
     <title>Setting Project Creator Permissions</title>
-    <para>You can configure CloudPlatform to allow any user to create a new project, or you can restrict that ability to just CloudPlatform administrators.</para>
+    <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators.</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 Global Settings.</para></listitem>
         <listitem><para>In the search box, type allow.user.create.projects.</para></listitem>
         <listitem><para>Click the edit button to set the parameter. <inlinemediaobject>
@@ -20,11 +39,9 @@
                 <tbody>
                     <row>
                         <entry><para>allow.user.create.projects</para></entry>
-                        <entry><para>Set to true to allow end users to create projects. Set to false if you want only the CloudPlatform root administrator and domain administrators to create projects.</para></entry>
-                                                
+                        <entry><para>Set to true to allow end users to create projects. Set to false if you want only the &PRODUCT; root administrator and domain administrators to create projects.</para></entry>
                     </row>
                 </tbody></tgroup></informaltable></listitem>
         <listitem><para>Restart the Management Server.</para><programlisting># service cloud-management restart</programlisting></listitem>
     </orderedlist>
-   </section>
-      
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-resource-limits-for-projects.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-resource-limits-for-projects.xml b/docs/en-US/set-resource-limits-for-projects.xml
index f9b57a8..2c331ac 100644
--- a/docs/en-US/set-resource-limits-for-projects.xml
+++ b/docs/en-US/set-resource-limits-for-projects.xml
@@ -1,10 +1,28 @@
 <?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="set-resource-limits-for-projects">
     <title>Setting Resource Limits for Projects</title>
-    <para>The CloudPlatform administrator can set global default limits to control the amount of resources that can be owned by each project  in the cloud. This serves to prevent uncontrolled usage of resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators can override these resource limits for individual projects with their domains, as long as the new limits are below the global defaults set by the CloudPlatform root administrator. The root administrator can also set lower resource limits for any project in the cloud</para>
+    <para>The &PRODUCT; administrator can set global default limits to control the amount of resources that can be owned by each project  in the cloud. This serves to prevent uncontrolled usage of resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators can override these resource limits for individual projects with their domains, as long as the new limits are below the global defaults set by the &PRODUCT; root administrator. The root administrator can also set lower resource limits for any project in the cloud</para>
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-up-invitations.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-up-invitations.xml b/docs/en-US/set-up-invitations.xml
index bc7b21a..e6a22db 100644
--- a/docs/en-US/set-up-invitations.xml
+++ b/docs/en-US/set-up-invitations.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="set-up-invitations">
     <title>Setting Up Invitations</title>
-    <para>CloudPlatform can be set up either so that project administrators can add people directly to a project, or so that it is necessary to send an invitation which the recipient must accept. The invitation can be sent by email or through the user’s CloudPlatform account. If you want administrators to use invitations to add members to projects, turn on and set up the invitations feature in CloudPlatform..</para>
+    <para>&PRODUCT; can be set up either so that project administrators can add people directly to a project, or so that it is necessary to send an invitation which the recipient must accept. The invitation can be sent by email or through the user’s &PRODUCT; account. If you want administrators to use invitations to add members to projects, turn on and set up the invitations feature in &PRODUCT;.</para>
     <itemizedlist>
-        <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 Global Settings.</para></listitem>
         <listitem><para>In the search box, type project and click the search button.</para></listitem>
         <listitem><para>In the search box, type project and click the search button.<inlinemediaobject>
@@ -16,48 +35,39 @@
             </imageobject>
             <textobject><phrase>searchbutton.png: Searches projects</phrase></textobject>
         </inlinemediaobject></para></listitem>
-        <listitem><para>5.	In the search results, you will see a few other parameters you need to set to control how invitations behave. The table below shows global configuration parameters related to project invitations. Click the edit button to set each parameter</para>
+        <listitem><para>In the search results, you will see a few other parameters you need to set to control how invitations behave. The table below shows global configuration parameters related to project invitations. Click the edit button to set each parameter</para>
             <informaltable>
                 <tgroup cols="2" align="left" colsep="1" rowsep="1">
                     <thead>
                         <row>
                             <entry><para>Configuration Parameters</para></entry>
                             <entry><para>Description</para></entry>
-                            
-                            
                         </row>
                         </thead>
                         <tbody>
                         <row>
                             <entry><para>project.invite.required</para></entry>
                             <entry><para>Set to true to turn on the invitations feature.</para></entry>
-                            
-                            
                         </row>
                         <row>
                             <entry><para>project.email.sender</para></entry>
                             <entry><para>The email address to show in the From field of invitation emails.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.invite.timeout</para></entry>
                             <entry><para>Amount of time to allow for a new member to respond to the invitation.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.smtp.host</para></entry>
                             <entry><para>Name of the host that acts as an email server to handle invitations.</para></entry>
-                            
                         </row>
                         <row>
                             <entry><para>project.smtp.password</para></entry>
                             <entry><para>(Optional) Password required by the SMTP server. You must also set project.smtp.username and set project.smtp.useAuth to true.</para></entry>
-                                
                             </row>
                             <row>
                                 <entry><para>project.smtp.port</para></entry>
                                 <entry><para>SMTP server’s listening port.</para></entry>
-                                
                             </row>
                             <row>
                                 <entry><para>project.smtp.useAuth</para></entry>
@@ -74,6 +84,4 @@
         <listitem><para>Restart the Management Server</para>
         <programlisting>service cloud-management restart</programlisting></listitem>
     </itemizedlist>
-    
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-up-network-for-users.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-up-network-for-users.xml b/docs/en-US/set-up-network-for-users.xml
index bc8902f..4e2be48 100644
--- a/docs/en-US/set-up-network-for-users.xml
+++ b/docs/en-US/set-up-network-for-users.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="set-up-network-for-users">
     <title>Setting Up Networking for Users</title>
-    <para>People using cloud infrastructure have a variety of needs and preferences when it comes to the networking services provided by the cloud. As a CloudPlatform administrator, you can do the following things to set up networking for your users:</para>
+    <para>People using cloud infrastructure have a variety of needs and preferences when it comes to the networking services provided by the cloud. As a &PRODUCT; administrator, you can do the following things to set up networking for your users:</para>
     <itemizedlist>
         <listitem><para>Set up physical networks in zones</para></listitem>
         <listitem><para>Set up several different providers for the same service on a single physical network (for example, both Cisco and Juniper firewalls)</para></listitem>
@@ -13,5 +32,4 @@
         <listitem><para>Add new network offerings as time goes on so end users can upgrade to a better class of service on their network</para></listitem>
         <listitem><para>Provide more ways for a network to be accessed by a user, such as through a project of which the user is a member </para></listitem>
     </itemizedlist>
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/set-usage-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/set-usage-limit.xml b/docs/en-US/set-usage-limit.xml
index 350d5c4..3ef528a 100644
--- a/docs/en-US/set-usage-limit.xml
+++ b/docs/en-US/set-usage-limit.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="set-usage-limit">
     <title>Setting Usage Limits</title>
-    <para>CloudPlatform provides several administrator control points for capping resource usage by users. Some of these limits are global configuration parameters. Others are applied at the ROOT domain and may be overridden on a per-account basis.</para>
+    <para>&PRODUCT; provides several administrator control points for capping resource usage by users. Some of these limits are global configuration parameters. Others are applied at the ROOT domain and may be overridden on a per-account basis.</para>
     <para>Aggregate limits may be set on a per-domain basis.  For example, you may limit a domain and all subdomains to the creation of 100 VMs.</para>
     <para>This section covers the following topics:</para>
     <para><xref linkend="globally-configured-limit" />Globally Configured Limits</para>
     <para><xref linkend="default-account-resource-limit" />Default Account Resource Limits</para>
     <para><xref linkend="per-domain-limits" />Per Domain Limits</para>
-   </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/shared-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/shared-networks.xml b/docs/en-US/shared-networks.xml
index 24e0252..d505fed 100644
--- a/docs/en-US/shared-networks.xml
+++ b/docs/en-US/shared-networks.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="shared-networks">
     <title>Shared Networks</title>
-    <para>A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished using techniques such as security groups (supported only in basic zones in CloudPlatform 3.0.3).</para>
+    <para>A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished using techniques such as security groups (supported only in basic zones in &PRODUCT; 3.0.3).</para>
     <itemizedlist>
         <listitem><para>Shared Networks are created by the administrator</para></listitem>
         <listitem><para>Shared Networks can be designated to a certain domain</para></listitem>
@@ -13,6 +32,4 @@
         <listitem><para>Shared Networks are isolated by security groups</para></listitem>
         <listitem><para>Public Network is a shared network that is not shown to the end users</para></listitem>
         </itemizedlist>
-    
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/signing-api-requests.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/signing-api-requests.xml b/docs/en-US/signing-api-requests.xml
index b71cd42..b992206 100644
--- a/docs/en-US/signing-api-requests.xml
+++ b/docs/en-US/signing-api-requests.xml
@@ -1,36 +1,60 @@
-	<section id="signing-api-requests">
-		<title>Signing API Requests</title>
-		<para>Whether you access the CloudStack API with HTTP or HTTPS, it must still be signed so that CloudStack can verify the caller has been authenticated and authorized to execute the command.  Make sure that you have both the API Key and Secret Key provided by the CloudStack administrator for your account before proceeding with the signing process.</para>
-		<para>To show how to sign a request, we will re-use the previous example.</para>
-		<programlisting>http://http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
-		<para>Breaking this down, we have several distinct parts to this URL.</para>
-		<itemizedlist>
-			<listitem><para>Base URL: This is the base URL to the CloudStack Management Server.</para>
-				<programlisting>http://localhost:8080</programlisting>
-			</listitem>
-			<listitem><para>API Path: This is the path to the API Servlet that processes the incoming requests.</para>
-				<programlisting>/client/api?</programlisting>
-			</listitem>
-			<listitem><para>Command String: This part of the query string comprises of the command, its parameters, and the API Key that identifies the account.</para>
-				<note><para>As with all query string parameters of field-value pairs, the “field” component is case insensitive while all “value” values are case sensitive.</para></note>
-				<programlisting>command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ</programlisting>
-			</listitem>
-			<listitem><para>Signature: This is the hashed signature of the Base URL that is generated using a combination of the user’s Secret Key and the HMAC SHA-1 hashing algorithm.</para>
-				<para>&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</para>
-			</listitem>
-		</itemizedlist>
-		<para>Every API request has the format Base URL+API Path+Command String+Signature.</para>
-		<para>To generate the signature.</para>
-		<orderedlist>
-			<listitem><para>For each field-value pair (as separated by a ‘&amp;’) in the Command String, URL encode each value so that it can be safely sent via HTTP GET.</para>
-				<note><para>Make sure all spaces are encoded as “%20” rather than “+”.</para></note>
-			</listitem>
-			<listitem><para>Lower case the entire Command String and sort it alphabetically via the field for each field-value pair.  The result of this step would look like the following.</para>
-				<programlisting>apikey=mivr6x7u6bn_sdahobpjnejpgest35exq-jb8cg20yi3yaxxcgpyuairmfi_ejtvwz0nukkjbpmy3y2bcikwfq&amp;command=deployvirtualmachine&amp;diskofferingid=1&amp;serviceofferingid=1&amp;templateid=2&amp;zoneid=4</programlisting>
-			</listitem>
-			<listitem><para>Take the sorted Command String and run it through the HMAC SHA-1 hashing algorithm (most programming languages offer a utility method to do this) with the user’s Secret Key.  Base64 encode the resulting byte array in UTF-8 so that it can be safely transmitted via HTTP.  The final string produced after Base64 encoding should be “Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D”.</para>
-				<para>By reconstructing the final URL in the format Base URL+API Path+Command String+Signature, the final URL should look like:</para>
-				<programlisting>http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
-			</listitem>
-		</orderedlist>
-	</section>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="signing-api-requests">
+	<title>Signing API Requests</title>
+	<para>Whether you access the CloudStack API with HTTP or HTTPS, it must still be signed so that CloudStack can verify the caller has been authenticated and authorized to execute the command.  Make sure that you have both the API Key and Secret Key provided by the CloudStack administrator for your account before proceeding with the signing process.</para>
+	<para>To show how to sign a request, we will re-use the previous example.</para>
+	<programlisting>http://http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+	<para>Breaking this down, we have several distinct parts to this URL.</para>
+	<itemizedlist>
+		<listitem><para>Base URL: This is the base URL to the CloudStack Management Server.</para>
+			<programlisting>http://localhost:8080</programlisting>
+		</listitem>
+		<listitem><para>API Path: This is the path to the API Servlet that processes the incoming requests.</para>
+			<programlisting>/client/api?</programlisting>
+		</listitem>
+		<listitem><para>Command String: This part of the query string comprises of the command, its parameters, and the API Key that identifies the account.</para>
+			<note><para>As with all query string parameters of field-value pairs, the "field" component is case insensitive while all "value" values are case sensitive.</para></note>
+			<programlisting>command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ</programlisting>
+		</listitem>
+		<listitem><para>Signature: This is the hashed signature of the Base URL that is generated using a combination of the user’s Secret Key and the HMAC SHA-1 hashing algorithm.</para>
+			<para>&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</para>
+		</listitem>
+	</itemizedlist>
+	<para>Every API request has the format Base URL+API Path+Command String+Signature.</para>
+	<para>To generate the signature.</para>
+	<orderedlist>
+		<listitem><para>For each field-value pair (as separated by a '&amp;') in the Command String, URL encode each value so that it can be safely sent via HTTP GET.</para>
+			<note><para>Make sure all spaces are encoded as "%20" rather than "+".</para></note>
+		</listitem>
+		<listitem><para>Lower case the entire Command String and sort it alphabetically via the field for each field-value pair.  The result of this step would look like the following.</para>
+			<programlisting>apikey=mivr6x7u6bn_sdahobpjnejpgest35exq-jb8cg20yi3yaxxcgpyuairmfi_ejtvwz0nukkjbpmy3y2bcikwfq&amp;command=deployvirtualmachine&amp;diskofferingid=1&amp;serviceofferingid=1&amp;templateid=2&amp;zoneid=4</programlisting>
+		</listitem>
+		<listitem><para>Take the sorted Command String and run it through the HMAC SHA-1 hashing algorithm (most programming languages offer a utility method to do this) with the user’s Secret Key.  Base64 encode the resulting byte array in UTF-8 so that it can be safely transmitted via HTTP.  The final string produced after Base64 encoding should be "Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D".</para>
+			<para>By reconstructing the final URL in the format Base URL+API Path+Command String+Signature, the final URL should look like:</para>
+			<programlisting>http://localhost:8080/client/api?command=deployVirtualMachine&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=2&amp;zoneId=4&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
+		</listitem>
+	</orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/site-to-site-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/site-to-site-vpn.xml b/docs/en-US/site-to-site-vpn.xml
index 2e29909..034fb42 100644
--- a/docs/en-US/site-to-site-vpn.xml
+++ b/docs/en-US/site-to-site-vpn.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="site-to-site-vpn">
     <title>Site-to-Site VPN</title>
     <para></para>
     <para>To add a Virtual Private Cloud (VPC):</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, choose Network</para></listitem>
         <listitem><para>In the Select view, select site-to-site VPN.</para></listitem>
         <listitem><para>Click Add site-to-site VPN. Provide the following information:</para>
@@ -23,5 +42,4 @@
             </itemizedlist></listitem>
         <listitem><para>Click OK.</para></listitem>
     </orderedlist>
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/snapshot-restore.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/snapshot-restore.xml b/docs/en-US/snapshot-restore.xml
index 2a63f1f..b2f60f4 100644
--- a/docs/en-US/snapshot-restore.xml
+++ b/docs/en-US/snapshot-restore.xml
@@ -1,9 +1,28 @@
 <?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="snapshot-restore">
-	<title>Snapshot Restore</title>
-	<para>There are two paths to restoring snapshots. Users can create a volume from the snapshot. The volume can then be mounted to a VM and files recovered as needed. Alternatively, a template may be created from the snapshot of a root disk. The user can then boot a VM from this template to effect recovery of the root disk.</para>
-	</section>
+    <title>Snapshot Restore</title>
+        <para>There are two paths to restoring snapshots. Users can create a volume from the snapshot. The volume can then be mounted to a VM and files recovered as needed. Alternatively, a template may be created from the snapshot of a root disk. The user can then boot a VM from this template to effect recovery of the root disk.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/standard-events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/standard-events.xml b/docs/en-US/standard-events.xml
index 290b8bc..b4a4c68 100644
--- a/docs/en-US/standard-events.xml
+++ b/docs/en-US/standard-events.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="standard-events">
     <title>Standard Events</title>
     <para>The events log records three types of standard events.</para>
@@ -17,6 +36,4 @@
         </listitem>
         <listitem><para>ERROR. This event is generated when an operation has not been successfully performed</para></listitem>
     </itemizedlist>
- 
-	</section>
-
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/static-nat.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/static-nat.xml b/docs/en-US/static-nat.xml
index ea7c7d8..ef9e2fc 100644
--- a/docs/en-US/static-nat.xml
+++ b/docs/en-US/static-nat.xml
@@ -1,9 +1,28 @@
 <?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="static-nat">
     <title>Static NAT</title>
-    <para>A static NAT rule maps a public IP address to the private IP address of a VM in order to allow Internet traffic into the VM. The public IP address always remains the same, which is why it is called “static” NAT. This section tells how to enable or disable static NAT for a particular IP address.</para>
+    <para>A static NAT rule maps a public IP address to the private IP address of a VM in order to allow Internet traffic into the VM. The public IP address always remains the same, which is why it is called "static" NAT. This section tells how to enable or disable static NAT for a particular IP address.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/sticky-session-policies-for-lb-rules.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sticky-session-policies-for-lb-rules.xml b/docs/en-US/sticky-session-policies-for-lb-rules.xml
index a8c11c9..972a195 100644
--- a/docs/en-US/sticky-session-policies-for-lb-rules.xml
+++ b/docs/en-US/sticky-session-policies-for-lb-rules.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="sticky-session-policies-for-lb-rules">
 	<title>Sticky Session Policies for Load Balancer Rules</title>
-	<para>Sticky sessions are used in Web-based applications to ensure continued availability of information across the multiple requests in a user's session. For example, if a shopper is filling a cart, you need to remember what has been purchased so far. The concept of “stickiness” is also referred to as persistence or maintaining state.</para>
-	<para>Any load balancer rule defined in CloudPlatform can have a stickiness policy. The policy consists of a name, stickiness method, and parameters. The parameters are name-value pairs or flags, which are defined by the load balancer vendor. The stickiness method could be load balancer-generated cookie, application-generated cookie, or source-based. In the source-based method, the source IP address is used to identify the user and locate the user’s stored data. In the other methods, cookies are used. The cookie generated by the load balancer or application is included in request and response URLs to create persistence.  The cookie name can be specified by the administrator or automatically generated. A variety of options are provided to control the exact behavior of cookies, such as how they are generated and whether they are cached.</para>
-	<para>For the most up to date list of available stickiness methods, see the CloudPlatform UI or call listNetworks and check the SupportedStickinessMethods capability.</para>
+	<para>Sticky sessions are used in Web-based applications to ensure continued availability of information across the multiple requests in a user's session. For example, if a shopper is filling a cart, you need to remember what has been purchased so far. The concept of "stickiness" is also referred to as persistence or maintaining state.</para>
+	<para>Any load balancer rule defined in &PRODUCT; can have a stickiness policy. The policy consists of a name, stickiness method, and parameters. The parameters are name-value pairs or flags, which are defined by the load balancer vendor. The stickiness method could be load balancer-generated cookie, application-generated cookie, or source-based. In the source-based method, the source IP address is used to identify the user and locate the user’s stored data. In the other methods, cookies are used. The cookie generated by the load balancer or application is included in request and response URLs to create persistence.  The cookie name can be specified by the administrator or automatically generated. A variety of options are provided to control the exact behavior of cookies, such as how they are generated and whether they are cached.</para>
+	<para>For the most up to date list of available stickiness methods, see the &PRODUCT; UI or call listNetworks and check the SupportedStickinessMethods capability.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/stop-restart-management-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/stop-restart-management-server.xml b/docs/en-US/stop-restart-management-server.xml
index 26d30ea..2edc233 100644
--- a/docs/en-US/stop-restart-management-server.xml
+++ b/docs/en-US/stop-restart-management-server.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="stop-restart-management-server">
     <title>Stopping and Restarting the Management Server</title>
     <para>The root administrator will need to stop and restart the Management Server from time to time.</para>
-    <para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud..</para>
+    <para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud.</para>
     <para>To stop the Management Server, issue the following command at the operating system prompt on the Management Server node:</para>
     <programlisting># service cloud-management stop</programlisting>
     <para>To start the Management Server:</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/stopped-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/stopped-vm.xml b/docs/en-US/stopped-vm.xml
index e6b8400..0983142 100644
--- a/docs/en-US/stopped-vm.xml
+++ b/docs/en-US/stopped-vm.xml
@@ -1,12 +1,35 @@
-	<section id="stopped-vm">
-		<title>Stopped VM</title>
-		<para>CloudPlatform now supports creating a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A VM can now be deployed in two ways: create and start a VM (the default method); or create a VM and leave it in the stopped state.</para>
-		<para>A new request parameter, startVM, is introduced in the deployVm API to support the stopped VM feature.</para>
-		<para>The possible values are:</para>
-		<itemizedlist>
-			<listitem><para>true - The VM starts as a part of the VM deployment.</para></listitem>
-			<listitem><para>false - The VM is left in the stopped state at the end of the VM deployment.</para></listitem>
-		</itemizedlist>
-		<para>The default value is true.</para>
-	</section>
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
 
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="stopped-vm">
+	<title>Stopped VM</title>
+	<para>&PRODUCT; now supports creating a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A VM can now be deployed in two ways: create and start a VM (the default method); or create a VM and leave it in the stopped state.</para>
+	<para>A new request parameter, startVM, is introduced in the deployVm API to support the stopped VM feature.</para>
+	<para>The possible values are:</para>
+	<itemizedlist>
+		<listitem><para>true - The VM starts as a part of the VM deployment.</para></listitem>
+		<listitem><para>false - The VM is left in the stopped state at the end of the VM deployment.</para></listitem>
+	</itemizedlist>
+	<para>The default value is true.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/stopping-and-starting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/stopping-and-starting-vms.xml b/docs/en-US/stopping-and-starting-vms.xml
index 20d0d95..845260e 100644
--- a/docs/en-US/stopping-and-starting-vms.xml
+++ b/docs/en-US/stopping-and-starting-vms.xml
@@ -1,5 +1,28 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="stopping-and-starting-vms">
 	<title>Stopping and Starting VMs</title>
 	<para>Any user can access their own virtual machines. The administrator can access all VMs running in the cloud.</para>
 </section>
-


Mime
View raw message