Updated Branches:
  refs/heads/master 37c138840 -> f0dfa3f75

fixing licenses for t files, misc fixes


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

Branch: refs/heads/master
Commit: f0dfa3f75f9385a5f1c01e41720b1619cded06db
Parents: 121bf3a
Author: Joe Brockmeier <[email protected]>
Authored: Sat Aug 11 12:02:27 2012 -0700
Committer: John Kinsella <[email protected]>
Committed: Sat Aug 11 12:02:27 2012 -0700

----------------------------------------------------------------------
 docs/en-US/LDAPserver-for-user-authentication.xml  |   29 ++-
 docs/en-US/Revision_History.xml                    |   60 +++--
 .../template-iso-snapshot-usage-record-format.xml  |   26 ++-
 docs/en-US/templates.xml                           |   29 ++-
 docs/en-US/time-zones.xml                          |  249 ++++++++-------
 docs/en-US/trial-installation.xml                  |   22 ++-
 docs/en-US/troubleshooting-alerts.xml              |   24 ++-
 ...ooting-dataloss-on-exported-primary-storage.xml |   29 ++-
 docs/en-US/troubleshooting-lb-rules-fails.xml      |   23 ++-
 ...ing-maintenance-mode-not-working-on-vCenter.xml |   23 ++-
 ...troubleshooting-recover-lost-virtual-router.xml |   25 ++-
 .../en-US/troubleshooting-unable-to-deploy-vms.xml |   24 ++-
 .../troubleshooting-unable-to-power-on-vm.xml      |   26 ++-
 .../troubleshooting-working-with-server-logs.xml   |   30 ++-
 docs/en-US/troubleshooting.xml                     |   40 ++-
 docs/en-US/tuning.xml                              |   24 ++-
 16 files changed, 487 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/LDAPserver-for-user-authentication.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/LDAPserver-for-user-authentication.xml 
b/docs/en-US/LDAPserver-for-user-authentication.xml
index 3cd4c3b..5fcb300 100644
--- a/docs/en-US/LDAPserver-for-user-authentication.xml
+++ b/docs/en-US/LDAPserver-for-user-authentication.xml
@@ -1,16 +1,35 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="LDAPserver-for-user-authentication">
     <title>Using an LDAP Server for User Authentication</title>
-    <para>You can use an external LDAP server such as Microsoft Active 
Directory or ApacheDS to authenticate CloudPlatform end-users. Just map 
CloudPlatform accounts to the corresponding LDAP accounts using a query filter. 
The query filter is written using the query syntax of the particular LDAP 
server, and can include special wildcard characters provided by CloudPlatform 
for matching common values such as the user’s email address and name. 
CloudPlatform will search the external LDAP directory tree starting at a 
specified base directory and return the distinguished name (DN) and password of 
the matching user. This information along with the given password is used to 
authenticate the user..</para>
-    <para>To set up LDAP authentication in CloudPlatform, call the 
CloudPlatform API command ldapConfig and provide the following:</para>
+    <para>You can use an external LDAP server such as Microsoft Active 
Directory or ApacheDS to authenticate &PRODUCT; end-users. Just map &PRODUCT; 
accounts to the corresponding LDAP accounts using a query filter. The query 
filter is written using the query syntax of the particular LDAP server, and can 
include special wildcard characters provided by &PRODUCT; for matching common 
values such as the user’s email address and name. &PRODUCT; will search the 
external LDAP directory tree starting at a specified base directory and return 
the distinguished name (DN) and password of the matching user. This information 
along with the given password is used to authenticate the user..</para>
+    <para>To set up LDAP authentication in &PRODUCT;, call the &PRODUCT; API 
command ldapConfig and provide the following:</para>
     <itemizedlist>
         <listitem><para>Hostname or IP address and listening port of the LDAP 
server</para></listitem>
         <listitem> <para>Base directory and query filter</para></listitem>
