incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: Patch from Joe Brockmeier - Adding Apache license, DTD fixes, &product; entity and other misc fixes to d-named files under /doc.
Date Thu, 02 Aug 2012 23:46:00 GMT
Updated Branches:
  refs/heads/master 95b6a5eed -> c35153cef


Patch from Joe Brockmeier - Adding Apache license, DTD fixes, &product;
entity and other misc fixes to d-named files under /doc.


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

Branch: refs/heads/master
Commit: c35153cefd42ddc7b265b36f9ef4886cf947c97c
Parents: 95b6a5e
Author: Chip Childers <chip.childers@gmail.com>
Authored: Thu Aug 2 19:44:45 2012 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Thu Aug 2 19:44:45 2012 -0400

----------------------------------------------------------------------
 docs/en-US/dates-in-usage-record.xml              |   18 +++++++++++
 docs/en-US/dedicated-ha-hosts.xml                 |   25 +++++++++++++--
 docs/en-US/default-account-resource-limit.xml     |   24 +++++++++++++--
 docs/en-US/default-template.xml                   |   23 +++++++++++++-
 docs/en-US/delete-templates.xml                   |   21 ++++++++++++-
 docs/en-US/deleting-vms.xml                       |   24 +++++++++++++--
 docs/en-US/deployment-architecture-overview.xml   |   23 +++++++++++++-
 docs/en-US/deployment_architecture_overview.xml   |   24 +++++++++++++--
 docs/en-US/detach-move-volumes.xml                |   26 +++++++++++++--
 docs/en-US/developer-getting-started.xml          |   22 ++++++++++++-
 docs/en-US/developer-guide.xml                    |   21 ++++++++++++-
 docs/en-US/developer-introduction.xml             |   21 ++++++++++++-
 docs/en-US/developer_guide.xml                    |   21 ++++++++++++-
 docs/en-US/disable-enable-zones-pods-clusters.xml |   23 +++++++++++++-
 docs/en-US/disk-volume-usage-record-format.xml    |   19 +++++++++++-
 docs/en-US/dns-dhcp.xml                           |   21 ++++++++++++-
 docs/en-US/domains.xml                            |   22 ++++++++++++-
 17 files changed, 346 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/dates-in-usage-record.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dates-in-usage-record.xml b/docs/en-US/dates-in-usage-record.xml
index ff46587..0fe430d 100644
--- a/docs/en-US/dates-in-usage-record.xml
+++ b/docs/en-US/dates-in-usage-record.xml
@@ -1,3 +1,21 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 	<section id="dates-in-usage-record">
 		<title>Dates in the Usage Record</title>
 		<para>Usage records include a start date and an end date. These dates define the
period of time for which the raw usage number was calculated. If daily aggregation is used,
the start date is midnight on the day in question and the end date is 23:59:59 on the day
in question (with one exception; see below). A virtual machine could have been deployed at
noon on that day, stopped at 6pm on that day, then started up again at 11pm. When usage is
calculated on that day, there will be 7 hours of running VM usage (usage type 1) and 12 hours
of allocated VM usage (usage type 2). If the same virtual machine runs for the entire next
day, there will 24 hours of both running VM usage (type 1) and allocated VM usage (type 2).</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/dedicated-ha-hosts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dedicated-ha-hosts.xml b/docs/en-US/dedicated-ha-hosts.xml
index e985142..ab50700 100644
--- a/docs/en-US/dedicated-ha-hosts.xml
+++ b/docs/en-US/dedicated-ha-hosts.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="dedicated-ha-hosts">
     <title>Dedicated HA Hosts</title>
     <para>(v3.0.3 and greater) One or more hosts can be designated for use only by
HA-enabled VMs that are restarting due to a host failure. Setting up a pool of such dedicated
HA hosts as the recovery destination for all HA-enabled VMs is useful to:</para>
     <itemizedlist>
-        <listitem><para>Make it easier to determine which VMs have been restarted
as part of the CloudPlatform high-availability function. If a VM is running on a dedicated
HA host, then it must be an HA-enabled VM whose original host failed. (With one exception:
It is possible for an administrator to manually migrate any VM to a dedicated HA host.).</para></listitem>
+        <listitem><para>Make it easier to determine which VMs have been restarted
as part of the &PRODUCT; high-availability function. If a VM is running on a dedicated
HA host, then it must be an HA-enabled VM whose original host failed. (With one exception:
It is possible for an administrator to manually migrate any VM to a dedicated HA host.).</para></listitem>
         <listitem><para>Keep HA-enabled VMs from restarting on hosts which may
