http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/storage-tags.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/storage-tags.xml b/docs/en-US/storage-tags.xml
index 3297c8d..6d18c90 100644
--- a/docs/en-US/storage-tags.xml
+++ b/docs/en-US/storage-tags.xml
@@ -1,11 +1,29 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="storage-tags">
        <title>Storage Tags</title>
-       <para>Storage may be "tagged".  A tag is a text string attribute 
associated with primary storage, a Disk Offering, or a Service Offering.  Tags 
allow administrators to provide additional information about the storage.  For 
example, that is a "SSD" or it is "slow".  Tags are not interpreted by 
CloudPlatform.  They are matched against tags placed on service and disk 
offerings.  CloudPlatform requires all tags on service and disk offerings to 
exist on the primary storage before it allocates root or data disks on the 
primary storage. Service and disk offering tags are used to identify the 
requirements of the storage that those offerings have.   For example, the high 
end service offering may require "fast" for its root disk volume.</para>
+       <para>Storage may be "tagged". A tag is a text string attribute 
associated with primary storage, a Disk Offering, or a Service Offering. Tags 
allow administrators to provide additional information about the storage. For 
example, that is a "SSD" or it is "slow". Tags are not interpreted by 
&PRODUCT;. They are matched against tags placed on service and disk offerings. 
&PRODUCT; requires all tags on service and disk offerings to exist on the 
primary storage before it allocates root or data disks on the primary storage. 
Service and disk offering tags are used to identify the requirements of the 
storage that those offerings have. For example, the high end service offering 
may require "fast" for its root disk volume.</para>
        <para>The interaction between tags, allocation, and volume copying 
across clusters and pods can be complex. To simplify the situation, use the 
same set of tags on the primary storage for all clusters in a pod. Even if 
different devices are used to present those tags, the set of exposed tags can 
be the same.</para>
-       
-       </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/storage.xml b/docs/en-US/storage.xml
index 45fa648..7d1a657 100644
--- a/docs/en-US/storage.xml
+++ b/docs/en-US/storage.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="storage">
-               <title>Deleting VMs</title>
-               <para>CloudPlatform defines two types of storage: primary and 
secondary. Primary storage can be accessed by either iSCSI or NFS. 
Additionally, direct attached storage may be used for primary storage. 
Secondary storage is always accessed using NFS.</para>
-               <para>There is no ephemeral storage in CloudPlatform. All 
volumes on all nodes are persistent</para>    
-       </section>
+       <title>Deleting VMs</title>
+       <para>&PRODUCT; defines two types of storage: primary and secondary. 
Primary storage can be accessed by either iSCSI or NFS. Additionally, direct 
attached storage may be used for primary storage. Secondary storage is always 
accessed using NFS.</para>
+       <para>There is no ephemeral storage in &PRODUCT;. All volumes on all 
nodes are persistent</para>        
+</section>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/suspend-project.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/suspend-project.xml b/docs/en-US/suspend-project.xml
index 9ad1e62..bfaa12a 100644
--- a/docs/en-US/suspend-project.xml
+++ b/docs/en-US/suspend-project.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="suspend-project">
     <title>Suspending or Deleting a Project</title>
     <para>When a project is suspended, it retains the resources it owns, but 
they can no longer be used. No new resources or members can be added to a 
suspended project.</para>
     <para>When a project is deleted, its resources are destroyed, and member 
accounts are removed from the project. The project’s status is shown as 
Disabled pending final deletion.</para>
-    <para>A project can be suspended or deleted by the project administrator, 
the domain administrator of the domain the project belongs to or of its parent 
domain, or the CloudPlatform root administrator.</para>
+    <para>A project can be suspended or deleted by the project administrator, 
the domain administrator of the domain the project belongs to or of its parent 
domain, or the &PRODUCT; root administrator.</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.</para></listitem>
@@ -26,5 +45,4 @@
                 <textobject><phrase>deletebutton.png: Removes a 