-        <listitem><para>Search user DN credentials, which give CloudPlatform 
permission to search on the LDAP server</para></listitem>
+        <listitem><para>Search user DN credentials, which give &PRODUCT; 
permission to search on the LDAP server</para></listitem>
         <listitem><para>SSL keystore and password, if SSL is 
used</para></listitem>     
     </itemizedlist>
     <xi:include href="example-LDAP-configuration-commands.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
@@ -18,4 +37,4 @@
     <xi:include href="query-filter.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
     <xi:include href="search-user-bind-dn.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
     <xi:include href="SSL-keystore-path-and-password.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />    
-    </section>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/Revision_History.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Revision_History.xml b/docs/en-US/Revision_History.xml
index df57d7f..55d741a 100644
--- a/docs/en-US/Revision_History.xml
+++ b/docs/en-US/Revision_History.xml
@@ -1,27 +1,45 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE appendix 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.
+-->
+
 <appendix id="appe-cloudstack-Revision_History">
-       <title>Revision History</title>
-       <simpara>
-               <revhistory>
-                       <revision>
-                               <revnumber>0-0</revnumber>
-                               <date>Tue May 29 2012</date>
-                               <author>
-                                       <firstname>Jessica</firstname>
-                                       <surname>Tomechak</surname>
-                                       <email/>
-                               </author>
-                               <revdescription>
-                                       <simplelist>
-                                               <member>Initial creation of 
book by publican</member>
-                                       </simplelist>
-                               </revdescription>
-                       </revision>
-               </revhistory>
-       </simpara>
+    <title>Revision History</title>
+    <simpara>
+        <revhistory>
+            <revision>
+                <revnumber>0-0</revnumber>
+                <date>Tue May 29 2012</date>
+                <author>
+                    <firstname>Jessica</firstname>
+                    <surname>Tomechak</surname>
+                    <email/>
+                </author>
+                <revdescription>
+                    <simplelist>
+                        <member>Initial creation of book by publican</member>
+                    </simplelist>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </simpara>
 </appendix>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/template-iso-snapshot-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/template-iso-snapshot-usage-record-format.xml 
b/docs/en-US/template-iso-snapshot-usage-record-format.xml
index d3ae8e1..3f811a5 100644
--- a/docs/en-US/template-iso-snapshot-usage-record-format.xml
+++ b/docs/en-US/template-iso-snapshot-usage-record-format.xml
@@ -1,3 +1,27 @@
+<?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="template-iso-snapshot-usage-record-format">
        <title>Template, ISO, and Snapshot Usage Record Format</title>
        <itemizedlist>
@@ -15,4 +39,4 @@
                <listitem><para>size – Size of the template, ISO, or 
snapshot</para></listitem>
                <listitem><para>startdate, enddate – The range of time for 