be reserved for other purposes.</para></listitem>
     </itemizedlist>
     <para>The dedicated HA option is set through a special host tag when the host is
created. To allow the administrator to dedicate hosts to only HA-enabled VMs, set the global
configuration variable ha.tag to the desired tag (for example, "ha_host"), and restart the
Management Server. Enter the value in the Host Tags field when adding the host(s) that you
want to dedicate to HA-enabled VMs.</para>
     <note><para>If you set ha.tag, be sure to actually use that tag on at least
one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud,
the HA-enabled VMs will fail to restart after a crash.</para></note>
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/default-account-resource-limit.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-account-resource-limit.xml b/docs/en-US/default-account-resource-limit.xml
index 0ace634..abc313f 100644
--- a/docs/en-US/default-account-resource-limit.xml
+++ b/docs/en-US/default-account-resource-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="default-account-resource-limit">
     <title>Default Account Resource Limits</title>
     <para>You can limit resource use by accounts. The default limits are set using
global configuration parameters, and they affect all accounts within a cloud. The relevant
parameters are those beginning with max.account (max.account.snapshots, etc.)..</para>
     <para>To override a default limit for a particular account, set a per-account resource
limit.</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 tree, click Accounts.</para></listitem>
         <listitem><para>Select the account you want to modify. The current limits
are displayed. A value of -1 shows that there is no limit in place</para></listitem>
         <listitem><para>Click the Edit button<inlinemediaobject>
@@ -18,5 +37,4 @@
             <textobject><phrase>editbutton.png: edits the settings.</phrase></textobject>
         </inlinemediaobject></para></listitem>
     </orderedlist>
-    
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/default-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/default-template.xml b/docs/en-US/default-template.xml
index 4f4e583..c4741c9 100644
--- a/docs/en-US/default-template.xml
+++ b/docs/en-US/default-template.xml
@@ -1,11 +1,30 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="default-template">
 	<title>The Default Template</title>
-	<para>CloudPlatform includes a CentOS template. This template is downloaded by the
Secondary Storage VM after the primary and secondary storage are configured. You can use this
template in your production deployment or you can delete it and use custom templates.</para>
+	<para>&PRODUCT; includes a CentOS template. This template is downloaded by the
Secondary Storage VM after the primary and secondary storage are configured. You can use this
template in your production deployment or you can delete it and use custom templates.</para>
 	<para>The root password for the default template is "password".</para>
 	<para>A default template is provided for each of XenServer, KVM, and vSphere.  The
templates that are downloaded depend on the hypervisor type that is available in your cloud.
 Each template is approximately 2.5 GB physical size.</para>
 	<para>The default template includes the standard iptables rules, which will block
most access to the template excluding ssh.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/delete-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-templates.xml b/docs/en-US/delete-templates.xml
index d3f99b9..48d8fd1 100644
--- a/docs/en-US/delete-templates.xml
+++ b/docs/en-US/delete-templates.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="delete-templates">
 	<title>Deleting Templates</title>
 	<para>Templates may be deleted. In general, when a template spans multiple Zones,
only the copy that is selected for deletion will be deleted; the same template in other Zones
will not be deleted. The provided CentOS template is an exception to this.  If the provided
CentOS template is deleted, it will be deleted from all Zones.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/deleting-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deleting-vms.xml b/docs/en-US/deleting-vms.xml
index a6cc0db..ab65fef 100644
--- a/docs/en-US/deleting-vms.xml
+++ b/docs/en-US/deleting-vms.xml
@@ -1,14 +1,33 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="deleting-vms">
 		<title>Deleting VMs</title>
 			<para>Users can delete their own virtual machines. A running virtual machine will
be abruptly stopped before it is deleted. Administrators can delete any virtual machines.</para>
 			<para>To delete a virtual machine:</para>	
 			<orderedlist>
-				<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+				<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 				<listitem><para>In the left navigation, click Instances.</para></listitem>
 				<listitem><para>Choose the VM that you want to delete.</para></listitem>
 				<listitem><para>Click the Destroy Instance button <inlinemediaobject>
@@ -20,4 +39,3 @@
 				</para></listitem>
 			</orderedlist>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/deployment-architecture-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