member</phrase></textobject>
             </inlinemediaobject></para></listitem>
    </orderedlist>
-   </section>
-      
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/sys-reliability-and-ha.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sys-reliability-and-ha.xml 
b/docs/en-US/sys-reliability-and-ha.xml
index d8c4bbd..bdb36d0 100644
--- a/docs/en-US/sys-reliability-and-ha.xml
+++ b/docs/en-US/sys-reliability-and-ha.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="sys-reliability-and-ha">
     <title>System Reliability and High Availability</title>
     <para><xref linkend="ha-management-server" />vCenter Maintenance 
Mode</para>
     <para><xref linkend="ha-enabled-vm" />XenServer and Maintenance Mode</para>
     <para><xref linkend="ha-for-hosts" />vCenter Maintenance Mode</para>
     <para><xref linkend="dedicated-ha-hosts" />XenServer and Maintenance 
Mode</para>
-   </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/sysprep-for-windows-server-2003R2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sysprep-for-windows-server-2003R2.xml 
b/docs/en-US/sysprep-for-windows-server-2003R2.xml
index bdde68e..86e1667 100644
--- a/docs/en-US/sysprep-for-windows-server-2003R2.xml
+++ b/docs/en-US/sysprep-for-windows-server-2003R2.xml
@@ -1,39 +1,57 @@
 <?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="sysprep-for-windows-server-2003R2">