which the usage is aggregated; see Dates in the Usage Record</para></listitem>  
   
        </itemizedlist>
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/templates.xml b/docs/en-US/templates.xml
index a249ded..faecf1b 100644
--- a/docs/en-US/templates.xml
+++ b/docs/en-US/templates.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="templates">
-       <title>Templates</title>
-    <xi:include href="working-with-iso.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    <xi:include href="working-with-templates.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    </section>
+    <title>Templates</title>
+        <xi:include href="working-with-iso.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
+        <xi:include href="working-with-templates.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/time-zones.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/time-zones.xml b/docs/en-US/time-zones.xml
index a886e5f..d6d4bc7 100644
--- a/docs/en-US/time-zones.xml
+++ b/docs/en-US/time-zones.xml
@@ -1,114 +1,137 @@
-       <section id="time-zones">
-               <title>Time Zones</title>
-                       <para>The following time zone identifiers are accepted 
by the CloudPlatform API. There are several places that have a time zone as a 
required or optional parameter. These include scheduling recurring snapshots, 
creating a user, and specifying the usage time zone in the Configuration table. 
.</para>
-               <informaltable frame="all">
-                       <tgroup cols="3" align="left" colsep="1" rowsep="1">
-                               <colspec colname="c1" />
-                                       <colspec colname="c2" />
-                               <colspec colname="c3" />
-                               <tbody>
-                                       <row>
-                                               
<entry><para>Etc/GMT+12</para></entry>
-                                               
<entry><para>Etc/GMT+11</para></entry>
-                                               
<entry><para>Pacific/Samoa</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Pacific/Honolulu</para></entry>
-                                               
<entry><para>US/Alaska</para></entry>
-                                               
<entry><para>America/Los_Angeles</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Mexico/BajaNorte</para></entry>
-                                               
<entry><para>US/Arizona</para></entry>
-                                               
<entry><para>US/Mountain</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Chihuahua</para></entry>
-                                               
<entry><para>America/Chicago</para></entry>
-                                               
<entry><para>America/Costa_Rica</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Mexico_City</para></entry>
-                                               
<entry><para>Canada/Saskatchewan</para></entry>
-                                               
<entry><para>America/Bogota</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/New_York</para></entry>
-                                               
<entry><para>America/Caracas</para></entry>
-                                               
<entry><para>America/Asuncion</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Cuiaba</para></entry>
-                                               
<entry><para>America/Halifax</para></entry>
-                                               
<entry><para>America/La_Paz</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Santiago</para></entry>
-                                               
<entry><para>America/St_Johns</para></entry>
-                                               
<entry><para>America/Araguaina</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Argentina/Buenos_Aires</para></entry>
-                                               
<entry><para>America/Cayenne</para></entry>
-                                               
<entry><para>America/Godthab</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>America/Montevideo</para></entry>
-                                               
<entry><para>Etc/GMT+2</para></entry>
-                                               
<entry><para>Atlantic/Azores</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Atlantic/Cape_Verde</para></entry>
-                                               
<entry><para>Africa/Casablanca</para></entry>
-                                               
<entry><para>Etc/UTC</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Atlantic/Reykjavik</para></entry>
-                                               
<entry><para>Europe/London</para></entry>
-                                               <entry><para>CET</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Europe/Bucharest</para></entry>
-                                               
<entry><para>Africa/Johannesburg</para></entry>
-                                               
<entry><para>Asia/Beirut</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Africa/Cairo</para></entry>
-                                               
<entry><para>Asia/Jerusalem</para></entry>
-                                               
<entry><para>Europe/Minsk</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Europe/Moscow</para></entry>
-                                               
<entry><para>Africa/Nairobi</para></entry>
-                                               
<entry><para>Asia/Karachi</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Asia/Kolkata</para></entry>
-                                               
<entry><para>Asia/Bangkok</para></entry>
-                                               
<entry><para>Asia/Shanghai</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Asia/Kuala_Lumpur</para></entry>
-                                               
<entry><para>Australia/Perth</para></entry>
-                                               
<entry><para>Asia/Taipei</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Asia/Tokyo</para></entry>
-                                               
<entry><para>Asia/Seoul</para></entry>
-                                               
<entry><para>Australia/Adelaide</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Australia/Darwin</para></entry>
-                                               
<entry><para>Australia/Brisbane</para></entry>
-                                               
<entry><para>Australia/Canberra</para></entry>
-                                       </row>
-                                       <row>
-                                               
<entry><para>Pacific/Guam</para></entry>
-                                               
<entry><para>Pacific/Auckland</para></entry>
-                                               <entry><para></para></entry>
-                                       </row>
-                               </tbody>
-                       </tgroup>
-               </informaltable>        
-       </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="time-zones">
+    <title>Time Zones</title>
+        <para>The following time zone identifiers are accepted by the 
&PRODUCT; API. There are several places that have a time zone as a required or 
optional parameter. These include scheduling recurring snapshots, creating a 
user, and specifying the usage time zone in the Configuration table. .</para>
+    <informaltable frame="all">
+        <tgroup cols="3" align="left" colsep="1" rowsep="1">
+            <colspec colname="c1" />
+                <colspec colname="c2" />
+            <colspec colname="c3" />
+            <tbody>
+                <row>
+                    <entry><para>Etc/GMT+12</para></entry>
+                    <entry><para>Etc/GMT+11</para></entry>
+                    <entry><para>Pacific/Samoa</para></entry>
+                </row>
+                <row>
+                    <entry><para>Pacific/Honolulu</para></entry>
+                    <entry><para>US/Alaska</para></entry>
+                    <entry><para>America/Los_Angeles</para></entry>
+                </row>
+                <row>
+                    <entry><para>Mexico/BajaNorte</para></entry>
+                    <entry><para>US/Arizona</para></entry>
+                    <entry><para>US/Mountain</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Chihuahua</para></entry>
+                    <entry><para>America/Chicago</para></entry>
+                    <entry><para>America/Costa_Rica</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Mexico_City</para></entry>
+                    <entry><para>Canada/Saskatchewan</para></entry>
+                    <entry><para>America/Bogota</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/New_York</para></entry>
+                    <entry><para>America/Caracas</para></entry>
+                    <entry><para>America/Asuncion</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Cuiaba</para></entry>
+                    <entry><para>America/Halifax</para></entry>
+                    <entry><para>America/La_Paz</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Santiago</para></entry>
+                    <entry><para>America/St_Johns</para></entry>
+                    <entry><para>America/Araguaina</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Argentina/Buenos_Aires</para></entry>
+                    <entry><para>America/Cayenne</para></entry>
+                    <entry><para>America/Godthab</para></entry>
+                </row>
+                <row>
+                    <entry><para>America/Montevideo</para></entry>
+                    <entry><para>Etc/GMT+2</para></entry>
+                    <entry><para>Atlantic/Azores</para></entry>
+                </row>
+                <row>
+                    <entry><para>Atlantic/Cape_Verde</para></entry>
+                    <entry><para>Africa/Casablanca</para></entry>
+                    <entry><para>Etc/UTC</para></entry>
+                </row>
+                <row>
+                    <entry><para>Atlantic/Reykjavik</para></entry>
+                    <entry><para>Europe/London</para></entry>
+                    <entry><para>CET</para></entry>
+                </row>
+                <row>
+                    <entry><para>Europe/Bucharest</para></entry>
+                    <entry><para>Africa/Johannesburg</para></entry>
+                    <entry><para>Asia/Beirut</para></entry>
+                </row>
+                <row>
+                    <entry><para>Africa/Cairo</para></entry>
+                    <entry><para>Asia/Jerusalem</para></entry>
+                    <entry><para>Europe/Minsk</para></entry>
+                </row>
+                <row>
+                    <entry><para>Europe/Moscow</para></entry>
+                    <entry><para>Africa/Nairobi</para></entry>
+                    <entry><para>Asia/Karachi</para></entry>
+                </row>
+                <row>
+                    <entry><para>Asia/Kolkata</para></entry>
+                    <entry><para>Asia/Bangkok</para></entry>
+                    <entry><para>Asia/Shanghai</para></entry>
+                </row>
+                <row>
+                    <entry><para>Asia/Kuala_Lumpur</para></entry>
+                    <entry><para>Australia/Perth</para></entry>
+                    <entry><para>Asia/Taipei</para></entry>
+                </row>
+                <row>
+                    <entry><para>Asia/Tokyo</para></entry>
+                    <entry><para>Asia/Seoul</para></entry>
+                    <entry><para>Australia/Adelaide</para></entry>
+                </row>
+                <row>
+                    <entry><para>Australia/Darwin</para></entry>
+                    <entry><para>Australia/Brisbane</para></entry>
+                    <entry><para>Australia/Canberra</para></entry>
+                </row>
+                <row>
+                    <entry><para>Pacific/Guam</para></entry>
+                    <entry><para>Pacific/Auckland</para></entry>
+                    <entry><para></para></entry>
+                </row>
+            </tbody>
+        </tgroup>
+    </informaltable>    
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/trial-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/trial-installation.xml 
b/docs/en-US/trial-installation.xml
index 9e3e33a..8270e57 100644
--- a/docs/en-US/trial-installation.xml
+++ b/docs/en-US/trial-installation.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="trial-installation">
     <title>Trial Installation</title>
     <para>Coming soon.</para>
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-alerts.xml 
b/docs/en-US/troubleshooting-alerts.xml
index 9127364..0efeb81 100644
--- a/docs/en-US/troubleshooting-alerts.xml
+++ b/docs/en-US/troubleshooting-alerts.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="troubleshooting-alerts">
     <title>Alerts</title>
     <para>The following is the list of alert type numbers.</para>
