Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CFF6F2AD for ; Tue, 6 Aug 2013 05:00:29 +0000 (UTC) Received: (qmail 94491 invoked by uid 500); 6 Aug 2013 05:00:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 94459 invoked by uid 500); 6 Aug 2013 05:00:28 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 94253 invoked by uid 99); 6 Aug 2013 05:00:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Aug 2013 05:00:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CED968B98FC; Tue, 6 Aug 2013 05:00:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: radhika@apache.org To: commits@cloudstack.apache.org Message-Id: <6fff57ebee13436eb9ea412f05a3e8d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to cfac584 Date: Tue, 6 Aug 2013 05:00:26 +0000 (UTC) Updated Branches: refs/heads/master 36c7a56d1 -> cfac58493 CLOUDSTACK-804 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfac5849 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfac5849 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfac5849 Branch: refs/heads/master Commit: cfac58493febf12427756298b4996931f6315f05 Parents: 36c7a56 Author: Radhika PC Authored: Tue Aug 6 10:29:43 2013 +0530 Committer: Radhika PC Committed: Tue Aug 6 10:29:43 2013 +0530 ---------------------------------------------------------------------- docs/en-US/ip-vlan-tenant.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfac5849/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 31cbde2..0d7a61b 100644 --- a/docs/en-US/ip-vlan-tenant.xml +++ b/docs/en-US/ip-vlan-tenant.xml @@ -21,9 +21,9 @@
Reserving Public IP Addresses and VLANs for Account &PRODUCT; provides you the ability to reserve a set of public IP addresses and VLANs - 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. + exclusively for an account. 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. 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—use.system.public.ips and @@ -35,10 +35,10 @@ Reserve a VLAN range and public IP address range from an Advanced zone and assign it to - an account or domain + an account - Disassociate a VLAN and public IP address range from an account or domain + Disassociate a VLAN and public IP address range from an account View the number of public IP addresses allocated to an account