From 5d29dc0b3351119259613d28a978f6b1e1c1aaa2 Mon Sep 17 00:00:00 2001
From: Radhika PC <radhika.puthiyetath@citrix.com>
Date: Mon, 5 Aug 2013 14:48:45 +0530
Subject: [PATCH] CLOUDSTACK-817 likitha/community doc comments fixed

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

diff --git a/docs/en-US/ip-vlan-tenant.xml b/docs/en-US/ip-vlan-tenant.xml
index f66fde1661f..31cbde27d42 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>