@@ -35,5 +54,4 @@ LOCAL_STORAGE = 24;
 RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the 
limit. Currently used for recurring snapshots only
 
     </programlisting>
-    </section>
-      
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
----------------------------------------------------------------------
diff --git 
a/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml 
b/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
index 677bcc3..4a94f60 100644
--- a/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.xml
+++ b/docs/en-US/troubleshooting-dataloss-on-exported-primary-storage.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="troubleshooting-dataloss-on-exported-primary-storage">
     <title>Data Loss on Exported Primary Storage</title>
     <formalpara>
@@ -17,14 +36,10 @@
         <title>Solution</title>
         <para>When setting up LUN exports, restrict the range of IP addresses 
that are allowed access by specifying a subnet mask. For example:</para>
     </formalpara>
-    <programlisting>echo “/export 192.168.1.0/24(rw,async,no_root_squash)” 
> /etc/exports</programlisting>
+    <programlisting>echo “/export 192.168.1.0/24(rw,async,no_root_squash)” 
&gt; /etc/exports</programlisting>
     <para>Adjust the above command to suit your deployment needs.</para>
     <formalpara>
         <title>More Information</title>
-        <para>See the export procedure in the "Secondary Storage" section of 
the CloudPlatform Installation Guide</para>
+        <para>See the export procedure in the "Secondary Storage" section of 
the &PRODUCT; Installation Guide</para>
     </formalpara>