index 25f0825..2d46379 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="deployment-architecture-overview">
 	<title>Deployment Architecture Overview</title>
 	<para>
@@ -22,4 +41,4 @@
 	<xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
 	<xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
 	<xi:include href="networking-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
-</section>
\ No newline at end of file
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/deployment_architecture_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/deployment_architecture_overview.xml b/docs/en-US/deployment_architecture_overview.xml
index 08c1082..34d91d7 100644
--- a/docs/en-US/deployment_architecture_overview.xml
+++ b/docs/en-US/deployment_architecture_overview.xml
@@ -1,17 +1,35 @@
+<!-- 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="deployment_architecture_overview">
 		<title>Deployment Architecture Overview</title>
 		
 		<para>
-			A CloudStack installation consists of two parts: the Management Server and the cloud infrastructure
that it manages. When you set up and manage a CloudStack cloud, you provision resources such
as hosts, storage devices, and IP addresses into the Management Server, and the Management
Server manages those resources.
+			A &PRODUCT; installation consists of two parts: the Management Server and the cloud
infrastructure that it manages. When you set up and manage a &PRODUCT; cloud, you provision
resources such as hosts, storage devices, and IP addresses into the Management Server, and
the Management Server manages those resources.
 		</para>
 		<para>
-			The minimum installation consists of one machine running the CloudStack Management Server
and another machine to act as the cloud infrastructure (in this case, a very simple infrastructure
consisting of one host running hypervisor software).
+			The minimum installation consists of one machine running the &PRODUCT; Management
Server and another machine to act as the cloud infrastructure (in this case, a very simple
infrastructure consisting of one host running hypervisor software).
 		</para>
 		<mediaobject>
 			<imageobject>
 				<imagedata fileref="./images/basic_deployment.png" />
 			</imageobject>
-			<textobject><phrase>basic_deployment.png: Basic two-machine CloudStack deployment</phrase></textobject>
+			<textobject><phrase>basic_deployment.png: Basic two-machine &PRODUCT;
deployment</phrase></textobject>
 		</mediaobject>
 		<para>A more full-featured installation consists of a highly-available multi-node
Management Server installation and up to thousands of hosts using any of several advanced
networking setups. For information about deployment options, see Choosing a Deployment Architecture.
 		</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/detach-move-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
index 26c241c..6f241d5 100644
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.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="detach-move-volumes">
 	<title>Attaching a Volume</title>
 		<note><para>This procedure is different from moving disk volumes from one storage
pool to another. See VM Storage Migration </para></note>
-		<para>A volume can be detached from a guest VM and attached to another guest. Both
CloudPlatform administrators and users can detach volumes from VMs and move them to other
VMs.</para>
+		<para>A volume can be detached from a guest VM and attached to another guest. Both
&PRODUCT; administrators and users can detach volumes from VMs and move them to other
VMs.</para>
 		<para>If the two VMs are in different clusters, and the volume is large, it may take
several minutes for the volume to be moved to the new VM.</para>
 		<para>If the destination VM is running in the OVM hypervisor, the VM must be stopped
before a new volume can be attached to it.</para>
 		<orderedlist>
-			<listitem><para>Log in to the CloudPlatform UI as a user or admin.</para></listitem>
+			<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
 			<listitem><para>In the left navigation bar, click Storage, and choose Volumes
in Select View. Alternatively, if you know which VM the volume is attached to, you can click
Instances, click the VM name, and click View Volumes.</para></listitem>
 			<listitem><para>Click the name of the volume you want to detach, then click
the Detach Disk button <inlinemediaobject>
 				<imageobject>
@@ -22,4 +41,3 @@
 			<listitem><para>To move the volume to another VM, follow the steps in Attaching
a Volume <xref linkend="attaching-volume"/>.</para></listitem>
 		</orderedlist>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/developer-getting-started.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-getting-started.xml b/docs/en-US/developer-getting-started.xml
index adfac34..82ef120 100644
--- a/docs/en-US/developer-getting-started.xml
+++ b/docs/en-US/developer-getting-started.xml
@@ -1,9 +1,27 @@
+<!-- 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="getting-started">
 		<title>Getting Started</title>
 		<para>
-			To get started using the CloudStack API, you should have the following:</para>
+			To get started using the &PRODUCT; API, you should have the following:</para>
 		<itemizedlist>
-			<listitem><para>URL of the CloudStack server you wish to integrate with.</para></listitem>