-       <title>Sysprep for Windows Server 2003 R2</title>
-       <para>Earlier versions of Windows have a different sysprep tool. Follow 
these steps for Windows Server 2003 R2.</para>
-       <orderedlist>
-               <listitem><para>Extract the content of 
\support\tools\deploy.cab on the Windows installation CD into a directory 
called c:\sysprep on the Windows 2003 R2 VM.</para></listitem>
-               <listitem><para>Run c:\sysprep\setupmgr.exe to create the 
sysprep.inf file.</para>
-                       <orderedlist numeration="loweralpha">
-                               <listitem><para>Select Create New to create a 
new Answer File.</para></listitem>
-                               <listitem><para>Enter “Sysprep setup” for 
the Type of Setup.</para></listitem>
-                               <listitem><para>Select the appropriate OS 
version and edition.</para></listitem>                
-                               <listitem><para>On the License Agreement 
screen, select “Yes fully automate the installation”.</para></listitem>
-                               <listitem><para>Provide your name and 
organization.</para></listitem>
-                               <listitem><para>Leave display settings at 
default.</para></listitem>
-                               <listitem><para>Set the appropriate time 
zone.</para></listitem>                
-                               <listitem><para>Provide your product 
key.</para></listitem>
-                               <listitem><para>Select an appropriate license 
mode for your deployment</para></listitem>
-                               <listitem><para>Select “Automatically 
generate computer name”.</para></listitem>
-                               <listitem><para>Type a default administrator 
password. If you enable the password reset feature, the users will not actually 
use this password. This password will be reset by the instance manager after 
the guest boots up.</para></listitem>
-                               <listitem><para>Leave Network Components at 
“Typical Settings”.</para></listitem>
-                               <listitem><para>Select the “WORKGROUP” 
option.</para></listitem>
-                               <listitem><para>Leave Telephony options at 
default.</para></listitem>
-                               <listitem><para>Select appropriate Regional 
Settings.</para></listitem>
-                               <listitem><para>Select appropriate language 
settings.</para></listitem>
-                               <listitem><para>Do not install 
printers.</para></listitem>
-                               <listitem><para>Do not specify “Run Once 
commands”.</para></listitem>
-                               <listitem><para>You need not specify an 
identification string.</para></listitem>
-                               <listitem><para>Save the Answer File as 
c:\sysprep\sysprep.inf.</para></listitem>
-                               
-                       </orderedlist>
-               </listitem>
-               <listitem><para>Run the following command to sysprep the 
image:</para><programlisting>c:\sysprep\sysprep.exe -reseal -mini 
-activated</programlisting>
-                       <para>After this step the machine will automatically 
shut down</para></listitem>
-                       </orderedlist>
-       </section>
+    <title>Sysprep for Windows Server 2003 R2</title>
+    <para>Earlier versions of Windows have a different sysprep tool. Follow 
these steps for Windows Server 2003 R2.</para>
+    <orderedlist>
+        <listitem><para>Extract the content of \support\tools\deploy.cab on 
the Windows installation CD into a directory called c:\sysprep on the Windows 
2003 R2 VM.</para></listitem>
+        <listitem><para>Run c:\sysprep\setupmgr.exe to create the sysprep.inf 
file.</para>
+            <orderedlist numeration="loweralpha">
+                <listitem><para>Select Create New to create a new Answer 
File.</para></listitem>
+                <listitem><para>Enter “Sysprep setup” for the Type of 
Setup.</para></listitem>
+                <listitem><para>Select the appropriate OS version and 
edition.</para></listitem>
+                <listitem><para>On the License Agreement screen, select “Yes 
fully automate the installation”.</para></listitem>
+                <listitem><para>Provide your name and 
organization.</para></listitem>
+                <listitem><para>Leave display settings at 
default.</para></listitem>
+                <listitem><para>Set the appropriate time 
zone.</para></listitem>
+                <listitem><para>Provide your product key.</para></listitem>
+                <listitem><para>Select an appropriate license mode for your 
deployment</para></listitem>
+                <listitem><para>Select “Automatically generate computer 
name”.</para></listitem>
+                <listitem><para>Type a default administrator password. If you 
enable the password reset feature, the users will not actually use this 
password. This password will be reset by the instance manager after the guest 
boots up.</para></listitem>
+                <listitem><para>Leave Network Components at “Typical 
Settings”.</para></listitem>
+                <listitem><para>Select the “WORKGROUP” 
option.</para></listitem>
+                <listitem><para>Leave Telephony options at 
default.</para></listitem>
+                <listitem><para>Select appropriate Regional 
Settings.</para></listitem>
+                <listitem><para>Select appropriate language 
settings.</para></listitem>
+                <listitem><para>Do not install printers.</para></listitem>
+                <listitem><para>Do not specify “Run Once 
commands”.</para></listitem>
+                <listitem><para>You need not specify an identification 
string.</para></listitem>
+                <listitem><para>Save the Answer File as 
c:\sysprep\sysprep.inf.</para></listitem>
+            </orderedlist>
+        </listitem>
+        <listitem><para>Run the following command to sysprep the 
image:</para><programlisting>c:\sysprep\sysprep.exe -reseal -mini 
-activated</programlisting>
+            <para>After this step the machine will automatically shut 
down</para></listitem>
+            </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/sysprep-windows-server-2008R2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/sysprep-windows-server-2008R2.xml 
b/docs/en-US/sysprep-windows-server-2008R2.xml
index 37a2e1c..af36d15 100644
--- a/docs/en-US/sysprep-windows-server-2008R2.xml
+++ b/docs/en-US/sysprep-windows-server-2008R2.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="sysprep-windows-server-2008R2">
-       <title>System Preparation for Windows Server 2008 R2</title>
-       <para>For Windows 2008 R2, you run Windows System Image Manager to 
create a custom sysprep response XML file. Windows System Image Manager is 
installed as part of the Windows Automated Installation Kit (AIK). Windows AIK 
can be downloaded from the Microsoft Download Center at the following 
location:</para>
-       <para><ulink 
url="http://www.microsoft.com/en-us/download/details.aspx?id=9085";></ulink>Microsoft
 Download Center.</para>