-    
-    
-    
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-lb-rules-fails.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-lb-rules-fails.xml 
b/docs/en-US/troubleshooting-lb-rules-fails.xml
index 1808d06..c507178 100644
--- a/docs/en-US/troubleshooting-lb-rules-fails.xml
+++ b/docs/en-US/troubleshooting-lb-rules-fails.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="troubleshooting-lb-rules-fails">
     <title>Load balancer rules fail after changing network offering</title>
     <formalpara>
@@ -17,6 +36,4 @@
         <title>Solution</title>
         <para>Create a firewall rule on the virtual router for each of your 
existing load balancing rules so that they continue to function.</para>
     </formalpara>
-             
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
----------------------------------------------------------------------
diff --git 
a/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml 
b/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
index 60d769f..c4bf37f 100644
--- a/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.xml
+++ b/docs/en-US/troubleshooting-maintenance-mode-not-working-on-vCenter.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="troubleshooting-maintenance-mode-not-working-on-vCenter">
     <title>Maintenance mode not working on vCenter</title>
     <formalpara>
@@ -21,6 +40,4 @@
         <title>More Information</title>
         <para>See <xref 
linkend="scheduled-maintenance-maintenance-mode-hosts"/></para>
     </formalpara>
-   
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-recover-lost-virtual-router.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-recover-lost-virtual-router.xml 
b/docs/en-US/troubleshooting-recover-lost-virtual-router.xml
index f4699d8..12a5150 100644
--- a/docs/en-US/troubleshooting-recover-lost-virtual-router.xml
+++ b/docs/en-US/troubleshooting-recover-lost-virtual-router.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="troubleshooting-recover-lost-virtual-router">
     <title>Recovering a Lost Virtual Router </title>
     <formalpara>