+			<listitem><para>URL of the &PRODUCT; server you wish to integrate with.</para></listitem>

 			<listitem><para>Both the API Key and Secret Key for an account. This should
have been generated by the administrator of the cloud instance and given to you.</para></listitem>
 			<listitem><para>Familiarity with HTTP GET/POST and query strings.</para></listitem>
 			<listitem><para>Knowledge of either XML or JSON.</para></listitem>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/developer-guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-guide.xml b/docs/en-US/developer-guide.xml
index 77af46e..373ab29 100644
--- a/docs/en-US/developer-guide.xml
+++ b/docs/en-US/developer-guide.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <chapter id="developer-guide">
 	<title>Using the API</title>
 	<xi:include href="developer-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/developer-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer-introduction.xml b/docs/en-US/developer-introduction.xml
index d895253..f2ab1d4 100644
--- a/docs/en-US/developer-introduction.xml
+++ b/docs/en-US/developer-introduction.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="developer-introduction">
 	<title>Introduction for Developers</title>
 	<xi:include href="roles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/developer_guide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/developer_guide.xml b/docs/en-US/developer_guide.xml
index eb174be..9606bab 100644
--- a/docs/en-US/developer_guide.xml
+++ b/docs/en-US/developer_guide.xml
@@ -1,8 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd"
[
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <chapter id="developer_guide">
 	<title>Developer Guide</title>
 	<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/disable-enable-zones-pods-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/disable-enable-zones-pods-clusters.xml b/docs/en-US/disable-enable-zones-pods-clusters.xml
index 94bf89e..7d52ae7 100644
--- a/docs/en-US/disable-enable-zones-pods-clusters.xml
+++ b/docs/en-US/disable-enable-zones-pods-clusters.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="disable-enable-zones-pods-clusters">
     <title>Disabling and Enabling Zones, Pods, and Clusters</title>
     <para>You can enable or disable a zone, pod, or cluster without permanently removing
it from the cloud. This is useful for maintenance or when there are problems that make a portion
of the cloud infrastructure unreliable. No new allocations will be made to a disabled zone,
pod, or cluster until its state is returned to Enabled. When a zone, pod, or cluster is first
added to the cloud, it is Disabled by default.</para>
     <para>To disable and enable a zone, pod, or cluster:</para>
     <orderedlist>
-        <listitem><para>Log in to the CloudPlatform UI as administrator</para></listitem>
+        <listitem><para>Log in to the &PRODUCT; UI as administrator</para></listitem>
         <listitem><para>In the left navigation bar, click Infrastructure.</para>
         </listitem>
         <listitem><para>In Zones, click View More.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/disk-volume-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/disk-volume-usage-record-format.xml b/docs/en-US/disk-volume-usage-record-format.xml
index c4b898e..7283698 100644
--- a/docs/en-US/disk-volume-usage-record-format.xml
+++ b/docs/en-US/disk-volume-usage-record-format.xml
@@ -1,3 +1,21 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="disk-volume-usage-record-format">
 	<title>Disk Volume Usage Record Format</title>
 	<para>For disk volumes, the following fields exist in a usage record.</para>
@@ -18,4 +36,3 @@
 			<listitem><para>startdate, enddate – The range of time for which the usage
is aggregated; see Dates in the Usage Record</para></listitem>
 		</itemizedlist>
 	</section>
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/dns-dhcp.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/dns-dhcp.xml b/docs/en-US/dns-dhcp.xml
index dfebbd6..4d5bf00 100644
--- a/docs/en-US/dns-dhcp.xml
+++ b/docs/en-US/dns-dhcp.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="dns-dhcp">
 	<title>DNS and DHCP</title>
 	<para>The Virtual Router provides DNS and DHCP services to the guests. It proxies
DNS requests to the DNS server configured on the Availability Zone.</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c35153ce/docs/en-US/domains.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/domains.xml b/docs/en-US/domains.xml
index 669b3d3..9d19c7e 100644
--- a/docs/en-US/domains.xml
+++ b/docs/en-US/domains.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="domains">
 	<title>Domains</title>
 	<para>If the LDAP server requires SSL, you need to enable it in the ldapConfig command
by setting the parameters ssl, truststore, and truststorepass. Before enabling SSL for ldapConfig,
you need to get the certificate which the LDAP server is using and add it to a trusted keystore.
You will need to know the path to the keystore and the password.</para>
-							
 	</section>


Mime
View raw message