Updated Branches:
  refs/heads/master d197687a6 -> 5d29dc0b3

CLOUDSTACK-817 likitha/community doc comments fixed


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

Branch: refs/heads/master
Commit: 5d29dc0b3351119259613d28a978f6b1e1c1aaa2
Parents: d197687
Author: Radhika PC <[email protected]>
Authored: Mon Aug 5 14:48:45 2013 +0530
Committer: Radhika PC <[email protected]>
Committed: Mon Aug 5 14:48:45 2013 +0530

----------------------------------------------------------------------
 docs/en-US/ip-vlan-tenant.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d29dc0b/docs/en-US/ip-vlan-tenant.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ip-vlan-tenant.xml b/docs/en-US/ip-vlan-tenant.xml
index f66fde1..31cbde2 100644
--- a/docs/en-US/ip-vlan-tenant.xml
+++ b/docs/en-US/ip-vlan-tenant.xml
@@ -19,19 +19,26 @@
   under the License.
 -->
 <section id="ip-vlan-tenant">
-  <title>Reserving Public IP Addresses and VLANs Per Account</title>
+  <title>Reserving Public IP Addresses and VLANs for Account</title>
   <para>&PRODUCT; provides you the ability to reserve a set of public IP 
addresses and VLANs
-    exclusively for an account. During zone creation, you can continue to 
define a set of VLANs and
-    multiple public IP ranges. This feature extends the functionality to 
enable you to dedicate a
-    fixed set of VLANs and guest IP addresses for a tenant.</para>
+    exclusively for an account and domain. During zone creation, you can 
continue defining a set of
+    VLANs and multiple public IP ranges. This feature extends the 
functionality to enable you to
+    dedicate a fixed set of VLANs and guest IP addresses for a tenant.</para>
+  <para>Note that if an account has consumed all the VLANs and IPs dedicated 
to it, the account can
+    acquire two more resources from the system. &PRODUCT; provides the root 
admin with two
+    configuration parameter to modify this default 
behavior&mdash;use.system.public.ips and
+    use.system.guest.vlans. These global parameters enable the root admin to 
disallow an account
+    from acquiring public IPs and guest VLANs from the system, if the account 
has dedicated
+    resources and these dedicated resources have all been consumed. Both these 
configurations are
+    configurable at the account level.</para>
   <para>This feature provides you the following capabilities:</para>
   <itemizedlist>
     <listitem>
       <para>Reserve a VLAN range and public IP address range from an Advanced 
zone and assign it to
-        a domain or account</para>
+        an account or domain</para>
     </listitem>
     <listitem>
-      <para>Disassociate a VLAN and public IP address range from an domain or 
account</para>
+      <para>Disassociate a VLAN and public IP address range from an account or 
domain</para>
     </listitem>
     <listitem>
       <para>View the number of public IP addresses allocated to an 
account</para>

Reply via email to