@@ -24,8 +43,4 @@
        </itemizedlist>
     <para>Recreate the missing router by using the restartNetwork API with 
cleanup=false parameter. For more information about redundant router setup, see 
Creating a New Network Offering.</para>
     <para>For more information about the API syntax, see the API Reference at 
<ulink 
url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack";></ulink>API
 Reference.</para>
-    
-    
-    
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-unable-to-deploy-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-unable-to-deploy-vms.xml 
b/docs/en-US/troubleshooting-unable-to-deploy-vms.xml
index f1432c4..412b9bf 100644
--- a/docs/en-US/troubleshooting-unable-to-deploy-vms.xml
+++ b/docs/en-US/troubleshooting-unable-to-deploy-vms.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="troubleshooting-unable-to-deploy-vms">
     <title>Unable to deploy VMs from uploaded vSphere template</title>
     <formalpara>
@@ -17,5 +36,4 @@
         <title>Solution</title>
         <para>Remove the ISO and re-upload the template.</para>
     </formalpara>
-    </section>
-      
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-unable-to-power-on-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-unable-to-power-on-vm.xml 
b/docs/en-US/troubleshooting-unable-to-power-on-vm.xml
index ba11473..e037eda 100644
--- a/docs/en-US/troubleshooting-unable-to-power-on-vm.xml
+++ b/docs/en-US/troubleshooting-unable-to-power-on-vm.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="troubleshooting-unable-to-power-on-vm">
     <title>Unable to power on virtual machine on VMware</title>
     <formalpara>
@@ -12,7 +31,7 @@
     <itemizedlist>
         <listitem><para>Unable to open Swap File</para></listitem>
         <listitem><para>Unable to access a file since it is 
locked</para></listitem>
-        <listitem><para>    Unable to access Virtual machine 
configuration</para></listitem>
+        <listitem><para>Unable to access Virtual machine 
configuration</para></listitem>
     </itemizedlist>
     <formalpara>
         <title>Cause</title>
@@ -22,6 +41,5 @@
         <title>Solution</title>
         <para>See the following:</para>
     </formalpara>
-    <para><ulink 
url="http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&amp;cmd=displayKC&amp;externalId=10051/";>VMware
 Knowledge Base Article</ulink></para>                
+    <para><ulink 
url="http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&amp;cmd=displayKC&amp;externalId=10051/";>VMware
 Knowledge Base Article</ulink></para>
 </section>
-      

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting-working-with-server-logs.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting-working-with-server-logs.xml 
b/docs/en-US/troubleshooting-working-with-server-logs.xml
index 9255b5a..1017bf5 100644
--- a/docs/en-US/troubleshooting-working-with-server-logs.xml
+++ b/docs/en-US/troubleshooting-working-with-server-logs.xml
@@ -1,16 +1,35 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="troubleshooting-working-with-server-logs">
     <title>Working with Server Logs</title>
-    <para>The CloudPlatform Management Server logs all web site, middle tier, 
and database activities for diagnostics purposes in /var/log/cloud/management/. 
 The CloudPlatform logs a variety of error messages.  We recommend this command 
to find the problematic output in the Management Server log:.</para>
+    <para>The &PRODUCT; Management Server logs all web site, middle tier, and 
database activities for diagnostics purposes in /var/log/cloud/management/.  
The &PRODUCT; logs a variety of error messages.  We recommend this command to 
find the problematic output in the Management Server log:.</para>
     <note><para>When copying and pasting a command, be sure the command has 
pasted as a single line before executing. Some document viewers may introduce 
unwanted line breaks in copied text.</para></note>
     <programlisting>
         grep -i -E 'exception|unable|fail|invalid|leak|warn|error' 
/var/log/cloud/management/management-server.log
     </programlisting>