+    <title>System Preparation for Windows Server 2008 R2</title>
+    <para>For Windows 2008 R2, you run Windows System Image Manager to create 
a custom sysprep response XML file. Windows System Image Manager is installed 
as part of the Windows Automated Installation Kit (AIK). Windows AIK can be 
downloaded from the Microsoft Download Center at the following location:</para>
+    <para><ulink 
url="http://www.microsoft.com/en-us/download/details.aspx?id=9085";></ulink>Microsoft
 Download Center.</para>
     <para>Use the following steps to run sysprep for Windows 2008 
R2:</para><note><para>The steps outlined here are derived from the excellent 
guide by Charity Shelbourne, originally published at <ulink 
url="http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx";></ulink>Windows
 Server 2008 Sysprep Mini-Setup</para></note>
     <orderedlist>
         <listitem><para>Download and install the Windows 
AIK</para><note><para>Windows AIK should not be installed on the Windows 2008 
R2 VM you just created. Windows AIK should not be part of the template you 
create. It is only used to create the sysprep answer 
file.</para></note></listitem>
@@ -44,8 +63,5 @@
             <programlisting>cd c:\Windows\System32\sysprep
 sysprep.exe /oobe /generalize /shutdown
 </programlisting><para>The Windows 2008 R2 VM will automatically shut down 
after sysprep is complete.</para></listitem>
-         
-     
     </orderedlist>
-  
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/system-reserved-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-reserved-ip-addresses.xml 
b/docs/en-US/system-reserved-ip-addresses.xml
index aadd2d7..2f49225 100644
--- a/docs/en-US/system-reserved-ip-addresses.xml
+++ b/docs/en-US/system-reserved-ip-addresses.xml
@@ -1,19 +1,38 @@
 <?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 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="system-reserved-ip-addresses">
     <title>System Reserved IP Addresses</title>
-    <para>In each zone, you need to configure a range of reserved IP addresses 
for the management network. This network carries communication between the 
CloudPlatform Management Server and various system VMs, such as Secondary 
Storage VMs, Console Proxy VMs, and DHCP. </para>
+    <para>In each zone, you need to configure a range of reserved IP addresses 
for the management network. This network carries communication between the 
&PRODUCT; Management Server and various system VMs, such as Secondary Storage 
VMs, Console Proxy VMs, and DHCP. </para>
     <para>The reserved IP addresses must be unique across the cloud. You 
cannot, for example, have a host in one zone which has the same private IP 
address as a host in another zone.</para>
     <para>The hosts in a pod are assigned private IP addresses.  These are 
typically RFC1918 addresses.  The Console Proxy and Secondary Storage system 
VMs are also allocated private IP addresses in the CIDR of the pod that they 
are created in.</para>
-    <para>Make sure computing servers and Management Servers use IP addresses 
outside of the System Reserved IP range. For example, suppose the System 
Reserved IP range starts at 192.168.154.2 and ends at 192.168.154.7. 
CloudPlatform can use .2 to .7 for System VMs. This leaves the rest of the pod 
CIDR, from .8 to .254, for the Management Server and hypervisor hosts.</para>
+    <para>Make sure computing servers and Management Servers use IP addresses 
outside of the System Reserved IP range. For example, suppose the System 
Reserved IP range starts at 192.168.154.2 and ends at 192.168.154.7. &PRODUCT; 
can use .2 to .7 for System VMs. This leaves the rest of the pod CIDR, from .8 
to .254, for the Management Server and hypervisor hosts.</para>
     <para><emphasis role="bold">In all zones:</emphasis></para>
-    <para>Provide private IPs for the system in each pod and provision them in 
CloudPlatform.</para>
+    <para>Provide private IPs for the system in each pod and provision them in 
&PRODUCT;.</para>
     <para>For KVM and XenServer, the recommended number of private IPs per pod 
is one per host. If you expect a pod to grow, add enough private IPs now to 
accommodate the growth.</para>
     <para><emphasis role="bold">In a zone that uses advanced 
