Updated Branches:
  refs/heads/master 0307effcf -> c8f3fc455

fixing licenses for o doc files


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

Branch: refs/heads/master
Commit: c8f3fc4558b802f3e2165270a7868a88ac56269c
Parents: 0307eff
Author: Joe Brockmeier <[email protected]>
Authored: Fri Aug 10 23:05:24 2012 -0400
Committer: David Nalley <[email protected]>
Committed: Fri Aug 10 23:05:24 2012 -0400

----------------------------------------------------------------------
 ...guration-of-external-firewalls-loadbalancer.xml |   25 +++++++++++--
 .../over-provisioning-service-offering-limits.xml  |   29 ++++++++++++---
 2 files changed, 46 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8f3fc45/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
----------------------------------------------------------------------
diff --git 
a/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml 
b/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
index 444a715..6a02d27 100644
--- a/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.xml
+++ b/docs/en-US/ongoing-configuration-of-external-firewalls-loadbalancer.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="ongoing-configuration-of-external-firewalls-loadbalancer">
     <title>Ongoing Configuration of External Firewalls and Load 
Balancers</title>
-    <para>Additional user actions (e.g. setting a port forward) will cause 
further programming of the firewall and load balancer.  A user may request 
additional public IP addresses and forward traffic received at these IPs to 
specific VMs. This is accomplished by enabling static NAT for a public IP 
address, assigning the IP to a VM, and specifying a set of protocols and port 
ranges to open. When a static NAT rule is created, CloudPlatform programs the 
zone's external firewall with the following objects:</para>
+    <para>Additional user actions (e.g. setting a port forward) will cause 
further programming of the firewall and load balancer.  A user may request 
additional public IP addresses and forward traffic received at these IPs to 
specific VMs. This is accomplished by enabling static NAT for a public IP 
address, assigning the IP to a VM, and specifying a set of protocols and port 
ranges to open. When a static NAT rule is created, &PRODUCT; programs the 
zone's external firewall with the following objects:</para>
     <itemizedlist>
         <listitem><para>A static NAT rule that maps the public IP address to 
the private IP address of a VM.</para></listitem>
         <listitem><para>A security policy that allows traffic within the set 
of protocols and port ranges that are specified.</para></listitem>
         <listitem><para>A firewall filter counter that measures the number of 
bytes of incoming traffic to the public IP.</para></listitem>
     </itemizedlist>
-    <para>The number of incoming and outgoing bytes through source NAT, static 
NAT, and load balancing rules is measured and saved on each external element. 
This data is collected on a regular basis and stored in the CloudPlatform 
database.</para>
+    <para>The number of incoming and outgoing bytes through source NAT, static 
NAT, and load balancing rules is measured and saved on each external element. 
This data is collected on a regular basis and stored in the &PRODUCT; 
database.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8f3fc45/docs/en-US/over-provisioning-service-offering-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/over-provisioning-service-offering-limits.xml 
b/docs/en-US/over-provisioning-service-offering-limits.xml
index 17704bc..64a1627 100644
--- a/docs/en-US/over-provisioning-service-offering-limits.xml
+++ b/docs/en-US/over-provisioning-service-offering-limits.xml
@@ -1,12 +1,31 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
 %BOOK_ENTITIES;
 ]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
 <section id="over-provisioning-service-offering-limits">
     <title>Over-Provisioning and Service Offering Limits</title>
-    <para>CloudPlatform performs CPU over-provisioning based on an 
over-provisioning ratio configured by the administrator.  This is defined by 
the cpu.overprovisioning.factor global configuration variable.</para>
-    <para>CloudPlatform performs CPU over-provisioning based on an 
over-provisioning ratio configured by the administrator.  This is defined by 
the cpu.overprovisioning.factor global configuration variable</para>
+    <para>&PRODUCT; performs CPU over-provisioning based on an 
over-provisioning ratio configured by the administrator.  This is defined by 
the cpu.overprovisioning.factor global configuration variable.</para>
+    <para>&PRODUCT; performs CPU over-provisioning based on an 
over-provisioning ratio configured by the administrator.  This is defined by 
the cpu.overprovisioning.factor global configuration variable</para>
     <para>Service offerings limits (e.g. 1 GHz, 1 core) are strictly enforced 
for core count.  For example, a guest with a service offering of one core will 
have only one core available to it regardless of other activity on the Host.  
</para>
-    <para>Service offering limits for gigahertz are enforced only in the 
presence of contention for CPU resources.  For example, suppose that a guest 
was created with a service offering of 1 GHz on a Host that has 2 GHz cores, 
and that guest is the only guest running on the Host.  The guest will have the 
full 2 GHz available to it.  When multiple guests are attempting to use the CPU 
a weighting factor is used to schedule CPU resources.  The weight is based on 
the clock speed in the service offering.  Guests receive a CPU allocation that 
is proportionate to the GHz in the service offering.   For example, a guest 
created from a 2 GHz service offering will receive twice the CPU allocation as 
a guest created from a 1 GHz service offering. CloudPlatform does not perform 
memory over-provisioning.</para>
-    </section>     
\ No newline at end of file
+    <para>Service offering limits for gigahertz are enforced only in the 
presence of contention for CPU resources.  For example, suppose that a guest 
was created with a service offering of 1 GHz on a Host that has 2 GHz cores, 
and that guest is the only guest running on the Host.  The guest will have the 
full 2 GHz available to it.  When multiple guests are attempting to use the CPU 
a weighting factor is used to schedule CPU resources.  The weight is based on 
the clock speed in the service offering.  Guests receive a CPU allocation that 
is proportionate to the GHz in the service offering.   For example, a guest 
created from a 2 GHz service offering will receive twice the CPU allocation as 
a guest created from a 1 GHz service offering. &PRODUCT; does not perform 
memory over-provisioning.</para>
+    </section>     

Reply via email to