-    <para>The CloudPlatform processes requests with a Job ID.  If you find an 
error in the logs and you are interested in debugging the issue you can grep 
for this job ID in the management server log.   For example, suppose that you 
find the following ERROR message:</para>
+    <para>The &PRODUCT; processes requests with a Job ID. If you find an error 
in the logs and you are interested in debugging the issue you can grep for this 
job ID in the management server log. For example, suppose that you find the 
following ERROR message:</para>
     <programlisting>
         2010-10-04 13:49:32,595 ERROR [cloud.vm.UserVmManagerImpl] 
(Job-Executor-11:job-1076) Unable to find any host for [User|i-8-42-VM-untagged]
     </programlisting>
@@ -18,6 +37,5 @@
     <programlisting>
         grep "job-1076)" management-server.log
     </programlisting>
-    <para>The CloudPlatform Agent Server logs its activities in 
/var/log/cloud/agent/.</para>
-    </section>
-      
+    <para>The &PRODUCT; Agent Server logs its activities in 
/var/log/cloud/agent/.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/troubleshooting.xml b/docs/en-US/troubleshooting.xml
index c129dc9..f3dc7d3 100644
--- a/docs/en-US/troubleshooting.xml
+++ b/docs/en-US/troubleshooting.xml
@@ -1,18 +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="troubleshooting">
-    <para><xref linkend="appendix-a-time-zones" />IP Load Balancing</para>
-    <para><xref linkend="troubleshooting-alerts" />DNS and DHCP</para>
-    <para><xref linkend="troubleshooting-working-with-server-logs" />VPN</para>
-    <para><xref linkend="troubleshooting-dataloss-on-exported-primary-storage" 
/>Configuring VPN</para>
-    <para><xref linkend="troubleshooting-recover-lost-virtual-router" />Using 
VPN with Windows</para>
-    <para><xref 
linkend="troubleshooting-maintenance-mode-not-working-on-vCenter" />Using VPN 
with Mac</para>
-    <para><xref linkend="troubleshooting-unable-to-deploy-vms" 
/>Templates</para>
-    <para><xref linkend="troubleshooting-unable-to-power-on-vm" />Events</para>
-    <para><xref linkend="troubleshooting-lb-rules-fails" />Templates</para>
-  
-       
+    <para><xref linkend="troubleshooting-alerts" />Alert Type Numbers</para>
+    <para><xref linkend="troubleshooting-dataloss-on-exported-primary-storage" 
/>Data Loss on Exported Primary Storage</para>
+    <para><xref linkend="troubleshooting-lb-rules-fails" />Load balancer rules 
fail after changing network offering</para>
+    <para><xref 
linkend="troubleshooting-maintenance-mode-not-working-on-vCenter" />Maintenance 
mode not working on vCenter</para>
+    <para><xref linkend="troubleshooting-recover-lost-virtual-router" 
/>Recovering a Lost Virtual Router</para>
+    <para><xref linkend="troubleshooting-unable-to-deploy-vms" />Unable to 
deploy VMs from uploaded vSphere template</para>
+    <para><xref linkend="troubleshooting-unable-to-power-on-vm" />Unable to 
power on virtual machine on VMware</para>
+    <para><xref linkend="troubleshooting-working-with-server-logs" />Working 
with Server Logs</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0dfa3f7/docs/en-US/tuning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/tuning.xml b/docs/en-US/tuning.xml
index 91b0f0c..bcaaaa1 100644
--- a/docs/en-US/tuning.xml
+++ b/docs/en-US/tuning.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="tuning">
     <title>Tuning</title>
     <para>This section provides tips on how to improve the performance of your 
cloud.</para>
@@ -11,5 +30,4 @@
     <xi:include href="set-database-buffer-pool-size.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
     <xi:include href="set-monitor-total-vm-limits-per-host.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
     <xi:include href="configure-xenserver-dom0-memory.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"; />
-    </section>
-      
+</section>

Reply via email to