networking:</emphasis></para>
-    <para>For vSphere with advanced networking, we recommend provisioning 
enough private IPs for your total number of customers, plus enough for the 
required CloudPlatform System VMs. Typically, about 10 additional IPs are 
required for the System VMs. For more information about System VMs, see Working 
with System Virtual Machines in the Administrator's Guide.</para>
+    <para>For vSphere with advanced networking, we recommend provisioning 
enough private IPs for your total number of customers, plus enough for the 
required &PRODUCT; System VMs. Typically, about 10 additional IPs are required 
for the System VMs. For more information about System VMs, see Working with 
System Virtual Machines in the Administrator's Guide.</para>
     <para>When advanced networking is being used, the number of private IP 
addresses available in each pod varies depending on which hypervisor is running 
on the nodes in that pod. Citrix XenServer and KVM use link-local addresses, 
which in theory provide more than 65,000 private IP addresses within the 
address block. As the pod grows over time, this should be more than enough for 
any reasonable number of hosts as well as IP addresses for guest virtual 
routers. VMWare ESXi, by contrast uses any administrator-specified subnetting 
scheme, and the typical administrator provides only 255 IPs per pod. Since 
these are shared by physical machines, the guest virtual router, and other 
entities, it is possible to run out of private IPs when scaling up a pod whose 
nodes are running ESXi.</para>
     <para>To ensure adequate headroom to scale private IP space in an ESXi pod 
that uses advanced networking, use one or more of the following 
techniques:</para>
     <para>TODO</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/system-service-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-service-offerings.xml 
b/docs/en-US/system-service-offerings.xml
index 92aff73..75aa128 100644
--- a/docs/en-US/system-service-offerings.xml
+++ b/docs/en-US/system-service-offerings.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="system-service-offerings">
     <title>System Service Offerings</title>
-    <para>System service offerings provide a choice of CPU speed, number of 
CPUs, tags, and RAM size, just as other service offerings do. But rather than 
being used for virtual machine instances and exposed to users, system service 
offerings are used to change the default properties of virtual routers, console 
proxies, and other system VMs. System service offerings are visible only to the 
CloudPlatform root administrator. CloudPlatform provides default system service 
offerings. The CloudPlatform root administrator can create additional custom 
system service offerings.</para>
-    <para>When CloudPlatform creates a virtual router for a guest network, it 
uses default settings which are defined in the system service offering 
associated with the network offering. You can upgrade the capabilities of the 
virtual router by applying a new network offering that contains a different 
system service offering. All virtual routers in that network will begin using 
the settings from the new service offering.</para>
+    <para>System service offerings provide a choice of CPU speed, number of 
CPUs, tags, and RAM size, just as other service offerings do. But rather than 
being used for virtual machine instances and exposed to users, system service 
offerings are used to change the default properties of virtual routers, console 
proxies, and other system VMs. System service offerings are visible only to the 
&PRODUCT; root administrator. &PRODUCT; provides default system service 
offerings. The &PRODUCT; root administrator can create additional custom system 
service offerings.</para>
+    <para>When &PRODUCT; creates a virtual router for a guest network, it uses 
default settings which are defined in the system service offering associated 
with the network offering. You can upgrade the capabilities of the virtual 
router by applying a new network offering that contains a different system 
service offering. All virtual routers in that network will begin using the 
settings from the new service offering.</para>
   </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/121bf3a1/docs/en-US/system-vm-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/system-vm-template.xml 
b/docs/en-US/system-vm-template.xml
index e873ee1..a9477f3 100644
--- a/docs/en-US/system-vm-template.xml
+++ b/docs/en-US/system-vm-template.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="system-vm-template">
     <title>The System VM Template</title>
     <para>The System VMs come from a single template.  The System VM has the 
following characteristics:</para>
@@ -15,5 +34,4 @@
         <listitem><para>Latest versions of HAProxy, iptables, IPsec, and 
Apache from debian repository ensures improved security and 
speed</para></listitem>
         <listitem><para>Latest version of JRE from Sun/Oracle ensures improved 
security and speed</para></listitem>
         </itemizedlist>
-    
 </section>

Reply via email to